Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c

567 files changed, 51143 insertions, 32278 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5181828012ce..aca102f758ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1423,7 +1423,9 @@ F:	drivers/net/tg3.*
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:      Brett Rudley <brudley@broadcom.com>
 M:      Henry Ptasinski <henryp@broadcom.com>
-M:      Nohee Ko <noheek@broadcom.com>
+M:      Dowan Kim <dowan@broadcom.com>
+M:      Roland Vossen <rvossen@broadcom.com>
+M:      Arend van Spriel <arend@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
 F:      drivers/staging/brcm80211/
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index bdc632b6b586..e2d586903432 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -119,6 +119,8 @@ source "drivers/staging/vme/Kconfig"
 
 source "drivers/staging/memrar/Kconfig"
 
+source "drivers/staging/sep/Kconfig"
+
 source "drivers/staging/iio/Kconfig"
 
 source "drivers/staging/zram/Kconfig"
@@ -127,8 +129,6 @@ source "drivers/staging/wlags49_h2/Kconfig"
 
 source "drivers/staging/wlags49_h25/Kconfig"
 
-source "drivers/staging/batman-adv/Kconfig"
-
 source "drivers/staging/samsung-laptop/Kconfig"
 
 source "drivers/staging/sm7xx/Kconfig"
@@ -141,8 +141,6 @@ source "drivers/staging/cxt1e1/Kconfig"
 
 source "drivers/staging/ti-st/Kconfig"
 
-source "drivers/staging/adis16255/Kconfig"
-
 source "drivers/staging/xgifb/Kconfig"
 
 source "drivers/staging/msm/Kconfig"
@@ -175,5 +173,9 @@ source "drivers/staging/intel_sst/Kconfig"
 
 source "drivers/staging/speakup/Kconfig"
 
+source "drivers/staging/cptm1217/Kconfig"
+
+source "drivers/staging/ste_rmi4/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 3eda5c73a50a..c7d222413c07 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -42,18 +42,17 @@ obj-$(CONFIG_VT6656)		+= vt6656/
 obj-$(CONFIG_HYPERV)            += hv/
 obj-$(CONFIG_VME_BUS)           += vme/
 obj-$(CONFIG_MRST_RAR_HANDLER)  += memrar/
+obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_ZRAM)              += zram/
 obj-$(CONFIG_WLAGS49_H2)        += wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)       += wlags49_h25/
-obj-$(CONFIG_BATMAN_ADV)        += batman-adv/
 obj-$(CONFIG_SAMSUNG_LAPTOP)    += samsung-laptop/
 obj-$(CONFIG_FB_SM7XX)          += sm7xx/
 obj-$(CONFIG_VIDEO_DT3155)      += dt3155v4l/
 obj-$(CONFIG_CRYSTALHD)         += crystalhd/
 obj-$(CONFIG_CXT1E1)            += cxt1e1/
 obj-$(CONFIG_TI_ST)             += ti-st/
-obj-$(CONFIG_ADIS16255)         += adis16255/
 obj-$(CONFIG_FB_XGI)            += xgifb/
 obj-$(CONFIG_MSM_STAGING)       += msm/
 obj-$(CONFIG_EASYCAP)           += easycap/
@@ -68,3 +67,5 @@ obj-$(CONFIG_BCM_WIMAX)	+= bcm/
 obj-$(CONFIG_FT1000)            += ft1000/
 obj-$(CONFIG_SND_INTEL_SST)             += intel_sst/
 obj-$(CONFIG_SPEAKUP)   += speakup/
+obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)       += cptm1217/
+obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)    += ste_rmi4/
diff --git a/drivers/staging/adis16255/Kconfig b/drivers/staging/adis16255/Kconfig
deleted file mode 100644
index a883c1f4478b..000000000000
--- a/drivers/staging/adis16255/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADIS16255
-        tristate "Analog Devices ADIS16250/16255"
-        depends on SPI && SYSFS
-        ---help---
-        If you say yes here you get support for the Analog Devices
-        ADIS16250/16255 Low Power Gyroscope. The driver exposes
-        orientation and gyroscope value, as well as sample rate
-        to the sysfs.
-
-        This driver can also be built as a module. If so, the module
-        will be called adis16255.
diff --git a/drivers/staging/adis16255/Makefile b/drivers/staging/adis16255/Makefile
deleted file mode 100644
index 8c3908106bfa..000000000000
--- a/drivers/staging/adis16255/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_ADIS16255)         += adis16255.o
diff --git a/drivers/staging/adis16255/adis16255.c b/drivers/staging/adis16255/adis16255.c
deleted file mode 100644
index 8d4d7cbab979..000000000000
--- a/drivers/staging/adis16255/adis16255.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Analog Devices ADIS16250/ADIS16255 Low Power Gyroscope
- *
- * Written by: Matthias Brugger <m_brugger@web.de>
- *
- * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
- *
- * 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.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/*
- * The driver just has a bare interface to the sysfs (sample rate in Hz,
- * orientation (x, y, z) and gyroscope data in °/sec.
- *
- * It should be added to iio subsystem when this has left staging.
- *
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-
-#include <linux/interrupt.h>
-#include <linux/sysfs.h>
-#include <linux/stat.h>
-#include <linux/delay.h>
-
-#include <linux/gpio.h>
-
-#include <linux/spi/spi.h>
-#include <linux/workqueue.h>
-
-#include "adis16255.h"
-
-#define ADIS_STATUS        0x3d
-#define ADIS_SMPL_PRD_MSB  0x37
-#define ADIS_SMPL_PRD_LSB  0x36
-#define ADIS_MSC_CTRL_MSB  0x35
-#define ADIS_MSC_CTRL_LSB  0x34
-#define ADIS_GPIO_CTRL     0x33
-#define ADIS_ALM_SMPL1     0x25
-#define ADIS_ALM_MAG1      0x21
-#define ADIS_GYRO_SCALE    0x17
-#define ADIS_GYRO_OUT      0x05
-#define ADIS_SUPPLY_OUT    0x03
-#define ADIS_ENDURANCE     0x01
-
-/*
- * data structure for every sensor
- *
- * @dev:       Driver model representation of the device.
- * @spi:       Pointer to the spi device which will manage i/o to spi bus.
- * @data:      Last read data from device.
- * @irq_adis:  GPIO Number of IRQ signal
- * @irq:       irq line manage by kernel
- * @negative:  indicates if sensor is upside down (negative == 1)
- * @direction: indicates axis (x, y, z) the sensor is meassuring
- */
-struct spi_adis16255_data {
-        struct device dev;
-        struct spi_device *spi;
-        s16 data;
-        int irq;
-        u8 negative;
-        char direction;
-};
-
-/*-------------------------------------------------------------------------*/
-
-static int spi_adis16255_read_data(struct spi_adis16255_data *spiadis,
-                                        u8 adr,
-                                        u8 *rbuf)
-{
-        struct spi_device *spi = spiadis->spi;
-        struct spi_message msg;
-        struct spi_transfer xfer1, xfer2;
-        u8 *buf, *rx;
-        int ret;
-
-        buf = kzalloc(4, GFP_KERNEL);
-        if (buf == NULL)
-                return -ENOMEM;
-
-        rx = kzalloc(4, GFP_KERNEL);
-        if (rx == NULL) {
-                ret = -ENOMEM;
-                goto err_buf;
-        }
-
-        buf[0] = adr;
-
-        spi_message_init(&msg);
-        memset(&xfer1, 0, sizeof(xfer1));
-        memset(&xfer2, 0, sizeof(xfer2));
-
-        xfer1.tx_buf = buf;
-        xfer1.rx_buf = buf + 2;
-        xfer1.len = 2;
-        xfer1.delay_usecs = 9;
-
-        xfer2.tx_buf = rx + 2;
-        xfer2.rx_buf = rx;
-        xfer2.len = 2;
-
-        spi_message_add_tail(&xfer1, &msg);
-        spi_message_add_tail(&xfer2, &msg);
-
-        ret = spi_sync(spi, &msg);
-        if (ret == 0) {
-                rbuf[0] = rx[0];
-                rbuf[1] = rx[1];
-        }
-
-        kfree(rx);
-err_buf:
-        kfree(buf);
-
-        return ret;
-}
-
-static int spi_adis16255_write_data(struct spi_adis16255_data *spiadis,
-                                        u8 adr1,
-                                        u8 adr2,
-                                        u8 *wbuf)
-{
-        struct spi_device *spi = spiadis->spi;
-        struct spi_message   msg;
-        struct spi_transfer  xfer1, xfer2;
-        u8       *buf, *rx;
-        int         ret;
-
-        buf = kmalloc(4, GFP_KERNEL);
-        if (buf == NULL)
-                return -ENOMEM;
-
-        rx = kzalloc(4, GFP_KERNEL);
-        if (rx == NULL) {
-                ret = -ENOMEM;
-                goto err_buf;
-        }
-
-        spi_message_init(&msg);
-        memset(&xfer1, 0, sizeof(xfer1));
-        memset(&xfer2, 0, sizeof(xfer2));
-
-        buf[0] = adr1 | 0x80;
-        buf[1] = *wbuf;
-
-        buf[2] = adr2 | 0x80;
-        buf[3] = *(wbuf + 1);
-
-        xfer1.tx_buf = buf;
-        xfer1.rx_buf = rx;
-        xfer1.len = 2;
-        xfer1.delay_usecs = 9;
-
-        xfer2.tx_buf = buf+2;
-        xfer2.rx_buf = rx+2;
-        xfer2.len = 2;
-
-        spi_message_add_tail(&xfer1, &msg);
-        spi_message_add_tail(&xfer2, &msg);
-
-        ret = spi_sync(spi, &msg);
-        if (ret != 0)
-                dev_warn(&spi->dev, "write data to %#x %#x failed\n",
-                                buf[0], buf[2]);
-
-        kfree(rx);
-err_buf:
-        kfree(buf);
-        return ret;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static irqreturn_t adis_irq_thread(int irq, void *dev_id)
-{
-        struct spi_adis16255_data *spiadis = dev_id;
-        int status;
-        u16 value = 0;
-
-        status =  spi_adis16255_read_data(spiadis, ADIS_GYRO_OUT, (u8 *)&value);
-        if (status != 0) {
-                dev_warn(&spiadis->spi->dev, "SPI FAILED\n");
-                goto exit;
-        }
-
-        /* perform on new data only... */
-        if (value & 0x8000) {
-                /* delete error and new data bit */
-                value = value & 0x3fff;
-                /* set negative value */
-                if (value & 0x2000)
-                        value = value | 0xe000;
-
-                if (likely(spiadis->negative))
-                        value = -value;
-
-                spiadis->data = (s16) value;
-        }
-
-exit:
-        return IRQ_HANDLED;
-}
-
-/*-------------------------------------------------------------------------*/
-
-ssize_t adis16255_show_data(struct device *device,
-                struct device_attribute *da,
-                char *buf)
-{
-        struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
-        return snprintf(buf, PAGE_SIZE, "%d\n", spiadis->data);
-}
-DEVICE_ATTR(data, S_IRUGO , adis16255_show_data, NULL);
-
-ssize_t adis16255_show_direction(struct device *device,
-                struct device_attribute *da,
-                char *buf)
-{
-        struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
-        return snprintf(buf, PAGE_SIZE, "%c\n", spiadis->direction);
-}
-DEVICE_ATTR(direction, S_IRUGO , adis16255_show_direction, NULL);
-
-ssize_t adis16255_show_sample_rate(struct device *device,
-                struct device_attribute *da,
-                char *buf)
-{
-        struct spi_adis16255_data *spiadis = dev_get_drvdata(device);
-        int status = 0;
-        u16 value = 0;
-        int ts = 0;
-
-        status = spi_adis16255_read_data(spiadis, ADIS_SMPL_PRD_MSB,
-                                (u8 *)&value);
-        if (status != 0)
-                return -EINVAL;
-
-        if (value & 0x80) {
-                /* timebase = 60.54 ms */
-                ts = 60540 * ((0x7f & value) + 1);
-        } else {
-                /* timebase = 1.953 ms */
-                ts = 1953 * ((0x7f & value) + 1);
-        }
-
-        return snprintf(buf, PAGE_SIZE, "%d\n", (1000*1000)/ts);
-}
-DEVICE_ATTR(sample_rate, S_IRUGO , adis16255_show_sample_rate, NULL);
-
-static struct attribute *adis16255_attributes[] = {
-        &dev_attr_data.attr,
-        &dev_attr_direction.attr,
-        &dev_attr_sample_rate.attr,
-        NULL
-};
-
-static const struct attribute_group adis16255_attr_group = {
-        .attrs = adis16255_attributes,
-};
-
-/*-------------------------------------------------------------------------*/
-
-static int spi_adis16255_shutdown(struct spi_adis16255_data *spiadis)
-{
-        u16 value = 0;
-        /* turn sensor off */
-        spi_adis16255_write_data(spiadis,
-                        ADIS_SMPL_PRD_MSB, ADIS_SMPL_PRD_LSB,
-                        (u8 *)&value);
-        spi_adis16255_write_data(spiadis,
-                        ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
-                        (u8 *)&value);
-        return 0;
-}
-
-static int spi_adis16255_bringup(struct spi_adis16255_data *spiadis)
-{
-        int status = 0;
-        u16 value = 0;
-
-        status = spi_adis16255_read_data(spiadis, ADIS_GYRO_SCALE,
-                                (u8 *)&value);
-        if (status != 0)
-                goto err;
-        if (value != 0x0800) {
-                dev_warn(&spiadis->spi->dev, "Scale factor is none default "
-                                "value (%.4x)\n", value);
-        }
-
-        /* timebase = 1.953 ms, Ns = 0 -> 512 Hz sample rate */
-        value =  0x0001;
-        status = spi_adis16255_write_data(spiadis,
-                                ADIS_SMPL_PRD_MSB, ADIS_SMPL_PRD_LSB,
-                                (u8 *)&value);
-        if (status != 0)
-                goto err;
-
-        /* start internal self-test */
-        value = 0x0400;
-        status = spi_adis16255_write_data(spiadis,
-                                ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
-                                (u8 *)&value);
-        if (status != 0)
-                goto err;
-
-        /* wait 35 ms to finish self-test */
-        msleep(35);
-
-        value = 0x0000;
-        status = spi_adis16255_read_data(spiadis, ADIS_STATUS,
-                                (u8 *)&value);
-        if (status != 0)
-                goto err;
-
-        if (value & 0x23) {
-                if (value & 0x20) {
-                        dev_warn(&spiadis->spi->dev, "self-test error\n");
-                        status = -ENODEV;
-                        goto err;
-                } else if (value & 0x3) {
-                        dev_warn(&spiadis->spi->dev, "Sensor voltage "
-                                                "out of range.\n");
-                        status = -ENODEV;
-                        goto err;
-                }
-        }
-
-        /* set interrupt to active high on DIO0 when data ready */
-        value = 0x0006;
-        status = spi_adis16255_write_data(spiadis,
-                                ADIS_MSC_CTRL_MSB, ADIS_MSC_CTRL_LSB,
-                                (u8 *)&value);
-        if (status != 0)
-                goto err;
-        return status;
-
-err:
-        spi_adis16255_shutdown(spiadis);
-        return status;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static int __devinit spi_adis16255_probe(struct spi_device *spi)
-{
-
-        struct adis16255_init_data *init_data = spi->dev.platform_data;
-        struct spi_adis16255_data  *spiadis;
-        int status = 0;
-
-        spiadis = kzalloc(sizeof(*spiadis), GFP_KERNEL);
-        if (!spiadis)
-                return -ENOMEM;
-
-        spiadis->spi = spi;
-        spiadis->direction = init_data->direction;
-
-        if (init_data->negative)
-                spiadis->negative = 1;
-
-        status = gpio_request(init_data->irq, "adis16255");
-        if (status != 0)
-                goto err;
-
-        status = gpio_direction_input(init_data->irq);
-        if (status != 0)
-                goto gpio_err;
-
-        spiadis->irq = gpio_to_irq(init_data->irq);
-
-        status = request_threaded_irq(spiadis->irq,
-                        NULL, adis_irq_thread,
-                        IRQF_DISABLED, "adis-driver", spiadis);
-
-        if (status != 0) {
-                dev_err(&spi->dev, "IRQ request failed\n");
-                goto gpio_err;
-        }
-
-        dev_dbg(&spi->dev, "GPIO %d IRQ %d\n", init_data->irq, spiadis->irq);
-
-        dev_set_drvdata(&spi->dev, spiadis);
-        status = sysfs_create_group(&spi->dev.kobj, &adis16255_attr_group);
-        if (status != 0)
-                goto irq_err;
-
-        status = spi_adis16255_bringup(spiadis);
-        if (status != 0)
-                goto sysfs_err;
-
-        dev_info(&spi->dev, "spi_adis16255 driver added!\n");
-
-        return status;
-
-sysfs_err:
-        sysfs_remove_group(&spiadis->spi->dev.kobj, &adis16255_attr_group);
-irq_err:
-        free_irq(spiadis->irq, spiadis);
-gpio_err:
-        gpio_free(init_data->irq);
-err:
-        kfree(spiadis);
-        return status;
-}
-
-static int __devexit spi_adis16255_remove(struct spi_device *spi)
-{
-        struct spi_adis16255_data  *spiadis    = dev_get_drvdata(&spi->dev);
-
-        spi_adis16255_shutdown(spiadis);
-
-        free_irq(spiadis->irq, spiadis);
-        gpio_free(irq_to_gpio(spiadis->irq));
-
-        sysfs_remove_group(&spiadis->spi->dev.kobj, &adis16255_attr_group);
-
-        kfree(spiadis);
-
-        dev_info(&spi->dev, "spi_adis16255 driver removed!\n");
-        return 0;
-}
-
-static struct spi_driver spi_adis16255_drv = {
-        .driver = {
-                .name =  "spi_adis16255",
-                .owner = THIS_MODULE,
-        },
-        .probe = spi_adis16255_probe,
-        .remove =   __devexit_p(spi_adis16255_remove),
-};
-
-/*-------------------------------------------------------------------------*/
-
-static int __init spi_adis16255_init(void)
-{
-        return spi_register_driver(&spi_adis16255_drv);
-}
-module_init(spi_adis16255_init);
-
-static void __exit spi_adis16255_exit(void)
-{
-        spi_unregister_driver(&spi_adis16255_drv);
-}
-module_exit(spi_adis16255_exit);
-
-MODULE_AUTHOR("Matthias Brugger");
-MODULE_DESCRIPTION("SPI device driver for ADIS16255 sensor");
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/adis16255/adis16255.h b/drivers/staging/adis16255/adis16255.h
deleted file mode 100644
index 03e07001bab2..000000000000
--- a/drivers/staging/adis16255/adis16255.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef ADIS16255_H
-#define ADIS16255_H
-
-#include <linux/types.h>
-
-struct adis16255_init_data {
-        char direction;
-        u8   negative;
-        int  irq;
-};
-
-#endif
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c
index 016c6f7f8630..7bb7da7959a2 100644
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
@@ -70,7 +70,7 @@ module_param(start_off, uint, 0644);
 MODULE_PARM_DESC(start_off,
                  "Set to 1 to switch off OLED display after it is attached");
 
-enum oled_pack_mode{
+enum oled_pack_mode {
         PACK_MODE_G1,
         PACK_MODE_G50,
         PACK_MODE_LAST
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
index c307a5559362..e96662b84ed9 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -876,7 +876,7 @@ HIFAckInterrupt(HIF_DEVICE *device)
 void
 HIFUnMaskInterrupt(HIF_DEVICE *device)
 {
-    int ret;;
+    int ret;
 
     AR_DEBUG_ASSERT(device != NULL);
     AR_DEBUG_ASSERT(device->func != NULL);
@@ -1188,7 +1188,7 @@ addHifDevice(struct sdio_func *func)
     HIF_DEVICE *hifdevice;
     AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: addHifDevice\n"));
     AR_DEBUG_ASSERT(func != NULL);
-    hifdevice = (HIF_DEVICE *)kzalloc(sizeof(HIF_DEVICE), GFP_KERNEL);
+    hifdevice = kzalloc(sizeof(HIF_DEVICE), GFP_KERNEL);
     AR_DEBUG_ASSERT(hifdevice != NULL);
 #if HIF_USE_DMA_BOUNCE_BUFFER
     hifdevice->dma_buffer = kmalloc(HIF_DMA_BUFFER_SIZE, GFP_KERNEL);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index a659f7047373..126a36a2daa6 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -4439,7 +4439,7 @@ skip_key:
         for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) {
             AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("%2.2x ", assocInfo[i]));
             sprintf(pos, "%2.2x", assocInfo[i]);
-            pos += 2;;
+            pos += 2;
         }
         AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("\n"));
 
diff --git a/drivers/staging/autofs/dirhash.c b/drivers/staging/autofs/dirhash.c
index 8f3e2b816129..d3f42c8325f7 100644
--- a/drivers/staging/autofs/dirhash.c
+++ b/drivers/staging/autofs/dirhash.c
@@ -30,7 +30,7 @@ void autofs_update_usage(struct autofs_dirhash *dh,
                          struct autofs_dir_ent *ent)
 {
         autofs_delete_usage(ent);   /* Unlink from current position */
-        autofs_init_usage(dh,ent);  /* Relink at queue tail */
+        autofs_init_usage(dh, ent);  /* Relink at queue tail */
 }
 
 struct autofs_dir_ent *autofs_expire(struct super_block *sb,
@@ -45,17 +45,18 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                 struct path path;
                 int umount_ok;
 
-                if ( list_empty(&dh->expiry_head) || sbi->catatonic )
+                if (list_empty(&dh->expiry_head) || sbi->catatonic)
                         return NULL;    /* No entries */
                 /* We keep the list sorted by last_usage and want old stuff */
-                ent = list_entry(dh->expiry_head.next, struct autofs_dir_ent, exp);
+                ent = list_entry(dh->expiry_head.next,
+                                                struct autofs_dir_ent, exp);
                 if (jiffies - ent->last_usage < timeout)
                         break;
                 /* Move to end of list in case expiry isn't desirable */
                 autofs_update_usage(dh, ent);
 
                 /* Check to see that entry is expirable */
-                if ( ent->ino < AUTOFS_FIRST_DIR_INO )
+                if (ent->ino < AUTOFS_FIRST_DIR_INO)
                         return ent; /* Symlinks are always expirable */
 
                 /* Get the dentry for the autofs subdirectory */
@@ -63,14 +64,15 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
 
                 if (!path.dentry) {
                         /* Should only happen in catatonic mode */
-                        printk("autofs: dentry == NULL but inode range is directory, entry %s\n", ent->name);
+                        printk(KERN_DEBUG "autofs: dentry == NULL but inode \
+                                range is directory, entry %s\n", ent->name);
                         autofs_delete_usage(ent);
                         continue;
                 }
 
                 if (!path.dentry->d_inode) {
                         dput(path.dentry);
-                        printk("autofs: negative dentry on expiry queue: %s\n",
+                        printk(KERN_DEBUG "autofs: negative dentry on expiry queue: %s\n",
                                ent->name);
                         autofs_delete_usage(ent);
                         continue;
@@ -80,14 +82,16 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                    point to the mounted-on-top root. */
                 if (!S_ISDIR(path.dentry->d_inode->i_mode) ||
                     !d_mountpoint(path.dentry)) {
-                        DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name));
+                        DPRINTK(("autofs: not expirable \
+                                (not a mounted directory): %s\n", ent->name));
                         continue;
                 }
                 path.mnt = mnt;
                 path_get(&path);
                 if (!follow_down(&path)) {
                         path_put(&path);
-                        DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name));
+                        DPRINTK(("autofs: not expirable\
+                        (not a mounted directory): %s\n", ent->name));
                         continue;
                 }
                 while (d_mountpoint(path.dentry) && follow_down(&path))
@@ -96,30 +100,37 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                 path_put(&path);
 
                 if (umount_ok) {
-                        DPRINTK(("autofs: signaling expire on %s\n", ent->name));
+                        DPRINTK(("autofs: signaling expire on %s\n",
+                                                                ent->name));
                         return ent; /* Expirable! */
                 }
-                DPRINTK(("autofs: didn't expire due to may_umount: %s\n", ent->name));
+
+                DPRINTK(("autofs: didn't expire due to may_umount: %s\n",
+                                                                ent->name));
         }
         return NULL;            /* No expirable entries */
 }
 
-void autofs_initialize_hash(struct autofs_dirhash *dh) {
+void autofs_initialize_hash(struct autofs_dirhash *dh)
+{
         memset(&dh->h, 0, AUTOFS_HASH_SIZE*sizeof(struct autofs_dir_ent *));
         INIT_LIST_HEAD(&dh->expiry_head);
 }
 
-struct autofs_dir_ent *autofs_hash_lookup(const struct autofs_dirhash *dh, struct qstr *name)
+struct autofs_dir_ent *autofs_hash_lookup(const struct autofs_dirhash *dh,
+                                                struct qstr *name)
 {
         struct autofs_dir_ent *dhn;
 
         DPRINTK(("autofs_hash_lookup: hash = 0x%08x, name = ", name->hash));
-        autofs_say(name->name,name->len);
+        autofs_say(name->name, name->len);
 
-        for ( dhn = dh->h[(unsigned) name->hash % AUTOFS_HASH_SIZE] ; dhn ; dhn = dhn->next ) {
-                if ( name->hash == dhn->hash &&
+        for (dhn = dh->h[(unsigned) name->hash % AUTOFS_HASH_SIZE];
+                dhn;
+                dhn = dhn->next) {
+                if (name->hash == dhn->hash &&
                      name->len == dhn->len &&
-                     !memcmp(name->name, dhn->name, name->len) )
+                     !memcmp(name->name, dhn->name, name->len))
                         break;
         }
 
@@ -131,9 +142,9 @@ void autofs_hash_insert(struct autofs_dirhash *dh, struct autofs_dir_ent *ent)
         struct autofs_dir_ent **dhnp;
 
         DPRINTK(("autofs_hash_insert: hash = 0x%08x, name = ", ent->hash));
-        autofs_say(ent->name,ent->len);
+        autofs_say(ent->name, ent->len);
 
-        autofs_init_usage(dh,ent);
+        autofs_init_usage(dh, ent);
         if (ent->dentry)
                 dget(ent->dentry);
 
@@ -141,19 +152,19 @@ void autofs_hash_insert(struct autofs_dirhash *dh, struct autofs_dir_ent *ent)
         ent->next = *dhnp;
         ent->back = dhnp;
         *dhnp = ent;
-        if ( ent->next )
+        if (ent->next)
                 ent->next->back = &(ent->next);
 }
 
 void autofs_hash_delete(struct autofs_dir_ent *ent)
 {
         *(ent->back) = ent->next;
-        if ( ent->next )
+        if (ent->next)
                 ent->next->back = ent->back;
 
         autofs_delete_usage(ent);
 
-        if ( ent->dentry )
+        if (ent->dentry)
                 dput(ent->dentry);
         kfree(ent->name);
         kfree(ent);
@@ -176,37 +187,37 @@ struct autofs_dir_ent *autofs_hash_enum(const struct autofs_dirhash *dh,
         bucket = (*ptr >> 16) - 1;
         ecount = *ptr & 0xffff;
 
-        if ( bucket < 0 ) {
+        if (bucket < 0)
                 bucket = ecount = 0;
-        } 
 
         DPRINTK(("autofs_hash_enum: bucket %d, entry %d\n", bucket, ecount));
 
         ent = last ? last->next : NULL;
 
-        if ( ent ) {
+        if (ent) {
                 ecount++;
         } else {
-                while  ( bucket < AUTOFS_HASH_SIZE ) {
+                while  (bucket < AUTOFS_HASH_SIZE) {
                         ent = dh->h[bucket];
-                        for ( i = ecount ; ent && i ; i-- )
+                        for (i = ecount ; ent && i ; i--)
                                 ent = ent->next;
-                        
+
                         if (ent) {
                                 ecount++; /* Point to *next* entry */
                                 break;
                         }
-                        
+
                         bucket++; ecount = 0;
                 }
         }
 
 #ifdef DEBUG
-        if ( !ent )
-                printk("autofs_hash_enum: nothing found\n");
+        if (!ent)
+                printk(KERN_DEBUG "autofs_hash_enum: nothing found\n");
         else {
-                printk("autofs_hash_enum: found hash %08x, name", ent->hash);
-                autofs_say(ent->name,ent->len);
+                printk(KERN_DEBUG "autofs_hash_enum: found hash %08x, name",
+                                                                ent->hash);
+                autofs_say(ent->name, ent->len);
         }
 #endif
 
@@ -221,9 +232,9 @@ void autofs_hash_dputall(struct autofs_dirhash *dh)
         int i;
         struct autofs_dir_ent *ent;
 
-        for ( i = 0 ; i < AUTOFS_HASH_SIZE ; i++ ) {
-                for ( ent = dh->h[i] ; ent ; ent = ent->next ) {
-                        if ( ent->dentry ) {
+        for (i = 0 ; i < AUTOFS_HASH_SIZE ; i++) {
+                for (ent = dh->h[i] ; ent ; ent = ent->next) {
+                        if (ent->dentry) {
                                 dput(ent->dentry);
                                 ent->dentry = NULL;
                         }
@@ -238,10 +249,10 @@ void autofs_hash_nuke(struct autofs_sb_info *sbi)
         int i;
         struct autofs_dir_ent *ent, *nent;
 
-        for ( i = 0 ; i < AUTOFS_HASH_SIZE ; i++ ) {
-                for ( ent = sbi->dirhash.h[i] ; ent ; ent = nent ) {
+        for (i = 0 ; i < AUTOFS_HASH_SIZE ; i++) {
+                for (ent = sbi->dirhash.h[i] ; ent ; ent = nent) {
                         nent = ent->next;
-                        if ( ent->dentry )
+                        if (ent->dentry)
                                 dput(ent->dentry);
                         kfree(ent->name);
                         kfree(ent);
diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig
deleted file mode 100644
index 8553f3517454..000000000000
--- a/drivers/staging/batman-adv/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# B.A.T.M.A.N meshing protocol
-#
-
-config BATMAN_ADV
-        tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
-        depends on NET
-        default n
-        ---help---
-
-        B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
-        a routing protocol for multi-hop ad-hoc mesh networks. The
-        networks may be wired or wireless. See
-        http://www.open-mesh.org/ for more information and user space
-        tools.
-
-config BATMAN_ADV_DEBUG
-        bool "B.A.T.M.A.N. debugging"
-        depends on BATMAN_ADV != n
-        ---help---
-
-          This is an option for use by developers; most people should
-          say N here. This enables compilation of support for
-          outputting debugging information to the kernel log. The
-          output is controlled via the module parameter debug.
-
diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile
deleted file mode 100644
index 78924283ea74..000000000000
--- a/drivers/staging/batman-adv/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
-#
-# Marek Lindner, Simon Wunderlich
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public
-# License 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA
-#
-
-obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o unicast.o
diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README
deleted file mode 100644
index 7c878bb07f3a..000000000000
--- a/drivers/staging/batman-adv/README
+++ /dev/null
@@ -1,240 +0,0 @@
-[state: 04-09-2010]
-
-BATMAN-ADV
-----------
-
-Batman  advanced  is  a new approach to wireless networking which
-does no longer operate on the IP basis. Unlike the batman daemon,
-which  exchanges  information  using UDP packets and sets routing
-tables, batman-advanced operates on ISO/OSI Layer 2 only and uses
-and  routes  (or  better: bridges) Ethernet Frames. It emulates a
-virtual network switch of all nodes participating.  Therefore all
-nodes  appear  to be link local, thus all higher operating proto-
-cols won't be affected by any changes within the network. You can
-run almost any protocol above batman advanced, prominent examples
-are: IPv4, IPv6, DHCP, IPX.
-
-Batman advanced was implemented as a Linux kernel driver  to  re-
-duce the overhead to a minimum. It does not depend on any (other)
-network driver, and can be used on wifi as well as ethernet  lan,
-vpn,  etc ... (anything with ethernet-style layer 2).
-
-CONFIGURATION
--------------
-
-Load the batman-adv module into your kernel:
-
-# insmod batman-adv.ko
-
-The  module  is now waiting for activation. You must add some in-
-terfaces on which batman can operate. After  loading  the  module
-batman  advanced  will scan your systems interfaces to search for
-compatible interfaces. Once found, it will create  subfolders  in
-the /sys directories of each supported interface, e.g.
-
-# ls /sys/class/net/eth0/batman_adv/
-# iface_status  mesh_iface
-
-If an interface does not have the "batman_adv" subfolder it prob-
-ably is not supported. Not supported  interfaces  are:  loopback,
-non-ethernet and batman's own interfaces.
-
-Note:  After the module was loaded it will continuously watch for
-new interfaces to verify the compatibility. There is no  need  to
-reload the module if you plug your USB wifi adapter into your ma-
-chine after batman advanced was initially loaded.
-
-To activate a  given  interface  simply  write  "bat0"  into  its
-"mesh_iface" file inside the batman_adv subfolder:
-
-# echo bat0 > /sys/class/net/eth0/batman_adv/mesh_iface
-
-Repeat  this step for all interfaces you wish to add.  Now batman
-starts using/broadcasting on this/these interface(s).
-
-By reading the "iface_status" file you can check its status:
-
-# cat /sys/class/net/eth0/batman_adv/iface_status
-# active
-
-To deactivate an interface you have  to  write  "none"  into  its
-"mesh_iface" file:
-
-# echo none > /sys/class/net/eth0/batman_adv/mesh_iface
-
-
-All  mesh  wide  settings  can be found in batman's own interface
-folder:
-
-#  ls  /sys/class/net/bat0/mesh/
-#  aggregated_ogms  bonding  orig_interval  vis_mode
-
-
-There is a special folder for debugging informations:
-
-#  ls /sys/kernel/debug/batman_adv/bat0/
-#  originators  socket  transtable_global  transtable_local
-#  vis_data
-
-
-Some of the files contain all sort of status information  regard-
-ing  the  mesh  network.  For  example, you can view the table of
-originators (mesh participants) with:
-
-# cat /sys/kernel/debug/batman_adv/bat0/originators
-
-Other files allow to change batman's behaviour to better fit your
-requirements.  For instance, you can check the current originator
-interval (value in milliseconds which determines how often batman
-sends its broadcast packets):
-
-# cat /sys/class/net/bat0/mesh/orig_interval
-# 1000
-
-and also change its value:
-
-# echo 3000 > /sys/class/net/bat0/mesh/orig_interval
-
-In very mobile scenarios, you might want to adjust the originator
-interval to a lower value. This will make the mesh  more  respon-
-sive to topology changes, but will also increase the overhead.
-
-
-USAGE
------
-
-To  make use of your newly created mesh, batman advanced provides
-a new interface "bat0" which you should use from this  point  on.
-All  interfaces  added  to  batman  advanced are not relevant any
-longer because batman handles them for you. Basically, one "hands
-over" the data by using the batman interface and batman will make
-sure it reaches its destination.
-
-The "bat0" interface can be used like any  other  regular  inter-
-face.  It needs an IP address which can be either statically con-
-figured or dynamically (by using DHCP or similar services):
-
-# NodeA: ifconfig bat0 192.168.0.1
-# NodeB: ifconfig bat0 192.168.0.2
-# NodeB: ping 192.168.0.1
-
-Note:  In  order to avoid problems remove all IP addresses previ-
-ously assigned to interfaces now used by batman advanced, e.g.
-
-# ifconfig eth0 0.0.0.0
-
-
-VISUALIZATION
--------------
-
-If you want topology visualization, at least one mesh  node  must
-be configured as VIS-server:
-
-# echo "server" > /sys/class/net/bat0/mesh/vis_mode
-
-Each  node  is  either configured as "server" or as "client" (de-
-fault: "client").  Clients send their topology data to the server
-next to them, and server synchronize with other servers. If there
-is no server configured (default) within the  mesh,  no  topology
-information   will  be  transmitted.  With  these  "synchronizing
-servers", there can be 1 or more vis servers sharing the same (or
-at least very similar) data.
-
-When  configured  as  server,  you can get a topology snapshot of
-your mesh:
-
-# cat /sys/kernel/debug/batman_adv/bat0/vis_data
-
-This raw output is intended to be easily parsable and convertable
-with  other tools. Have a look at the batctl README if you want a
-vis output in dot or json format for instance and how those  out-
-puts could then be visualised in an image.
-
-The raw format consists of comma separated values per entry where
-each entry is giving information about a  certain  source  inter-
-face.  Each  entry can/has to have the following values:
--> "mac" - mac address of an originator's source interface
-           (each line begins with it)
--> "TQ mac  value"  -  src mac's link quality towards mac address
-                       of a neighbor originator's interface which
-                       is being used for routing
--> "HNA mac" - HNA announced by source mac
--> "PRIMARY" - this  is a primary interface
--> "SEC mac" - secondary mac address of source
-               (requires preceding PRIMARY)
-
-The TQ value has a range from 4 to 255 with 255 being  the  best.
-The HNA entries are showing which hosts are connected to the mesh
-via bat0 or being bridged into the mesh network.  The PRIMARY/SEC
-values are only applied on primary interfaces
-
-
-LOGGING/DEBUGGING
------------------
-
-All error messages, warnings and information messages are sent to
-the kernel log. Depending on your operating  system  distribution
-this  can  be read in one of a number of ways. Try using the com-
-mands: dmesg, logread, or looking in the files  /var/log/kern.log
-or  /var/log/syslog.  All  batman-adv  messages are prefixed with
-"batman-adv:" So to see just these messages try
-
-# dmesg | grep batman-adv
-
-When investigating problems with your mesh network  it  is  some-
-times  necessary  to see more detail debug messages. This must be
-enabled when compiling the batman-adv module. When building  bat-
-man-adv  as  part of kernel, use "make menuconfig" and enable the
-option "B.A.T.M.A.N. debugging".
-
-Those additional  debug messages can be accessed  using a special
-file in debugfs
-
-# cat /sys/kernel/debug/batman_adv/bat0/log
-
-The additional debug output is by default disabled. It can be en-
-abled  during run time. Following log_levels are defined:
-
-0 - All  debug  output  disabled
-1 - Enable messages related to routing / flooding / broadcasting
-2 - Enable route or hna added / changed / deleted
-3 - Enable all messages
-
-The debug output can be changed at runtime  using  the  file
-/sys/class/net/bat0/mesh/log_level. e.g.
-
-# echo 2 > /sys/class/net/bat0/mesh/log_level
-
-will enable debug messages for when routes or HNAs change.
-
-
-BATCTL
-------
-
-As batman advanced operates on layer 2 all hosts participating in
-the  virtual switch are completely transparent for all  protocols
-above layer 2. Therefore the common diagnosis tools do  not  work
-as  expected.  To  overcome these problems batctl was created. At
-the  moment the  batctl contains ping,  traceroute,  tcpdump  and
-interfaces to the kernel module settings.
-
-For more information, please see the manpage (man batctl).
-
-batctl is available on http://www.open-mesh.org/
-
-
-CONTACT
--------
-
-Please send us comments, experiences, questions, anything :)
-
-IRC:            #batman   on   irc.freenode.org
-Mailing-list:   b.a.t.m.a.n@b.a.t.m.a.n@lists.open-mesh.org
-                (optional   subscription   at
-                 https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)
-
-You can also contact the Authors:
-
-Marek  Lindner  <lindner_marek@yahoo.de>
-Simon  Wunderlich  <siwu@hrz.tu-chemnitz.de>
-
diff --git a/drivers/staging/batman-adv/TODO b/drivers/staging/batman-adv/TODO
deleted file mode 100644
index 11c384f8b063..000000000000
--- a/drivers/staging/batman-adv/TODO
+++ /dev/null
@@ -1,14 +0,0 @@
- * remove own list functionality from hash
- * use hlist_head, hlist_node in hash
- * don't use callbacks for compare+choose in hash
- * think about more efficient ways instead of abstraction of hash
- * Request a new review
- * Process the comments from the review
- * Move into mainline proper
-
-Please send all patches to:
-        Marek Lindner <lindner_marek@yahoo.de>
-        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
-        Andrew Lunn <andrew@lunn.ch>
-        b.a.t.m.a.n@lists.open-mesh.org
-        Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/batman-adv/aggregation.c b/drivers/staging/batman-adv/aggregation.c
deleted file mode 100644
index 08624d44e231..000000000000
--- a/drivers/staging/batman-adv/aggregation.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "aggregation.h"
-#include "send.h"
-#include "routing.h"
-
-/* calculate the size of the hna information for a given packet */
-static int hna_len(struct batman_packet *batman_packet)
-{
-        return batman_packet->num_hna * ETH_ALEN;
-}
-
-/* return true if new_packet can be aggregated with forw_packet */
-static bool can_aggregate_with(struct batman_packet *new_batman_packet,
-                               int packet_len,
-                               unsigned long send_time,
-                               bool directlink,
-                               struct batman_if *if_incoming,
-                               struct forw_packet *forw_packet)
-{
-        struct batman_packet *batman_packet =
-                (struct batman_packet *)forw_packet->skb->data;
-        int aggregated_bytes = forw_packet->packet_len + packet_len;
-
-        /**
-         * we can aggregate the current packet to this aggregated packet
-         * if:
-         *
-         * - the send time is within our MAX_AGGREGATION_MS time
-         * - the resulting packet wont be bigger than
-         *   MAX_AGGREGATION_BYTES
-         */
-
-        if (time_before(send_time, forw_packet->send_time) &&
-            time_after_eq(send_time + msecs_to_jiffies(MAX_AGGREGATION_MS),
-                                        forw_packet->send_time) &&
-            (aggregated_bytes <= MAX_AGGREGATION_BYTES)) {
-
-                /**
-                 * check aggregation compatibility
-                 * -> direct link packets are broadcasted on
-                 *    their interface only
-                 * -> aggregate packet if the current packet is
-                 *    a "global" packet as well as the base
-                 *    packet
-                 */
-
-                /* packets without direct link flag and high TTL
-                 * are flooded through the net  */
-                if ((!directlink) &&
-                    (!(batman_packet->flags & DIRECTLINK)) &&
-                    (batman_packet->ttl != 1) &&
-
-                    /* own packets originating non-primary
-                     * interfaces leave only that interface */
-                    ((!forw_packet->own) ||
-                     (forw_packet->if_incoming->if_num == 0)))
-                        return true;
-
-                /* if the incoming packet is sent via this one
-                 * interface only - we still can aggregate */
-                if ((directlink) &&
-                    (new_batman_packet->ttl == 1) &&
-                    (forw_packet->if_incoming == if_incoming) &&
-
-                    /* packets from direct neighbors or
-                     * own secondary interface packets
-                     * (= secondary interface packets in general) */
-                    (batman_packet->flags & DIRECTLINK ||
-                     (forw_packet->own &&
-                      forw_packet->if_incoming->if_num != 0)))
-                        return true;
-        }
-
-        return false;
-}
-
-#define atomic_dec_not_zero(v)          atomic_add_unless((v), -1, 0)
-/* create a new aggregated packet and add this packet to it */
-static void new_aggregated_packet(unsigned char *packet_buff, int packet_len,
-                                  unsigned long send_time, bool direct_link,
-                                  struct batman_if *if_incoming,
-                                  int own_packet)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct forw_packet *forw_packet_aggr;
-        unsigned long flags;
-        unsigned char *skb_buff;
-
-        /* own packet should always be scheduled */
-        if (!own_packet) {
-                if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) {
-                        bat_dbg(DBG_BATMAN, bat_priv,
-                                "batman packet queue full\n");
-                        return;
-                }
-        }
-
-        forw_packet_aggr = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);
-        if (!forw_packet_aggr) {
-                if (!own_packet)
-                        atomic_inc(&bat_priv->batman_queue_left);
-                return;
-        }
-
-        if ((atomic_read(&bat_priv->aggregation_enabled)) &&
-            (packet_len < MAX_AGGREGATION_BYTES))
-                forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES +
-                                                      sizeof(struct ethhdr));
-        else
-                forw_packet_aggr->skb = dev_alloc_skb(packet_len +
-                                                      sizeof(struct ethhdr));
-
-        if (!forw_packet_aggr->skb) {
-                if (!own_packet)
-                        atomic_inc(&bat_priv->batman_queue_left);
-                kfree(forw_packet_aggr);
-                return;
-        }
-        skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr));
-
-        INIT_HLIST_NODE(&forw_packet_aggr->list);
-
-        skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
-        forw_packet_aggr->packet_len = packet_len;
-        memcpy(skb_buff, packet_buff, packet_len);
-
-        forw_packet_aggr->own = own_packet;
-        forw_packet_aggr->if_incoming = if_incoming;
-        forw_packet_aggr->num_packets = 0;
-        forw_packet_aggr->direct_link_flags = 0;
-        forw_packet_aggr->send_time = send_time;
-
-        /* save packet direct link flag status */
-        if (direct_link)
-                forw_packet_aggr->direct_link_flags |= 1;
-
-        /* add new packet to packet list */
-        spin_lock_irqsave(&bat_priv->forw_bat_list_lock, flags);
-        hlist_add_head(&forw_packet_aggr->list, &bat_priv->forw_bat_list);
-        spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-
-        /* start timer for this packet */
-        INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work,
-                          send_outstanding_bat_packet);
-        queue_delayed_work(bat_event_workqueue,
-                           &forw_packet_aggr->delayed_work,
-                           send_time - jiffies);
-}
-
-/* aggregate a new packet into the existing aggregation */
-static void aggregate(struct forw_packet *forw_packet_aggr,
-                      unsigned char *packet_buff,
-                      int packet_len,
-                      bool direct_link)
-{
-        unsigned char *skb_buff;
-
-        skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
-        memcpy(skb_buff, packet_buff, packet_len);
-        forw_packet_aggr->packet_len += packet_len;
-        forw_packet_aggr->num_packets++;
-
-        /* save packet direct link flag status */
-        if (direct_link)
-                forw_packet_aggr->direct_link_flags |=
-                        (1 << forw_packet_aggr->num_packets);
-}
-
-void add_bat_packet_to_list(struct bat_priv *bat_priv,
-                            unsigned char *packet_buff, int packet_len,
-                            struct batman_if *if_incoming, char own_packet,
-                            unsigned long send_time)
-{
-        /**
-         * _aggr -> pointer to the packet we want to aggregate with
-         * _pos -> pointer to the position in the queue
-         */
-        struct forw_packet *forw_packet_aggr = NULL, *forw_packet_pos = NULL;
-        struct hlist_node *tmp_node;
-        struct batman_packet *batman_packet =
-                (struct batman_packet *)packet_buff;
-        bool direct_link = batman_packet->flags & DIRECTLINK ? 1 : 0;
-        unsigned long flags;
-
-        /* find position for the packet in the forward queue */
-        spin_lock_irqsave(&bat_priv->forw_bat_list_lock, flags);
-        /* own packets are not to be aggregated */
-        if ((atomic_read(&bat_priv->aggregation_enabled)) && (!own_packet)) {
-                hlist_for_each_entry(forw_packet_pos, tmp_node,
-                                     &bat_priv->forw_bat_list, list) {
-                        if (can_aggregate_with(batman_packet,
-                                               packet_len,
-                                               send_time,
-                                               direct_link,
-                                               if_incoming,
-                                               forw_packet_pos)) {
-                                forw_packet_aggr = forw_packet_pos;
-                                break;
-                        }
-                }
-        }
-
-        /* nothing to aggregate with - either aggregation disabled or no
-         * suitable aggregation packet found */
-        if (forw_packet_aggr == NULL) {
-                /* the following section can run without the lock */
-                spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-
-                /**
-                 * if we could not aggregate this packet with one of the others
-                 * we hold it back for a while, so that it might be aggregated
-                 * later on
-                 */
-                if ((!own_packet) &&
-                    (atomic_read(&bat_priv->aggregation_enabled)))
-                        send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);
-
-                new_aggregated_packet(packet_buff, packet_len,
-                                      send_time, direct_link,
-                                      if_incoming, own_packet);
-        } else {
-                aggregate(forw_packet_aggr,
-                          packet_buff, packet_len,
-                          direct_link);
-                spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-        }
-}
-
-/* unpack the aggregated packets and process them one by one */
-void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
-                             int packet_len, struct batman_if *if_incoming)
-{
-        struct batman_packet *batman_packet;
-        int buff_pos = 0;
-        unsigned char *hna_buff;
-
-        batman_packet = (struct batman_packet *)packet_buff;
-
-        do {
-                /* network to host order for our 32bit seqno, and the
-                   orig_interval. */
-                batman_packet->seqno = ntohl(batman_packet->seqno);
-
-                hna_buff = packet_buff + buff_pos + BAT_PACKET_LEN;
-                receive_bat_packet(ethhdr, batman_packet,
-                                   hna_buff, hna_len(batman_packet),
-                                   if_incoming);
-
-                buff_pos += BAT_PACKET_LEN + hna_len(batman_packet);
-                batman_packet = (struct batman_packet *)
-                        (packet_buff + buff_pos);
-        } while (aggregated_packet(buff_pos, packet_len,
-                                   batman_packet->num_hna));
-}
diff --git a/drivers/staging/batman-adv/aggregation.h b/drivers/staging/batman-adv/aggregation.h
deleted file mode 100644
index 71a91b3da913..000000000000
--- a/drivers/staging/batman-adv/aggregation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_AGGREGATION_H_
-#define _NET_BATMAN_ADV_AGGREGATION_H_
-
-#include "main.h"
-
-/* is there another aggregated packet here? */
-static inline int aggregated_packet(int buff_pos, int packet_len, int num_hna)
-{
-        int next_buff_pos = buff_pos + BAT_PACKET_LEN + (num_hna * ETH_ALEN);
-
-        return (next_buff_pos <= packet_len) &&
-                (next_buff_pos <= MAX_AGGREGATION_BYTES);
-}
-
-void add_bat_packet_to_list(struct bat_priv *bat_priv,
-                            unsigned char *packet_buff, int packet_len,
-                            struct batman_if *if_incoming, char own_packet,
-                            unsigned long send_time);
-void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
-                             int packet_len, struct batman_if *if_incoming);
-
-#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */
diff --git a/drivers/staging/batman-adv/bat_debugfs.c b/drivers/staging/batman-adv/bat_debugfs.c
deleted file mode 100644
index 57f84a9f8234..000000000000
--- a/drivers/staging/batman-adv/bat_debugfs.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-
-#include <linux/debugfs.h>
-
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "vis.h"
-#include "icmp_socket.h"
-
-static struct dentry *bat_debugfs;
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-#define LOG_BUFF_MASK (log_buff_len-1)
-#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK])
-
-static int log_buff_len = LOG_BUF_LEN;
-
-static void emit_log_char(struct debug_log *debug_log, char c)
-{
-        LOG_BUFF(debug_log->log_end) = c;
-        debug_log->log_end++;
-
-        if (debug_log->log_end - debug_log->log_start > log_buff_len)
-                debug_log->log_start = debug_log->log_end - log_buff_len;
-}
-
-static int fdebug_log(struct debug_log *debug_log, char *fmt, ...)
-{
-        int printed_len;
-        va_list args;
-        static char debug_log_buf[256];
-        char *p;
-        unsigned long flags;
-
-        if (!debug_log)
-                return 0;
-
-        spin_lock_irqsave(&debug_log->lock, flags);
-        va_start(args, fmt);
-        printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf),
-                                 fmt, args);
-        va_end(args);
-
-        for (p = debug_log_buf; *p != 0; p++)
-                emit_log_char(debug_log, *p);
-
-        spin_unlock_irqrestore(&debug_log->lock, flags);
-
-        wake_up(&debug_log->queue_wait);
-
-        return 0;
-}
-
-int debug_log(struct bat_priv *bat_priv, char *fmt, ...)
-{
-        va_list args;
-        char tmp_log_buf[256];
-
-        va_start(args, fmt);
-        vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
-        fdebug_log(bat_priv->debug_log, "[%10u] %s",
-                   (jiffies / HZ), tmp_log_buf);
-        va_end(args);
-
-        return 0;
-}
-
-static int log_open(struct inode *inode, struct file *file)
-{
-        nonseekable_open(inode, file);
-        file->private_data = inode->i_private;
-        inc_module_count();
-        return 0;
-}
-
-static int log_release(struct inode *inode, struct file *file)
-{
-        dec_module_count();
-        return 0;
-}
-
-static ssize_t log_read(struct file *file, char __user *buf,
-                        size_t count, loff_t *ppos)
-{
-        struct bat_priv *bat_priv = file->private_data;
-        struct debug_log *debug_log = bat_priv->debug_log;
-        int error, i = 0;
-        char c;
-        unsigned long flags;
-
-        if ((file->f_flags & O_NONBLOCK) &&
-            !(debug_log->log_end - debug_log->log_start))
-                return -EAGAIN;
-
-        if ((!buf) || (count < 0))
-                return -EINVAL;
-
-        if (count == 0)
-                return 0;
-
-        if (!access_ok(VERIFY_WRITE, buf, count))
-                return -EFAULT;
-
-        error = wait_event_interruptible(debug_log->queue_wait,
-                                (debug_log->log_start - debug_log->log_end));
-
-        if (error)
-                return error;
-
-        spin_lock_irqsave(&debug_log->lock, flags);
-
-        while ((!error) && (i < count) &&
-               (debug_log->log_start != debug_log->log_end)) {
-                c = LOG_BUFF(debug_log->log_start);
-
-                debug_log->log_start++;
-
-                spin_unlock_irqrestore(&debug_log->lock, flags);
-
-                error = __put_user(c, buf);
-
-                spin_lock_irqsave(&debug_log->lock, flags);
-
-                buf++;
-                i++;
-
-        }
-
-        spin_unlock_irqrestore(&debug_log->lock, flags);
-
-        if (!error)
-                return i;
-
-        return error;
-}
-
-static unsigned int log_poll(struct file *file, poll_table *wait)
-{
-        struct bat_priv *bat_priv = file->private_data;
-        struct debug_log *debug_log = bat_priv->debug_log;
-
-        poll_wait(file, &debug_log->queue_wait, wait);
-
-        if (debug_log->log_end - debug_log->log_start)
-                return POLLIN | POLLRDNORM;
-
-        return 0;
-}
-
-static const struct file_operations log_fops = {
-        .open           = log_open,
-        .release        = log_release,
-        .read           = log_read,
-        .poll           = log_poll,
-        .llseek         = no_llseek,
-};
-
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
-        struct dentry *d;
-
-        if (!bat_priv->debug_dir)
-                goto err;
-
-        bat_priv->debug_log = kzalloc(sizeof(struct debug_log), GFP_ATOMIC);
-        if (!bat_priv->debug_log)
-                goto err;
-
-        spin_lock_init(&bat_priv->debug_log->lock);
-        init_waitqueue_head(&bat_priv->debug_log->queue_wait);
-
-        d = debugfs_create_file("log", S_IFREG | S_IRUSR,
-                                bat_priv->debug_dir, bat_priv, &log_fops);
-        if (d)
-                goto err;
-
-        return 0;
-
-err:
-        return 1;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
-        kfree(bat_priv->debug_log);
-        bat_priv->debug_log = NULL;
-}
-#else /* CONFIG_BATMAN_ADV_DEBUG */
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
-        bat_priv->debug_log = NULL;
-        return 0;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
-        return;
-}
-#endif
-
-static int originators_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, orig_seq_print_text, net_dev);
-}
-
-static int transtable_global_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, hna_global_seq_print_text, net_dev);
-}
-
-static int transtable_local_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, hna_local_seq_print_text, net_dev);
-}
-
-static int vis_data_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, vis_seq_print_text, net_dev);
-}
-
-struct bat_debuginfo {
-        struct attribute attr;
-        const struct file_operations fops;
-};
-
-#define BAT_DEBUGINFO(_name, _mode, _open)      \
-struct bat_debuginfo bat_debuginfo_##_name = {  \
-        .attr = { .name = __stringify(_name),   \
-                  .mode = _mode, },             \
-        .fops = { .owner = THIS_MODULE,         \
-                  .open = _open,                \
-                  .read = seq_read,             \
-                  .llseek = seq_lseek,          \
-                  .release = single_release,    \
-                }                               \
-};
-
-static BAT_DEBUGINFO(originators, S_IRUGO, originators_open);
-static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open);
-static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open);
-static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open);
-
-static struct bat_debuginfo *mesh_debuginfos[] = {
-        &bat_debuginfo_originators,
-        &bat_debuginfo_transtable_global,
-        &bat_debuginfo_transtable_local,
-        &bat_debuginfo_vis_data,
-        NULL,
-};
-
-void debugfs_init(void)
-{
-        bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
-        if (bat_debugfs == ERR_PTR(-ENODEV))
-                bat_debugfs = NULL;
-}
-
-void debugfs_destroy(void)
-{
-        if (bat_debugfs) {
-                debugfs_remove_recursive(bat_debugfs);
-                bat_debugfs = NULL;
-        }
-}
-
-int debugfs_add_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_debuginfo **bat_debug;
-        struct dentry *file;
-
-        if (!bat_debugfs)
-                goto out;
-
-        bat_priv->debug_dir = debugfs_create_dir(dev->name, bat_debugfs);
-        if (!bat_priv->debug_dir)
-                goto out;
-
-        bat_socket_setup(bat_priv);
-        debug_log_setup(bat_priv);
-
-        for (bat_debug = mesh_debuginfos; *bat_debug; ++bat_debug) {
-                file = debugfs_create_file(((*bat_debug)->attr).name,
-                                          S_IFREG | ((*bat_debug)->attr).mode,
-                                          bat_priv->debug_dir,
-                                          dev, &(*bat_debug)->fops);
-                if (!file) {
-                        bat_err(dev, "Can't add debugfs file: %s/%s\n",
-                                dev->name, ((*bat_debug)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-rem_attr:
-        debugfs_remove_recursive(bat_priv->debug_dir);
-        bat_priv->debug_dir = NULL;
-out:
-#ifdef CONFIG_DEBUG_FS
-        return -ENOMEM;
-#else
-        return 0;
-#endif /* CONFIG_DEBUG_FS */
-}
-
-void debugfs_del_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-
-        debug_log_cleanup(bat_priv);
-
-        if (bat_debugfs) {
-                debugfs_remove_recursive(bat_priv->debug_dir);
-                bat_priv->debug_dir = NULL;
-        }
-}
diff --git a/drivers/staging/batman-adv/bat_debugfs.h b/drivers/staging/batman-adv/bat_debugfs.h
deleted file mode 100644
index 72df532b7d5f..000000000000
--- a/drivers/staging/batman-adv/bat_debugfs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-#ifndef _NET_BATMAN_ADV_DEBUGFS_H_
-#define _NET_BATMAN_ADV_DEBUGFS_H_
-
-#define DEBUGFS_BAT_SUBDIR "batman_adv"
-
-void debugfs_init(void);
-void debugfs_destroy(void);
-int debugfs_add_meshif(struct net_device *dev);
-void debugfs_del_meshif(struct net_device *dev);
-
-#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */
diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c
deleted file mode 100644
index bc17fb816300..000000000000
--- a/drivers/staging/batman-adv/bat_sysfs.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "vis.h"
-
-#define to_dev(obj)     container_of(obj, struct device, kobj)
-
-#define BAT_ATTR(_name, _mode, _show, _store)   \
-struct bat_attribute bat_attr_##_name = {       \
-        .attr = {.name = __stringify(_name),    \
-                 .mode = _mode },               \
-        .show   = _show,                        \
-        .store  = _store,                       \
-};
-
-static ssize_t show_aggr_ogms(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-        int aggr_status = atomic_read(&bat_priv->aggregation_enabled);
-
-        return sprintf(buff, "%s\n",
-                       aggr_status == 0 ? "disabled" : "enabled");
-}
-
-static ssize_t store_aggr_ogms(struct kobject *kobj, struct attribute *attr,
-                              char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        int aggr_tmp = -1;
-
-        if (((count == 2) && (buff[0] == '1')) ||
-            (strncmp(buff, "enable", 6) == 0))
-                aggr_tmp = 1;
-
-        if (((count == 2) && (buff[0] == '0')) ||
-            (strncmp(buff, "disable", 7) == 0))
-                aggr_tmp = 0;
-
-        if (aggr_tmp < 0) {
-                if (buff[count - 1] == '\n')
-                        buff[count - 1] = '\0';
-
-                bat_info(net_dev,
-                         "Invalid parameter for 'aggregate OGM' setting"
-                         "received: %s\n", buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->aggregation_enabled) == aggr_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing aggregation from: %s to: %s\n",
-                 atomic_read(&bat_priv->aggregation_enabled) == 1 ?
-                 "enabled" : "disabled", aggr_tmp == 1 ? "enabled" :
-                 "disabled");
-
-        atomic_set(&bat_priv->aggregation_enabled, (unsigned)aggr_tmp);
-        return count;
-}
-
-static ssize_t show_bond(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-        int bond_status = atomic_read(&bat_priv->bonding_enabled);
-
-        return sprintf(buff, "%s\n",
-                       bond_status == 0 ? "disabled" : "enabled");
-}
-
-static ssize_t store_bond(struct kobject *kobj, struct attribute *attr,
-                          char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        int bonding_enabled_tmp = -1;
-
-        if (((count == 2) && (buff[0] == '1')) ||
-            (strncmp(buff, "enable", 6) == 0))
-                bonding_enabled_tmp = 1;
-
-        if (((count == 2) && (buff[0] == '0')) ||
-            (strncmp(buff, "disable", 7) == 0))
-                bonding_enabled_tmp = 0;
-
-        if (bonding_enabled_tmp < 0) {
-                if (buff[count - 1] == '\n')
-                        buff[count - 1] = '\0';
-
-                bat_err(net_dev,
-                        "Invalid parameter for 'bonding' setting received: "
-                        "%s\n", buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->bonding_enabled) == bonding_enabled_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing bonding from: %s to: %s\n",
-                 atomic_read(&bat_priv->bonding_enabled) == 1 ?
-                 "enabled" : "disabled",
-                 bonding_enabled_tmp == 1 ? "enabled" : "disabled");
-
-        atomic_set(&bat_priv->bonding_enabled, (unsigned)bonding_enabled_tmp);
-        return count;
-}
-
-static ssize_t show_frag(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-        int frag_status = atomic_read(&bat_priv->frag_enabled);
-
-        return sprintf(buff, "%s\n",
-                       frag_status == 0 ? "disabled" : "enabled");
-}
-
-static ssize_t store_frag(struct kobject *kobj, struct attribute *attr,
-                          char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        int frag_enabled_tmp = -1;
-
-        if (((count == 2) && (buff[0] == '1')) ||
-            (strncmp(buff, "enable", 6) == 0))
-                frag_enabled_tmp = 1;
-
-        if (((count == 2) && (buff[0] == '0')) ||
-            (strncmp(buff, "disable", 7) == 0))
-                frag_enabled_tmp = 0;
-
-        if (frag_enabled_tmp < 0) {
-                if (buff[count - 1] == '\n')
-                        buff[count - 1] = '\0';
-
-                bat_err(net_dev,
-                        "Invalid parameter for 'fragmentation' setting on mesh"
-                        "received: %s\n", buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->frag_enabled) == frag_enabled_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing fragmentation from: %s to: %s\n",
-                 atomic_read(&bat_priv->frag_enabled) == 1 ?
-                 "enabled" : "disabled",
-                 frag_enabled_tmp == 1 ? "enabled" : "disabled");
-
-        atomic_set(&bat_priv->frag_enabled, (unsigned)frag_enabled_tmp);
-        update_min_mtu(net_dev);
-        return count;
-}
-
-static ssize_t show_vis_mode(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-        int vis_mode = atomic_read(&bat_priv->vis_mode);
-
-        return sprintf(buff, "%s\n",
-                       vis_mode == VIS_TYPE_CLIENT_UPDATE ?
-                                                        "client" : "server");
-}
-
-static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,
-                              char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        unsigned long val;
-        int ret, vis_mode_tmp = -1;
-
-        ret = strict_strtoul(buff, 10, &val);
-
-        if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||
-            (strncmp(buff, "client", 6) == 0) ||
-            (strncmp(buff, "off", 3) == 0))
-                vis_mode_tmp = VIS_TYPE_CLIENT_UPDATE;
-
-        if (((count == 2) && (!ret) && (val == VIS_TYPE_SERVER_SYNC)) ||
-            (strncmp(buff, "server", 6) == 0))
-                vis_mode_tmp = VIS_TYPE_SERVER_SYNC;
-
-        if (vis_mode_tmp < 0) {
-                if (buff[count - 1] == '\n')
-                        buff[count - 1] = '\0';
-
-                bat_info(net_dev,
-                         "Invalid parameter for 'vis mode' setting received: "
-                         "%s\n", buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing vis mode from: %s to: %s\n",
-                 atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ?
-                 "client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ?
-                 "client" : "server");
-
-        atomic_set(&bat_priv->vis_mode, (unsigned)vis_mode_tmp);
-        return count;
-}
-
-static ssize_t show_orig_interval(struct kobject *kobj, struct attribute *attr,
-                                 char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-
-        return sprintf(buff, "%i\n",
-                       atomic_read(&bat_priv->orig_interval));
-}
-
-static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr,
-                                  char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        unsigned long orig_interval_tmp;
-        int ret;
-
-        ret = strict_strtoul(buff, 10, &orig_interval_tmp);
-        if (ret) {
-                bat_info(net_dev, "Invalid parameter for 'orig_interval' "
-                         "setting received: %s\n", buff);
-                return -EINVAL;
-        }
-
-        if (orig_interval_tmp < JITTER * 2) {
-                bat_info(net_dev, "New originator interval too small: %li "
-                         "(min: %i)\n", orig_interval_tmp, JITTER * 2);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->orig_interval) == orig_interval_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing originator interval from: %i to: %li\n",
-                 atomic_read(&bat_priv->orig_interval),
-                 orig_interval_tmp);
-
-        atomic_set(&bat_priv->orig_interval, orig_interval_tmp);
-        return count;
-}
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-static ssize_t show_log_level(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct bat_priv *bat_priv = netdev_priv(to_net_dev(dev));
-        int log_level = atomic_read(&bat_priv->log_level);
-
-        return sprintf(buff, "%d\n", log_level);
-}
-
-static ssize_t store_log_level(struct kobject *kobj, struct attribute *attr,
-                              char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        unsigned long log_level_tmp;
-        int ret;
-
-        ret = strict_strtoul(buff, 10, &log_level_tmp);
-        if (ret) {
-                bat_info(net_dev, "Invalid parameter for 'log_level' "
-                         "setting received: %s\n", buff);
-                return -EINVAL;
-        }
-
-        if (log_level_tmp > 3) {
-                bat_info(net_dev, "New log level too big: %li "
-                         "(max: %i)\n", log_level_tmp, 3);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->log_level) == log_level_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing log level from: %i to: %li\n",
-                 atomic_read(&bat_priv->log_level),
-                 log_level_tmp);
-
-        atomic_set(&bat_priv->log_level, (unsigned)log_level_tmp);
-        return count;
-}
-#endif
-
-static BAT_ATTR(aggregated_ogms, S_IRUGO | S_IWUSR,
-                show_aggr_ogms, store_aggr_ogms);
-static BAT_ATTR(bonding, S_IRUGO | S_IWUSR, show_bond, store_bond);
-static BAT_ATTR(fragmentation, S_IRUGO | S_IWUSR, show_frag, store_frag);
-static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode);
-static BAT_ATTR(orig_interval, S_IRUGO | S_IWUSR,
-                show_orig_interval, store_orig_interval);
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-static BAT_ATTR(log_level, S_IRUGO | S_IWUSR, show_log_level, store_log_level);
-#endif
-
-static struct bat_attribute *mesh_attrs[] = {
-        &bat_attr_aggregated_ogms,
-        &bat_attr_bonding,
-        &bat_attr_fragmentation,
-        &bat_attr_vis_mode,
-        &bat_attr_orig_interval,
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-        &bat_attr_log_level,
-#endif
-        NULL,
-};
-
-int sysfs_add_meshif(struct net_device *dev)
-{
-        struct kobject *batif_kobject = &dev->dev.kobj;
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_attribute **bat_attr;
-        int err;
-
-        bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,
-                                                    batif_kobject);
-        if (!bat_priv->mesh_obj) {
-                bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                        SYSFS_IF_MESH_SUBDIR);
-                goto out;
-        }
-
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr) {
-                err = sysfs_create_file(bat_priv->mesh_obj,
-                                        &((*bat_attr)->attr));
-                if (err) {
-                        bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                dev->name, SYSFS_IF_MESH_SUBDIR,
-                                ((*bat_attr)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-
-rem_attr:
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-        kobject_put(bat_priv->mesh_obj);
-        bat_priv->mesh_obj = NULL;
-out:
-        return -ENOMEM;
-}
-
-void sysfs_del_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_attribute **bat_attr;
-
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-        kobject_put(bat_priv->mesh_obj);
-        bat_priv->mesh_obj = NULL;
-}
-
-static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,
-                               char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
-        ssize_t length;
-
-        if (!batman_if)
-                return 0;
-
-        length = sprintf(buff, "%s\n", batman_if->if_status == IF_NOT_IN_USE ?
-                         "none" : batman_if->soft_iface->name);
-
-        hardif_put(batman_if);
-
-        return length;
-}
-
-static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
-                                char *buff, size_t count)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
-        int status_tmp = -1;
-        int ret;
-
-        if (!batman_if)
-                return count;
-
-        if (buff[count - 1] == '\n')
-                buff[count - 1] = '\0';
-
-        if (strlen(buff) >= IFNAMSIZ) {
-                pr_err("Invalid parameter for 'mesh_iface' setting received: "
-                       "interface name too long '%s'\n", buff);
-                hardif_put(batman_if);
-                return -EINVAL;
-        }
-
-        if (strncmp(buff, "none", 4) == 0)
-                status_tmp = IF_NOT_IN_USE;
-        else
-                status_tmp = IF_I_WANT_YOU;
-
-        if ((batman_if->if_status == status_tmp) || ((batman_if->soft_iface) &&
-            (strncmp(batman_if->soft_iface->name, buff, IFNAMSIZ) == 0))) {
-                hardif_put(batman_if);
-                return count;
-        }
-
-        if (status_tmp == IF_NOT_IN_USE) {
-                rtnl_lock();
-                hardif_disable_interface(batman_if);
-                rtnl_unlock();
-                hardif_put(batman_if);
-                return count;
-        }
-
-        /* if the interface already is in use */
-        if (batman_if->if_status != IF_NOT_IN_USE) {
-                rtnl_lock();
-                hardif_disable_interface(batman_if);
-                rtnl_unlock();
-        }
-
-        ret = hardif_enable_interface(batman_if, buff);
-        hardif_put(batman_if);
-
-        return ret;
-}
-
-static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,
-                                 char *buff)
-{
-        struct device *dev = to_dev(kobj->parent);
-        struct net_device *net_dev = to_net_dev(dev);
-        struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
-        ssize_t length;
-
-        if (!batman_if)
-                return 0;
-
-        switch (batman_if->if_status) {
-        case IF_TO_BE_REMOVED:
-                length = sprintf(buff, "disabling\n");
-                break;
-        case IF_INACTIVE:
-                length = sprintf(buff, "inactive\n");
-                break;
-        case IF_ACTIVE:
-                length = sprintf(buff, "active\n");
-                break;
-        case IF_TO_BE_ACTIVATED:
-                length = sprintf(buff, "enabling\n");
-                break;
-        case IF_NOT_IN_USE:
-        default:
-                length = sprintf(buff, "not in use\n");
-                break;
-        }
-
-        hardif_put(batman_if);
-
-        return length;
-}
-
-static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR,
-                show_mesh_iface, store_mesh_iface);
-static BAT_ATTR(iface_status, S_IRUGO, show_iface_status, NULL);
-
-static struct bat_attribute *batman_attrs[] = {
-        &bat_attr_mesh_iface,
-        &bat_attr_iface_status,
-        NULL,
-};
-
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
-{
-        struct kobject *hardif_kobject = &dev->dev.kobj;
-        struct bat_attribute **bat_attr;
-        int err;
-
-        *hardif_obj = kobject_create_and_add(SYSFS_IF_BAT_SUBDIR,
-                                                    hardif_kobject);
-
-        if (!*hardif_obj) {
-                bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                        SYSFS_IF_BAT_SUBDIR);
-                goto out;
-        }
-
-        for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) {
-                err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
-                if (err) {
-                        bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                dev->name, SYSFS_IF_BAT_SUBDIR,
-                                ((*bat_attr)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-
-rem_attr:
-        for (bat_attr = batman_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
-out:
-        return -ENOMEM;
-}
-
-void sysfs_del_hardif(struct kobject **hardif_obj)
-{
-        kobject_put(*hardif_obj);
-        *hardif_obj = NULL;
-}
diff --git a/drivers/staging/batman-adv/bat_sysfs.h b/drivers/staging/batman-adv/bat_sysfs.h
deleted file mode 100644
index 7f186c007b4f..000000000000
--- a/drivers/staging/batman-adv/bat_sysfs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-#ifndef _NET_BATMAN_ADV_SYSFS_H_
-#define _NET_BATMAN_ADV_SYSFS_H_
-
-#define SYSFS_IF_MESH_SUBDIR "mesh"
-#define SYSFS_IF_BAT_SUBDIR "batman_adv"
-
-struct bat_attribute {
-        struct attribute attr;
-        ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
-                        char *buf);
-        ssize_t (*store)(struct kobject *kobj, struct attribute *attr,
-                         char *buf, size_t count);
-};
-
-int sysfs_add_meshif(struct net_device *dev);
-void sysfs_del_meshif(struct net_device *dev);
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev);
-void sysfs_del_hardif(struct kobject **hardif_obj);
-
-#endif /* _NET_BATMAN_ADV_SYSFS_H_ */
diff --git a/drivers/staging/batman-adv/bitarray.c b/drivers/staging/batman-adv/bitarray.c
deleted file mode 100644
index 814274fbaa2f..000000000000
--- a/drivers/staging/batman-adv/bitarray.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bitarray.h"
-
-#include <linux/bitops.h>
-
-/* returns true if the corresponding bit in the given seq_bits indicates true
- * and curr_seqno is within range of last_seqno */
-uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno,
-                       uint32_t curr_seqno)
-{
-        int32_t diff, word_offset, word_num;
-
-        diff = last_seqno - curr_seqno;
-        if (diff < 0 || diff >= TQ_LOCAL_WINDOW_SIZE) {
-                return 0;
-        } else {
-                /* which word */
-                word_num = (last_seqno - curr_seqno) / WORD_BIT_SIZE;
-                /* which position in the selected word */
-                word_offset = (last_seqno - curr_seqno) % WORD_BIT_SIZE;
-
-                if (seq_bits[word_num] & 1 << word_offset)
-                        return 1;
-                else
-                        return 0;
-        }
-}
-
-/* turn corresponding bit on, so we can remember that we got the packet */
-void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n)
-{
-        int32_t word_offset, word_num;
-
-        /* if too old, just drop it */
-        if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE)
-                return;
-
-        /* which word */
-        word_num = n / WORD_BIT_SIZE;
-        /* which position in the selected word */
-        word_offset = n % WORD_BIT_SIZE;
-
-        seq_bits[word_num] |= 1 << word_offset; /* turn the position on */
-}
-
-/* shift the packet array by n places. */
-static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n)
-{
-        int32_t word_offset, word_num;
-        int32_t i;
-
-        if (n <= 0 || n >= TQ_LOCAL_WINDOW_SIZE)
-                return;
-
-        word_offset = n % WORD_BIT_SIZE;/* shift how much inside each word */
-        word_num = n / WORD_BIT_SIZE;   /* shift over how much (full) words */
-
-        for (i = NUM_WORDS - 1; i > word_num; i--) {
-                /* going from old to new, so we don't overwrite the data we copy
-                 * from.
-                 *
-                 * left is high, right is low: FEDC BA98 7654 3210
-                 *                                        ^^ ^^
-                 *                             vvvv
-                 * ^^^^ = from, vvvvv =to, we'd have word_num==1 and
-                 * word_offset==WORD_BIT_SIZE/2 ????? in this example.
-                 * (=24 bits)
-                 *
-                 * our desired output would be: 9876 5432 1000 0000
-                 * */
-
-                seq_bits[i] =
-                        (seq_bits[i - word_num] << word_offset) +
-                        /* take the lower port from the left half, shift it left
-                         * to its final position */
-                        (seq_bits[i - word_num - 1] >>
-                         (WORD_BIT_SIZE-word_offset));
-                /* and the upper part of the right half and shift it left to
-                 * it's position */
-                /* for our example that would be: word[0] = 9800 + 0076 =
-                 * 9876 */
-        }
-        /* now for our last word, i==word_num, we only have the it's "left"
-         * half. that's the 1000 word in our example.*/
-
-        seq_bits[i] = (seq_bits[i - word_num] << word_offset);
-
-        /* pad the rest with 0, if there is anything */
-        i--;
-
-        for (; i >= 0; i--)
-                seq_bits[i] = 0;
-}
-
-static void bit_reset_window(TYPE_OF_WORD *seq_bits)
-{
-        int i;
-        for (i = 0; i < NUM_WORDS; i++)
-                seq_bits[i] = 0;
-}
-
-
-/* receive and process one packet within the sequence number window.
- *
- * returns:
- *  1 if the window was moved (either new or very old)
- *  0 if the window was not moved/shifted.
- */
-char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits,
-                    int32_t seq_num_diff, int8_t set_mark)
-{
-        struct bat_priv *bat_priv = (struct bat_priv *)priv;
-
-        /* sequence number is slightly older. We already got a sequence number
-         * higher than this one, so we just mark it. */
-
-        if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {
-                if (set_mark)
-                        bit_mark(seq_bits, -seq_num_diff);
-                return 0;
-        }
-
-        /* sequence number is slightly newer, so we shift the window and
-         * set the mark if required */
-
-        if ((seq_num_diff > 0) && (seq_num_diff < TQ_LOCAL_WINDOW_SIZE)) {
-                bit_shift(seq_bits, seq_num_diff);
-
-                if (set_mark)
-                        bit_mark(seq_bits, 0);
-                return 1;
-        }
-
-        /* sequence number is much newer, probably missed a lot of packets */
-
-        if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
-                || (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "We missed a lot of packets (%i) !\n",
-                        seq_num_diff - 1);
-                bit_reset_window(seq_bits);
-                if (set_mark)
-                        bit_mark(seq_bits, 0);
-                return 1;
-        }
-
-        /* received a much older packet. The other host either restarted
-         * or the old packet got delayed somewhere in the network. The
-         * packet should be dropped without calling this function if the
-         * seqno window is protected. */
-
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
-                || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
-
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Other host probably restarted!\n");
-
-                bit_reset_window(seq_bits);
-                if (set_mark)
-                        bit_mark(seq_bits, 0);
-
-                return 1;
-        }
-
-        /* never reached */
-        return 0;
-}
-
-/* count the hamming weight, how many good packets did we receive? just count
- * the 1's.
- */
-int bit_packet_count(TYPE_OF_WORD *seq_bits)
-{
-        int i, hamming = 0;
-
-        for (i = 0; i < NUM_WORDS; i++)
-                hamming += hweight_long(seq_bits[i]);
-
-        return hamming;
-}
diff --git a/drivers/staging/batman-adv/bitarray.h b/drivers/staging/batman-adv/bitarray.h
deleted file mode 100644
index 77b1e61847e8..000000000000
--- a/drivers/staging/batman-adv/bitarray.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_BITARRAY_H_
-#define _NET_BATMAN_ADV_BITARRAY_H_
-
-/* you should choose something big, if you don't want to waste cpu
- * and keep the type in sync with bit_packet_count */
-#define TYPE_OF_WORD unsigned long
-#define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8)
-
-/* returns true if the corresponding bit in the given seq_bits indicates true
- * and curr_seqno is within range of last_seqno */
-uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno,
-                                           uint32_t curr_seqno);
-
-/* turn corresponding bit on, so we can remember that we got the packet */
-void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n);
-
-
-/* receive and process one packet, returns 1 if received seq_num is considered
- * new, 0 if old  */
-char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits,
-                    int32_t seq_num_diff, int8_t set_mark);
-
-/* count the hamming weight, how many good packets did we receive? */
-int  bit_packet_count(TYPE_OF_WORD *seq_bits);
-
-#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */
diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
deleted file mode 100644
index d85de82f941a..000000000000
--- a/drivers/staging/batman-adv/hard-interface.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "hard-interface.h"
-#include "soft-interface.h"
-#include "send.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "bat_sysfs.h"
-#include "originator.h"
-#include "hash.h"
-
-#include <linux/if_arp.h>
-
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-
-/* protect update critical side of if_list - but not the content */
-static DEFINE_SPINLOCK(if_list_lock);
-
-struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev)
-{
-        struct batman_if *batman_if;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->net_dev == net_dev)
-                        goto out;
-        }
-
-        batman_if = NULL;
-
-out:
-        if (batman_if)
-                hardif_hold(batman_if);
-
-        rcu_read_unlock();
-        return batman_if;
-}
-
-static int is_valid_iface(struct net_device *net_dev)
-{
-        if (net_dev->flags & IFF_LOOPBACK)
-                return 0;
-
-        if (net_dev->type != ARPHRD_ETHER)
-                return 0;
-
-        if (net_dev->addr_len != ETH_ALEN)
-                return 0;
-
-        /* no batman over batman */
-#ifdef HAVE_NET_DEVICE_OPS
-        if (net_dev->netdev_ops->ndo_start_xmit == interface_tx)
-                return 0;
-#else
-        if (net_dev->hard_start_xmit == interface_tx)
-                return 0;
-#endif
-
-        /* Device is being bridged */
-        /* if (net_dev->priv_flags & IFF_BRIDGE_PORT)
-                return 0; */
-
-        return 1;
-}
-
-static struct batman_if *get_active_batman_if(struct net_device *soft_iface)
-{
-        struct batman_if *batman_if;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->soft_iface != soft_iface)
-                        continue;
-
-                if (batman_if->if_status == IF_ACTIVE)
-                        goto out;
-        }
-
-        batman_if = NULL;
-
-out:
-        if (batman_if)
-                hardif_hold(batman_if);
-
-        rcu_read_unlock();
-        return batman_if;
-}
-
-static void update_primary_addr(struct bat_priv *bat_priv)
-{
-        struct vis_packet *vis_packet;
-
-        vis_packet = (struct vis_packet *)
-                                bat_priv->my_vis_info->skb_packet->data;
-        memcpy(vis_packet->vis_orig,
-               bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-        memcpy(vis_packet->sender_orig,
-               bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-}
-
-static void set_primary_if(struct bat_priv *bat_priv,
-                           struct batman_if *batman_if)
-{
-        struct batman_packet *batman_packet;
-        struct batman_if *old_if;
-
-        if (batman_if)
-                hardif_hold(batman_if);
-
-        old_if = bat_priv->primary_if;
-        bat_priv->primary_if = batman_if;
-
-        if (old_if)
-                hardif_put(old_if);
-
-        if (!bat_priv->primary_if)
-                return;
-
-        batman_packet = (struct batman_packet *)(batman_if->packet_buff);
-        batman_packet->flags = PRIMARIES_FIRST_HOP;
-        batman_packet->ttl = TTL;
-
-        update_primary_addr(bat_priv);
-
-        /***
-         * hacky trick to make sure that we send the HNA information via
-         * our new primary interface
-         */
-        atomic_set(&bat_priv->hna_local_changed, 1);
-}
-
-static bool hardif_is_iface_up(struct batman_if *batman_if)
-{
-        if (batman_if->net_dev->flags & IFF_UP)
-                return true;
-
-        return false;
-}
-
-static void update_mac_addresses(struct batman_if *batman_if)
-{
-        memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig,
-               batman_if->net_dev->dev_addr, ETH_ALEN);
-        memcpy(((struct batman_packet *)(batman_if->packet_buff))->prev_sender,
-               batman_if->net_dev->dev_addr, ETH_ALEN);
-}
-
-static void check_known_mac_addr(struct net_device *net_dev)
-{
-        struct batman_if *batman_if;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if ((batman_if->if_status != IF_ACTIVE) &&
-                    (batman_if->if_status != IF_TO_BE_ACTIVATED))
-                        continue;
-
-                if (batman_if->net_dev == net_dev)
-                        continue;
-
-                if (!compare_orig(batman_if->net_dev->dev_addr,
-                                  net_dev->dev_addr))
-                        continue;
-
-                pr_warning("The newly added mac address (%pM) already exists "
-                           "on: %s\n", net_dev->dev_addr,
-                           batman_if->net_dev->name);
-                pr_warning("It is strongly recommended to keep mac addresses "
-                           "unique to avoid problems!\n");
-        }
-        rcu_read_unlock();
-}
-
-int hardif_min_mtu(struct net_device *soft_iface)
-{
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        struct batman_if *batman_if;
-        /* allow big frames if all devices are capable to do so
-         * (have MTU > 1500 + BAT_HEADER_LEN) */
-        int min_mtu = ETH_DATA_LEN;
-
-        if (atomic_read(&bat_priv->frag_enabled))
-                goto out;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if ((batman_if->if_status != IF_ACTIVE) &&
-                    (batman_if->if_status != IF_TO_BE_ACTIVATED))
-                        continue;
-
-                if (batman_if->soft_iface != soft_iface)
-                        continue;
-
-                min_mtu = MIN(batman_if->net_dev->mtu - BAT_HEADER_LEN,
-                              min_mtu);
-        }
-        rcu_read_unlock();
-out:
-        return min_mtu;
-}
-
-/* adjusts the MTU if a new interface with a smaller MTU appeared. */
-void update_min_mtu(struct net_device *soft_iface)
-{
-        int min_mtu;
-
-        min_mtu = hardif_min_mtu(soft_iface);
-        if (soft_iface->mtu != min_mtu)
-                soft_iface->mtu = min_mtu;
-}
-
-static void hardif_activate_interface(struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv;
-
-        if (batman_if->if_status != IF_INACTIVE)
-                return;
-
-        bat_priv = netdev_priv(batman_if->soft_iface);
-
-        update_mac_addresses(batman_if);
-        batman_if->if_status = IF_TO_BE_ACTIVATED;
-
-        /**
-         * the first active interface becomes our primary interface or
-         * the next active interface after the old primay interface was removed
-         */
-        if (!bat_priv->primary_if)
-                set_primary_if(bat_priv, batman_if);
-
-        bat_info(batman_if->soft_iface, "Interface activated: %s\n",
-                 batman_if->net_dev->name);
-
-        update_min_mtu(batman_if->soft_iface);
-        return;
-}
-
-static void hardif_deactivate_interface(struct batman_if *batman_if)
-{
-        if ((batman_if->if_status != IF_ACTIVE) &&
-           (batman_if->if_status != IF_TO_BE_ACTIVATED))
-                return;
-
-        batman_if->if_status = IF_INACTIVE;
-
-        bat_info(batman_if->soft_iface, "Interface deactivated: %s\n",
-                 batman_if->net_dev->name);
-
-        update_min_mtu(batman_if->soft_iface);
-}
-
-int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
-{
-        struct bat_priv *bat_priv;
-        struct batman_packet *batman_packet;
-
-        if (batman_if->if_status != IF_NOT_IN_USE)
-                goto out;
-
-        batman_if->soft_iface = dev_get_by_name(&init_net, iface_name);
-
-        if (!batman_if->soft_iface) {
-                batman_if->soft_iface = softif_create(iface_name);
-
-                if (!batman_if->soft_iface)
-                        goto err;
-
-                /* dev_get_by_name() increases the reference counter for us */
-                dev_hold(batman_if->soft_iface);
-        }
-
-        bat_priv = netdev_priv(batman_if->soft_iface);
-        batman_if->packet_len = BAT_PACKET_LEN;
-        batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_ATOMIC);
-
-        if (!batman_if->packet_buff) {
-                bat_err(batman_if->soft_iface, "Can't add interface packet "
-                        "(%s): out of memory\n", batman_if->net_dev->name);
-                goto err;
-        }
-
-        batman_packet = (struct batman_packet *)(batman_if->packet_buff);
-        batman_packet->packet_type = BAT_PACKET;
-        batman_packet->version = COMPAT_VERSION;
-        batman_packet->flags = 0;
-        batman_packet->ttl = 2;
-        batman_packet->tq = TQ_MAX_VALUE;
-        batman_packet->num_hna = 0;
-
-        batman_if->if_num = bat_priv->num_ifaces;
-        bat_priv->num_ifaces++;
-        batman_if->if_status = IF_INACTIVE;
-        orig_hash_add_if(batman_if, bat_priv->num_ifaces);
-
-        batman_if->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);
-        batman_if->batman_adv_ptype.func = batman_skb_recv;
-        batman_if->batman_adv_ptype.dev = batman_if->net_dev;
-        hardif_hold(batman_if);
-        dev_add_pack(&batman_if->batman_adv_ptype);
-
-        atomic_set(&batman_if->seqno, 1);
-        atomic_set(&batman_if->frag_seqno, 1);
-        bat_info(batman_if->soft_iface, "Adding interface: %s\n",
-                 batman_if->net_dev->name);
-
-        if (atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
-                ETH_DATA_LEN + BAT_HEADER_LEN)
-                bat_info(batman_if->soft_iface,
-                        "The MTU of interface %s is too small (%i) to handle "
-                        "the transport of batman-adv packets. Packets going "
-                        "over this interface will be fragmented on layer2 "
-                        "which could impact the performance. Setting the MTU "
-                        "to %zi would solve the problem.\n",
-                        batman_if->net_dev->name, batman_if->net_dev->mtu,
-                        ETH_DATA_LEN + BAT_HEADER_LEN);
-
-        if (!atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
-                ETH_DATA_LEN + BAT_HEADER_LEN)
-                bat_info(batman_if->soft_iface,
-                        "The MTU of interface %s is too small (%i) to handle "
-                        "the transport of batman-adv packets. If you experience"
-                        " problems getting traffic through try increasing the "
-                        "MTU to %zi.\n",
-                        batman_if->net_dev->name, batman_if->net_dev->mtu,
-                        ETH_DATA_LEN + BAT_HEADER_LEN);
-
-        if (hardif_is_iface_up(batman_if))
-                hardif_activate_interface(batman_if);
-        else
-                bat_err(batman_if->soft_iface, "Not using interface %s "
-                        "(retrying later): interface not active\n",
-                        batman_if->net_dev->name);
-
-        /* begin scheduling originator messages on that interface */
-        schedule_own_packet(batman_if);
-
-out:
-        return 0;
-
-err:
-        return -ENOMEM;
-}
-
-void hardif_disable_interface(struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-
-        if (batman_if->if_status == IF_ACTIVE)
-                hardif_deactivate_interface(batman_if);
-
-        if (batman_if->if_status != IF_INACTIVE)
-                return;
-
-        bat_info(batman_if->soft_iface, "Removing interface: %s\n",
-                 batman_if->net_dev->name);
-        dev_remove_pack(&batman_if->batman_adv_ptype);
-        hardif_put(batman_if);
-
-        bat_priv->num_ifaces--;
-        orig_hash_del_if(batman_if, bat_priv->num_ifaces);
-
-        if (batman_if == bat_priv->primary_if) {
-                struct batman_if *new_if;
-
-                new_if = get_active_batman_if(batman_if->soft_iface);
-                set_primary_if(bat_priv, new_if);
-
-                if (new_if)
-                        hardif_put(new_if);
-        }
-
-        kfree(batman_if->packet_buff);
-        batman_if->packet_buff = NULL;
-        batman_if->if_status = IF_NOT_IN_USE;
-
-        /* delete all references to this batman_if */
-        purge_orig_ref(bat_priv);
-        purge_outstanding_packets(bat_priv, batman_if);
-        dev_put(batman_if->soft_iface);
-
-        /* nobody uses this interface anymore */
-        if (!bat_priv->num_ifaces)
-                softif_destroy(batman_if->soft_iface);
-
-        batman_if->soft_iface = NULL;
-}
-
-static struct batman_if *hardif_add_interface(struct net_device *net_dev)
-{
-        struct batman_if *batman_if;
-        int ret;
-
-        ret = is_valid_iface(net_dev);
-        if (ret != 1)
-                goto out;
-
-        dev_hold(net_dev);
-
-        batman_if = kmalloc(sizeof(struct batman_if), GFP_ATOMIC);
-        if (!batman_if) {
-                pr_err("Can't add interface (%s): out of memory\n",
-                       net_dev->name);
-                goto release_dev;
-        }
-
-        ret = sysfs_add_hardif(&batman_if->hardif_obj, net_dev);
-        if (ret)
-                goto free_if;
-
-        batman_if->if_num = -1;
-        batman_if->net_dev = net_dev;
-        batman_if->soft_iface = NULL;
-        batman_if->if_status = IF_NOT_IN_USE;
-        INIT_LIST_HEAD(&batman_if->list);
-        atomic_set(&batman_if->refcnt, 0);
-        hardif_hold(batman_if);
-
-        check_known_mac_addr(batman_if->net_dev);
-
-        spin_lock(&if_list_lock);
-        list_add_tail_rcu(&batman_if->list, &if_list);
-        spin_unlock(&if_list_lock);
-
-        /* extra reference for return */
-        hardif_hold(batman_if);
-        return batman_if;
-
-free_if:
-        kfree(batman_if);
-release_dev:
-        dev_put(net_dev);
-out:
-        return NULL;
-}
-
-static void hardif_remove_interface(struct batman_if *batman_if)
-{
-        /* first deactivate interface */
-        if (batman_if->if_status != IF_NOT_IN_USE)
-                hardif_disable_interface(batman_if);
-
-        if (batman_if->if_status != IF_NOT_IN_USE)
-                return;
-
-        batman_if->if_status = IF_TO_BE_REMOVED;
-        synchronize_rcu();
-        sysfs_del_hardif(&batman_if->hardif_obj);
-        hardif_put(batman_if);
-}
-
-void hardif_remove_interfaces(void)
-{
-        struct batman_if *batman_if, *batman_if_tmp;
-        struct list_head if_queue;
-
-        INIT_LIST_HEAD(&if_queue);
-
-        spin_lock(&if_list_lock);
-        list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) {
-                list_del_rcu(&batman_if->list);
-                list_add_tail(&batman_if->list, &if_queue);
-        }
-        spin_unlock(&if_list_lock);
-
-        rtnl_lock();
-        list_for_each_entry_safe(batman_if, batman_if_tmp, &if_queue, list) {
-                hardif_remove_interface(batman_if);
-        }
-        rtnl_unlock();
-}
-
-static int hard_if_event(struct notifier_block *this,
-                         unsigned long event, void *ptr)
-{
-        struct net_device *net_dev = (struct net_device *)ptr;
-        struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
-        struct bat_priv *bat_priv;
-
-        if (!batman_if && event == NETDEV_REGISTER)
-                batman_if = hardif_add_interface(net_dev);
-
-        if (!batman_if)
-                goto out;
-
-        switch (event) {
-        case NETDEV_UP:
-                hardif_activate_interface(batman_if);
-                break;
-        case NETDEV_GOING_DOWN:
-        case NETDEV_DOWN:
-                hardif_deactivate_interface(batman_if);
-                break;
-        case NETDEV_UNREGISTER:
-                spin_lock(&if_list_lock);
-                list_del_rcu(&batman_if->list);
-                spin_unlock(&if_list_lock);
-
-                hardif_remove_interface(batman_if);
-                break;
-        case NETDEV_CHANGEMTU:
-                if (batman_if->soft_iface)
-                        update_min_mtu(batman_if->soft_iface);
-                break;
-        case NETDEV_CHANGEADDR:
-                if (batman_if->if_status == IF_NOT_IN_USE) {
-                        hardif_put(batman_if);
-                        goto out;
-                }
-
-                check_known_mac_addr(batman_if->net_dev);
-                update_mac_addresses(batman_if);
-
-                bat_priv = netdev_priv(batman_if->soft_iface);
-                if (batman_if == bat_priv->primary_if)
-                        update_primary_addr(bat_priv);
-                break;
-        default:
-                break;
-        };
-        hardif_put(batman_if);
-
-out:
-        return NOTIFY_DONE;
-}
-
-/* receive a packet with the batman ethertype coming on a hard
- * interface */
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
-        struct packet_type *ptype, struct net_device *orig_dev)
-{
-        struct bat_priv *bat_priv;
-        struct batman_packet *batman_packet;
-        struct batman_if *batman_if;
-        int ret;
-
-        batman_if = container_of(ptype, struct batman_if, batman_adv_ptype);
-        skb = skb_share_check(skb, GFP_ATOMIC);
-
-        /* skb was released by skb_share_check() */
-        if (!skb)
-                goto err_out;
-
-        /* packet should hold at least type and version */
-        if (unlikely(!pskb_may_pull(skb, 2)))
-                goto err_free;
-
-        /* expect a valid ethernet header here. */
-        if (unlikely(skb->mac_len != sizeof(struct ethhdr)
-                                || !skb_mac_header(skb)))
-                goto err_free;
-
-        if (!batman_if->soft_iface)
-                goto err_free;
-
-        bat_priv = netdev_priv(batman_if->soft_iface);
-
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
-                goto err_free;
-
-        /* discard frames on not active interfaces */
-        if (batman_if->if_status != IF_ACTIVE)
-                goto err_free;
-
-        batman_packet = (struct batman_packet *)skb->data;
-
-        if (batman_packet->version != COMPAT_VERSION) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: incompatible batman version (%i)\n",
-                        batman_packet->version);
-                goto err_free;
-        }
-
-        /* all receive handlers return whether they received or reused
-         * the supplied skb. if not, we have to free the skb. */
-
-        switch (batman_packet->packet_type) {
-                /* batman originator packet */
-        case BAT_PACKET:
-                ret = recv_bat_packet(skb, batman_if);
-                break;
-
-                /* batman icmp packet */
-        case BAT_ICMP:
-                ret = recv_icmp_packet(skb, batman_if);
-                break;
-
-                /* unicast packet */
-        case BAT_UNICAST:
-                ret = recv_unicast_packet(skb, batman_if);
-                break;
-
-                /* fragmented unicast packet */
-        case BAT_UNICAST_FRAG:
-                ret = recv_ucast_frag_packet(skb, batman_if);
-                break;
-
-                /* broadcast packet */
-        case BAT_BCAST:
-                ret = recv_bcast_packet(skb, batman_if);
-                break;
-
-                /* vis packet */
-        case BAT_VIS:
-                ret = recv_vis_packet(skb, batman_if);
-                break;
-        default:
-                ret = NET_RX_DROP;
-        }
-
-        if (ret == NET_RX_DROP)
-                kfree_skb(skb);
-
-        /* return NET_RX_SUCCESS in any case as we
-         * most probably dropped the packet for
-         * routing-logical reasons. */
-
-        return NET_RX_SUCCESS;
-
-err_free:
-        kfree_skb(skb);
-err_out:
-        return NET_RX_DROP;
-}
-
-struct notifier_block hard_if_notifier = {
-        .notifier_call = hard_if_event,
-};
diff --git a/drivers/staging/batman-adv/hard-interface.h b/drivers/staging/batman-adv/hard-interface.h
deleted file mode 100644
index d5508899065b..000000000000
--- a/drivers/staging/batman-adv/hard-interface.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
-#define _NET_BATMAN_ADV_HARD_INTERFACE_H_
-
-#define IF_NOT_IN_USE 0
-#define IF_TO_BE_REMOVED 1
-#define IF_INACTIVE 2
-#define IF_ACTIVE 3
-#define IF_TO_BE_ACTIVATED 4
-#define IF_I_WANT_YOU 5
-
-extern struct notifier_block hard_if_notifier;
-
-struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev);
-int hardif_enable_interface(struct batman_if *batman_if, char *iface_name);
-void hardif_disable_interface(struct batman_if *batman_if);
-void hardif_remove_interfaces(void);
-int batman_skb_recv(struct sk_buff *skb,
-                                struct net_device *dev,
-                                struct packet_type *ptype,
-                                struct net_device *orig_dev);
-int hardif_min_mtu(struct net_device *soft_iface);
-void update_min_mtu(struct net_device *soft_iface);
-
-static inline void hardif_hold(struct batman_if *batman_if)
-{
-        atomic_inc(&batman_if->refcnt);
-}
-
-static inline void hardif_put(struct batman_if *batman_if)
-{
-        if (atomic_dec_and_test(&batman_if->refcnt)) {
-                dev_put(batman_if->net_dev);
-                kfree(batman_if);
-        }
-}
-
-#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */
diff --git a/drivers/staging/batman-adv/hash.c b/drivers/staging/batman-adv/hash.c
deleted file mode 100644
index 8ef26eb4949d..000000000000
--- a/drivers/staging/batman-adv/hash.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "hash.h"
-
-/* clears the hash */
-static void hash_init(struct hashtable_t *hash)
-{
-        int i;
-
-        hash->elements = 0;
-
-        for (i = 0 ; i < hash->size; i++)
-                hash->table[i] = NULL;
-}
-
-/* remove the hash structure. if hashdata_free_cb != NULL, this function will be
- * called to remove the elements inside of the hash.  if you don't remove the
- * elements, memory might be leaked. */
-void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb, void *arg)
-{
-        struct element_t *bucket, *last_bucket;
-        int i;
-
-        for (i = 0; i < hash->size; i++) {
-                bucket = hash->table[i];
-
-                while (bucket != NULL) {
-                        if (free_cb != NULL)
-                                free_cb(bucket->data, arg);
-
-                        last_bucket = bucket;
-                        bucket = bucket->next;
-                        kfree(last_bucket);
-                }
-        }
-
-        hash_destroy(hash);
-}
-
-/* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash)
-{
-        kfree(hash->table);
-        kfree(hash);
-}
-
-/* iterate though the hash. First element is selected if an iterator
- * initialized with HASHIT() is supplied as iter. Use the returned
- * (or supplied) iterator to access the elements until hash_iterate returns
- * NULL. */
-
-struct hash_it_t *hash_iterate(struct hashtable_t *hash,
-                               struct hash_it_t *iter)
-{
-        if (!hash)
-                return NULL;
-        if (!iter)
-                return NULL;
-
-        /* sanity checks first (if our bucket got deleted in the last
-         * iteration): */
-        if (iter->bucket != NULL) {
-                if (iter->first_bucket != NULL) {
-                        /* we're on the first element and it got removed after
-                         * the last iteration. */
-                        if ((*iter->first_bucket) != iter->bucket) {
-                                /* there are still other elements in the list */
-                                if ((*iter->first_bucket) != NULL) {
-                                        iter->prev_bucket = NULL;
-                                        iter->bucket = (*iter->first_bucket);
-                                        iter->first_bucket =
-                                                &hash->table[iter->index];
-                                        return iter;
-                                } else {
-                                        iter->bucket = NULL;
-                                }
-                        }
-                } else if (iter->prev_bucket != NULL) {
-                        /*
-                        * we're not on the first element, and the bucket got
-                        * removed after the last iteration.  the last bucket's
-                        * next pointer is not pointing to our actual bucket
-                        * anymore.  select the next.
-                        */
-                        if (iter->prev_bucket->next != iter->bucket)
-                                iter->bucket = iter->prev_bucket;
-                }
-        }
-
-        /* now as we are sane, select the next one if there is some */
-        if (iter->bucket != NULL) {
-                if (iter->bucket->next != NULL) {
-                        iter->prev_bucket = iter->bucket;
-                        iter->bucket = iter->bucket->next;
-                        iter->first_bucket = NULL;
-                        return iter;
-                }
-        }
-
-        /* if not returned yet, we've reached the last one on the index and have
-         * to search forward */
-        iter->index++;
-        /* go through the entries of the hash table */
-        while (iter->index < hash->size) {
-                if ((hash->table[iter->index]) != NULL) {
-                        iter->prev_bucket = NULL;
-                        iter->bucket = hash->table[iter->index];
-                        iter->first_bucket = &hash->table[iter->index];
-                        return iter;
-                } else {
-                        iter->index++;
-                }
-        }
-
-        /* nothing to iterate over anymore */
-        return NULL;
-}
-
-/* allocates and clears the hash */
-struct hashtable_t *hash_new(int size, hashdata_compare_cb compare,
-                             hashdata_choose_cb choose)
-{
-        struct hashtable_t *hash;
-
-        hash = kmalloc(sizeof(struct hashtable_t) , GFP_ATOMIC);
-
-        if (hash == NULL)
-                return NULL;
-
-        hash->size = size;
-        hash->table = kmalloc(sizeof(struct element_t *) * size, GFP_ATOMIC);
-
-        if (hash->table == NULL) {
-                kfree(hash);
-                return NULL;
-        }
-
-        hash_init(hash);
-
-        hash->compare = compare;
-        hash->choose = choose;
-
-        return hash;
-}
-
-/* adds data to the hashtable. returns 0 on success, -1 on error */
-int hash_add(struct hashtable_t *hash, void *data)
-{
-        int index;
-        struct element_t *bucket, *prev_bucket = NULL;
-
-        if (!hash)
-                return -1;
-
-        index = hash->choose(data, hash->size);
-        bucket = hash->table[index];
-
-        while (bucket != NULL) {
-                if (hash->compare(bucket->data, data))
-                        return -1;
-
-                prev_bucket = bucket;
-                bucket = bucket->next;
-        }
-
-        /* found the tail of the list, add new element */
-        bucket = kmalloc(sizeof(struct element_t), GFP_ATOMIC);
-
-        if (bucket == NULL)
-                return -1;
-
-        bucket->data = data;
-        bucket->next = NULL;
-
-        /* and link it */
-        if (prev_bucket == NULL)
-                hash->table[index] = bucket;
-        else
-                prev_bucket->next = bucket;
-
-        hash->elements++;
-        return 0;
-}
-
-/* finds data, based on the key in keydata. returns the found data on success,
- * or NULL on error */
-void *hash_find(struct hashtable_t *hash, void *keydata)
-{
-        int index;
-        struct element_t *bucket;
-
-        if (!hash)
-                return NULL;
-
-        index = hash->choose(keydata , hash->size);
-        bucket = hash->table[index];
-
-        while (bucket != NULL) {
-                if (hash->compare(bucket->data, keydata))
-                        return bucket->data;
-
-                bucket = bucket->next;
-        }
-
-        return NULL;
-}
-
-/* remove bucket (this might be used in hash_iterate() if you already found the
- * bucket you want to delete and don't need the overhead to find it again with
- * hash_remove(). But usually, you don't want to use this function, as it
- * fiddles with hash-internals. */
-void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t)
-{
-        void *data_save;
-
-        data_save = hash_it_t->bucket->data;
-
-        if (hash_it_t->prev_bucket != NULL)
-                hash_it_t->prev_bucket->next = hash_it_t->bucket->next;
-        else if (hash_it_t->first_bucket != NULL)
-                (*hash_it_t->first_bucket) = hash_it_t->bucket->next;
-
-        kfree(hash_it_t->bucket);
-        hash->elements--;
-
-        return data_save;
-}
-
-/* removes data from hash, if found. returns pointer do data on success, so you
- * can remove the used structure yourself, or NULL on error .  data could be the
- * structure you use with just the key filled, we just need the key for
- * comparing. */
-void *hash_remove(struct hashtable_t *hash, void *data)
-{
-        struct hash_it_t hash_it_t;
-
-        hash_it_t.index = hash->choose(data, hash->size);
-        hash_it_t.bucket = hash->table[hash_it_t.index];
-        hash_it_t.prev_bucket = NULL;
-
-        while (hash_it_t.bucket != NULL) {
-                if (hash->compare(hash_it_t.bucket->data, data)) {
-                        hash_it_t.first_bucket =
-                                (hash_it_t.bucket ==
-                                 hash->table[hash_it_t.index] ?
-                                 &hash->table[hash_it_t.index] : NULL);
-                        return hash_remove_bucket(hash, &hash_it_t);
-                }
-
-                hash_it_t.prev_bucket = hash_it_t.bucket;
-                hash_it_t.bucket = hash_it_t.bucket->next;
-        }
-
-        return NULL;
-}
-
-/* resize the hash, returns the pointer to the new hash or NULL on
- * error. removes the old hash on success. */
-struct hashtable_t *hash_resize(struct hashtable_t *hash, int size)
-{
-        struct hashtable_t *new_hash;
-        struct element_t *bucket;
-        int i;
-
-        /* initialize a new hash with the new size */
-        new_hash = hash_new(size, hash->compare, hash->choose);
-
-        if (new_hash == NULL)
-                return NULL;
-
-        /* copy the elements */
-        for (i = 0; i < hash->size; i++) {
-                bucket = hash->table[i];
-
-                while (bucket != NULL) {
-                        hash_add(new_hash, bucket->data);
-                        bucket = bucket->next;
-                }
-        }
-
-        /* remove hash and eventual overflow buckets but not the content
-         * itself. */
-        hash_delete(hash, NULL, NULL);
-
-        return new_hash;
-}
diff --git a/drivers/staging/batman-adv/hash.h b/drivers/staging/batman-adv/hash.h
deleted file mode 100644
index 2c8e1762389f..000000000000
--- a/drivers/staging/batman-adv/hash.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_HASH_H_
-#define _NET_BATMAN_ADV_HASH_H_
-
-#define HASHIT(name) struct hash_it_t name = { \
-                .index = -1, .bucket = NULL, \
-                .prev_bucket = NULL, \
-                .first_bucket = NULL }
-
-
-typedef int (*hashdata_compare_cb)(void *, void *);
-typedef int (*hashdata_choose_cb)(void *, int);
-typedef void (*hashdata_free_cb)(void *, void *);
-
-struct element_t {
-        void *data;             /* pointer to the data */
-        struct element_t *next; /* overflow bucket pointer */
-};
-
-struct hash_it_t {
-        int index;
-        struct element_t *bucket;
-        struct element_t *prev_bucket;
-        struct element_t **first_bucket;
-};
-
-struct hashtable_t {
-        struct element_t **table;   /* the hashtable itself, with the buckets */
-        int elements;               /* number of elements registered */
-        int size;                   /* size of hashtable */
-        hashdata_compare_cb compare;/* callback to a compare function.  should
-                                     * compare 2 element datas for their keys,
-                                     * return 0 if same and not 0 if not
-                                     * same */
-        hashdata_choose_cb choose;  /* the hashfunction, should return an index
-                                     * based on the key in the data of the first
-                                     * argument and the size the second */
-};
-
-/* allocates and clears the hash */
-struct hashtable_t *hash_new(int size, hashdata_compare_cb compare,
-                             hashdata_choose_cb choose);
-
-/* remove bucket (this might be used in hash_iterate() if you already found the
- * bucket you want to delete and don't need the overhead to find it again with
- * hash_remove().  But usually, you don't want to use this function, as it
- * fiddles with hash-internals. */
-void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t);
-
-/* remove the hash structure. if hashdata_free_cb != NULL, this function will be
- * called to remove the elements inside of the hash.  if you don't remove the
- * elements, memory might be leaked. */
-void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb, void *arg);
-
-/* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash);
-
-/* adds data to the hashtable. returns 0 on success, -1 on error */
-int hash_add(struct hashtable_t *hash, void *data);
-
-/* removes data from hash, if found. returns pointer do data on success, so you
- * can remove the used structure yourself, or NULL on error .  data could be the
- * structure you use with just the key filled, we just need the key for
- * comparing. */
-void *hash_remove(struct hashtable_t *hash, void *data);
-
-/* finds data, based on the key in keydata. returns the found data on success,
- * or NULL on error */
-void *hash_find(struct hashtable_t *hash, void *keydata);
-
-/* resize the hash, returns the pointer to the new hash or NULL on
- * error. removes the old hash on success */
-struct hashtable_t *hash_resize(struct hashtable_t *hash, int size);
-
-/* iterate though the hash. first element is selected with iter_in NULL.  use
- * the returned iterator to access the elements until hash_it_t returns NULL. */
-struct hash_it_t *hash_iterate(struct hashtable_t *hash,
-                               struct hash_it_t *iter_in);
-
-#endif /* _NET_BATMAN_ADV_HASH_H_ */
diff --git a/drivers/staging/batman-adv/icmp_socket.c b/drivers/staging/batman-adv/icmp_socket.c
deleted file mode 100644
index 48856ca73b6a..000000000000
--- a/drivers/staging/batman-adv/icmp_socket.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include <linux/debugfs.h>
-#include <linux/slab.h>
-#include "icmp_socket.h"
-#include "send.h"
-#include "types.h"
-#include "hash.h"
-#include "hard-interface.h"
-
-
-static struct socket_client *socket_client_hash[256];
-
-static void bat_socket_add_packet(struct socket_client *socket_client,
-                                  struct icmp_packet_rr *icmp_packet,
-                                  size_t icmp_len);
-
-void bat_socket_init(void)
-{
-        memset(socket_client_hash, 0, sizeof(socket_client_hash));
-}
-
-static int bat_socket_open(struct inode *inode, struct file *file)
-{
-        unsigned int i;
-        struct socket_client *socket_client;
-
-        nonseekable_open(inode, file);
-
-        socket_client = kmalloc(sizeof(struct socket_client), GFP_KERNEL);
-
-        if (!socket_client)
-                return -ENOMEM;
-
-        for (i = 0; i < ARRAY_SIZE(socket_client_hash); i++) {
-                if (!socket_client_hash[i]) {
-                        socket_client_hash[i] = socket_client;
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(socket_client_hash)) {
-                pr_err("Error - can't add another packet client: "
-                       "maximum number of clients reached\n");
-                kfree(socket_client);
-                return -EXFULL;
-        }
-
-        INIT_LIST_HEAD(&socket_client->queue_list);
-        socket_client->queue_len = 0;
-        socket_client->index = i;
-        socket_client->bat_priv = inode->i_private;
-        spin_lock_init(&socket_client->lock);
-        init_waitqueue_head(&socket_client->queue_wait);
-
-        file->private_data = socket_client;
-
-        inc_module_count();
-        return 0;
-}
-
-static int bat_socket_release(struct inode *inode, struct file *file)
-{
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
-        struct list_head *list_pos, *list_pos_tmp;
-        unsigned long flags;
-
-        spin_lock_irqsave(&socket_client->lock, flags);
-
-        /* for all packets in the queue ... */
-        list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) {
-                socket_packet = list_entry(list_pos,
-                                           struct socket_packet, list);
-
-                list_del(list_pos);
-                kfree(socket_packet);
-        }
-
-        socket_client_hash[socket_client->index] = NULL;
-        spin_unlock_irqrestore(&socket_client->lock, flags);
-
-        kfree(socket_client);
-        dec_module_count();
-
-        return 0;
-}
-
-static ssize_t bat_socket_read(struct file *file, char __user *buf,
-                               size_t count, loff_t *ppos)
-{
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
-        size_t packet_len;
-        int error;
-        unsigned long flags;
-
-        if ((file->f_flags & O_NONBLOCK) && (socket_client->queue_len == 0))
-                return -EAGAIN;
-
-        if ((!buf) || (count < sizeof(struct icmp_packet)))
-                return -EINVAL;
-
-        if (!access_ok(VERIFY_WRITE, buf, count))
-                return -EFAULT;
-
-        error = wait_event_interruptible(socket_client->queue_wait,
-                                         socket_client->queue_len);
-
-        if (error)
-                return error;
-
-        spin_lock_irqsave(&socket_client->lock, flags);
-
-        socket_packet = list_first_entry(&socket_client->queue_list,
-                                         struct socket_packet, list);
-        list_del(&socket_packet->list);
-        socket_client->queue_len--;
-
-        spin_unlock_irqrestore(&socket_client->lock, flags);
-
-        error = __copy_to_user(buf, &socket_packet->icmp_packet,
-                               socket_packet->icmp_len);
-
-        packet_len = socket_packet->icmp_len;
-        kfree(socket_packet);
-
-        if (error)
-                return -EFAULT;
-
-        return packet_len;
-}
-
-static ssize_t bat_socket_write(struct file *file, const char __user *buff,
-                                size_t len, loff_t *off)
-{
-        struct socket_client *socket_client = file->private_data;
-        struct bat_priv *bat_priv = socket_client->bat_priv;
-        struct sk_buff *skb;
-        struct icmp_packet_rr *icmp_packet;
-
-        struct orig_node *orig_node;
-        struct batman_if *batman_if;
-        size_t packet_len = sizeof(struct icmp_packet);
-        uint8_t dstaddr[ETH_ALEN];
-        unsigned long flags;
-
-        if (len < sizeof(struct icmp_packet)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: "
-                        "invalid packet size\n");
-                return -EINVAL;
-        }
-
-        if (!bat_priv->primary_if)
-                return -EFAULT;
-
-        if (len >= sizeof(struct icmp_packet_rr))
-                packet_len = sizeof(struct icmp_packet_rr);
-
-        skb = dev_alloc_skb(packet_len + sizeof(struct ethhdr));
-        if (!skb)
-                return -ENOMEM;
-
-        skb_reserve(skb, sizeof(struct ethhdr));
-        icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len);
-
-        if (!access_ok(VERIFY_READ, buff, packet_len)) {
-                len = -EFAULT;
-                goto free_skb;
-        }
-
-        if (__copy_from_user(icmp_packet, buff, packet_len)) {
-                len = -EFAULT;
-                goto free_skb;
-        }
-
-        if (icmp_packet->packet_type != BAT_ICMP) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: "
-                        "got bogus packet type (expected: BAT_ICMP)\n");
-                len = -EINVAL;
-                goto free_skb;
-        }
-
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: "
-                        "got bogus message type (expected: ECHO_REQUEST)\n");
-                len = -EINVAL;
-                goto free_skb;
-        }
-
-        icmp_packet->uid = socket_client->index;
-
-        if (icmp_packet->version != COMPAT_VERSION) {
-                icmp_packet->msg_type = PARAMETER_PROBLEM;
-                icmp_packet->ttl = COMPAT_VERSION;
-                bat_socket_add_packet(socket_client, icmp_packet, packet_len);
-                goto free_skb;
-        }
-
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
-                goto dst_unreach;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
-                                                   icmp_packet->dst));
-
-        if (!orig_node)
-                goto unlock;
-
-        if (!orig_node->router)
-                goto unlock;
-
-        batman_if = orig_node->router->if_incoming;
-        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        if (!batman_if)
-                goto dst_unreach;
-
-        if (batman_if->if_status != IF_ACTIVE)
-                goto dst_unreach;
-
-        memcpy(icmp_packet->orig,
-               bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-
-        if (packet_len == sizeof(struct icmp_packet_rr))
-                memcpy(icmp_packet->rr, batman_if->net_dev->dev_addr, ETH_ALEN);
-
-
-        send_skb_packet(skb, batman_if, dstaddr);
-
-        goto out;
-
-unlock:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-dst_unreach:
-        icmp_packet->msg_type = DESTINATION_UNREACHABLE;
-        bat_socket_add_packet(socket_client, icmp_packet, packet_len);
-free_skb:
-        kfree_skb(skb);
-out:
-        return len;
-}
-
-static unsigned int bat_socket_poll(struct file *file, poll_table *wait)
-{
-        struct socket_client *socket_client = file->private_data;
-
-        poll_wait(file, &socket_client->queue_wait, wait);
-
-        if (socket_client->queue_len > 0)
-                return POLLIN | POLLRDNORM;
-
-        return 0;
-}
-
-static const struct file_operations fops = {
-        .owner = THIS_MODULE,
-        .open = bat_socket_open,
-        .release = bat_socket_release,
-        .read = bat_socket_read,
-        .write = bat_socket_write,
-        .poll = bat_socket_poll,
-        .llseek = no_llseek,
-};
-
-int bat_socket_setup(struct bat_priv *bat_priv)
-{
-        struct dentry *d;
-
-        if (!bat_priv->debug_dir)
-                goto err;
-
-        d = debugfs_create_file(ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
-                                bat_priv->debug_dir, bat_priv, &fops);
-        if (d)
-                goto err;
-
-        return 0;
-
-err:
-        return 1;
-}
-
-static void bat_socket_add_packet(struct socket_client *socket_client,
-                                  struct icmp_packet_rr *icmp_packet,
-                                  size_t icmp_len)
-{
-        struct socket_packet *socket_packet;
-        unsigned long flags;
-
-        socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC);
-
-        if (!socket_packet)
-                return;
-
-        INIT_LIST_HEAD(&socket_packet->list);
-        memcpy(&socket_packet->icmp_packet, icmp_packet, icmp_len);
-        socket_packet->icmp_len = icmp_len;
-
-        spin_lock_irqsave(&socket_client->lock, flags);
-
-        /* while waiting for the lock the socket_client could have been
-         * deleted */
-        if (!socket_client_hash[icmp_packet->uid]) {
-                spin_unlock_irqrestore(&socket_client->lock, flags);
-                kfree(socket_packet);
-                return;
-        }
-
-        list_add_tail(&socket_packet->list, &socket_client->queue_list);
-        socket_client->queue_len++;
-
-        if (socket_client->queue_len > 100) {
-                socket_packet = list_first_entry(&socket_client->queue_list,
-                                                 struct socket_packet, list);
-
-                list_del(&socket_packet->list);
-                kfree(socket_packet);
-                socket_client->queue_len--;
-        }
-
-        spin_unlock_irqrestore(&socket_client->lock, flags);
-
-        wake_up(&socket_client->queue_wait);
-}
-
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
-                               size_t icmp_len)
-{
-        struct socket_client *hash = socket_client_hash[icmp_packet->uid];
-
-        if (hash)
-                bat_socket_add_packet(hash, icmp_packet, icmp_len);
-}
diff --git a/drivers/staging/batman-adv/icmp_socket.h b/drivers/staging/batman-adv/icmp_socket.h
deleted file mode 100644
index bf9b348cde27..000000000000
--- a/drivers/staging/batman-adv/icmp_socket.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
-#define _NET_BATMAN_ADV_ICMP_SOCKET_H_
-
-#include "types.h"
-
-#define ICMP_SOCKET "socket"
-
-void bat_socket_init(void);
-int bat_socket_setup(struct bat_priv *bat_priv);
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
-                               size_t icmp_len);
-
-#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */
diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
deleted file mode 100644
index 0587940d2723..000000000000
--- a/drivers/staging/batman-adv/main.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
-#include "routing.h"
-#include "send.h"
-#include "originator.h"
-#include "soft-interface.h"
-#include "icmp_socket.h"
-#include "translation-table.h"
-#include "hard-interface.h"
-#include "types.h"
-#include "vis.h"
-#include "hash.h"
-
-struct list_head if_list;
-
-unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-struct workqueue_struct *bat_event_workqueue;
-
-static int __init batman_init(void)
-{
-        INIT_LIST_HEAD(&if_list);
-
-        /* the name should not be longer than 10 chars - see
-         * http://lwn.net/Articles/23634/ */
-        bat_event_workqueue = create_singlethread_workqueue("bat_events");
-
-        if (!bat_event_workqueue)
-                return -ENOMEM;
-
-        bat_socket_init();
-        debugfs_init();
-
-        register_netdevice_notifier(&hard_if_notifier);
-
-        pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) "
-                "loaded\n", SOURCE_VERSION, REVISION_VERSION_STR,
-                COMPAT_VERSION);
-
-        return 0;
-}
-
-static void __exit batman_exit(void)
-{
-        debugfs_destroy();
-        unregister_netdevice_notifier(&hard_if_notifier);
-        hardif_remove_interfaces();
-
-        flush_workqueue(bat_event_workqueue);
-        destroy_workqueue(bat_event_workqueue);
-        bat_event_workqueue = NULL;
-
-        rcu_barrier();
-}
-
-int mesh_init(struct net_device *soft_iface)
-{
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
-        spin_lock_init(&bat_priv->orig_hash_lock);
-        spin_lock_init(&bat_priv->forw_bat_list_lock);
-        spin_lock_init(&bat_priv->forw_bcast_list_lock);
-        spin_lock_init(&bat_priv->hna_lhash_lock);
-        spin_lock_init(&bat_priv->hna_ghash_lock);
-        spin_lock_init(&bat_priv->vis_hash_lock);
-        spin_lock_init(&bat_priv->vis_list_lock);
-
-        INIT_HLIST_HEAD(&bat_priv->forw_bat_list);
-        INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);
-
-        if (originator_init(bat_priv) < 1)
-                goto err;
-
-        if (hna_local_init(bat_priv) < 1)
-                goto err;
-
-        if (hna_global_init(bat_priv) < 1)
-                goto err;
-
-        hna_local_add(soft_iface, soft_iface->dev_addr);
-
-        if (vis_init(bat_priv) < 1)
-                goto err;
-
-        atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
-        goto end;
-
-err:
-        pr_err("Unable to allocate memory for mesh information structures: "
-               "out of mem ?\n");
-        mesh_free(soft_iface);
-        return -1;
-
-end:
-        return 0;
-}
-
-void mesh_free(struct net_device *soft_iface)
-{
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
-        atomic_set(&bat_priv->mesh_state, MESH_DEACTIVATING);
-
-        purge_outstanding_packets(bat_priv, NULL);
-
-        vis_quit(bat_priv);
-
-        originator_free(bat_priv);
-
-        hna_local_free(bat_priv);
-        hna_global_free(bat_priv);
-
-        atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
-}
-
-void inc_module_count(void)
-{
-        try_module_get(THIS_MODULE);
-}
-
-void dec_module_count(void)
-{
-        module_put(THIS_MODULE);
-}
-
-/* returns 1 if they are the same originator */
-
-int compare_orig(void *data1, void *data2)
-{
-        return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
-}
-
-/* hashfunction to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-int choose_orig(void *data, int32_t size)
-{
-        unsigned char *key = data;
-        uint32_t hash = 0;
-        size_t i;
-
-        for (i = 0; i < 6; i++) {
-                hash += key[i];
-                hash += (hash << 10);
-                hash ^= (hash >> 6);
-        }
-
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-
-        return hash % size;
-}
-
-int is_my_mac(uint8_t *addr)
-{
-        struct batman_if *batman_if;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->if_status != IF_ACTIVE)
-                        continue;
-
-                if (compare_orig(batman_if->net_dev->dev_addr, addr)) {
-                        rcu_read_unlock();
-                        return 1;
-                }
-        }
-        rcu_read_unlock();
-        return 0;
-
-}
-
-int is_bcast(uint8_t *addr)
-{
-        return (addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff);
-}
-
-int is_mcast(uint8_t *addr)
-{
-        return *addr & 0x01;
-}
-
-module_init(batman_init);
-module_exit(batman_exit);
-
-MODULE_LICENSE("GPL");
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE);
-#ifdef REVISION_VERSION
-MODULE_VERSION(SOURCE_VERSION "-" REVISION_VERSION);
-#else
-MODULE_VERSION(SOURCE_VERSION);
-#endif
diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h
deleted file mode 100644
index 5e3f51681f5e..000000000000
--- a/drivers/staging/batman-adv/main.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_MAIN_H_
-#define _NET_BATMAN_ADV_MAIN_H_
-
-/* Kernel Programming */
-#define LINUX
-
-#define DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \
-                      "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>"
-#define DRIVER_DESC   "B.A.T.M.A.N. advanced"
-#define DRIVER_DEVICE "batman-adv"
-
-#define SOURCE_VERSION "next"
-
-
-/* B.A.T.M.A.N. parameters */
-
-#define TQ_MAX_VALUE 255
-#define JITTER 20
-#define TTL 50                    /* Time To Live of broadcast messages */
-
-#define PURGE_TIMEOUT 200       /* purge originators after time in seconds if no
-                                   * valid packet comes in -> TODO: check
-                                   * influence on TQ_LOCAL_WINDOW_SIZE */
-#define LOCAL_HNA_TIMEOUT 3600 /* in seconds */
-
-#define TQ_LOCAL_WINDOW_SIZE 64   /* sliding packet range of received originator
-                                   * messages in squence numbers (should be a
-                                   * multiple of our word size) */
-#define TQ_GLOBAL_WINDOW_SIZE 5
-#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
-#define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
-#define TQ_TOTAL_BIDRECT_LIMIT 1
-
-#define TQ_HOP_PENALTY 10
-
-#define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE)
-
-#define PACKBUFF_SIZE 2000
-#define LOG_BUF_LEN 8192          /* has to be a power of 2 */
-
-#define VIS_INTERVAL 5000       /* 5 seconds */
-
-/* how much worse secondary interfaces may be to
- * to be considered as bonding candidates */
-
-#define BONDING_TQ_THRESHOLD    50
-
-#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or
-                                   * change the size of
-                                   * forw_packet->direct_link_flags */
-#define MAX_AGGREGATION_MS 100
-
-#define RESET_PROTECTION_MS 30000
-#define EXPECTED_SEQNO_RANGE    65536
-/* don't reset again within 30 seconds */
-
-#define MESH_INACTIVE 0
-#define MESH_ACTIVE 1
-#define MESH_DEACTIVATING 2
-
-#define BCAST_QUEUE_LEN         256
-#define BATMAN_QUEUE_LEN        256
-
-/*
- * Debug Messages
- */
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before
-                                             * kernel messages */
-
-#define DBG_BATMAN 1    /* all messages related to routing / flooding /
-                         * broadcasting / etc */
-#define DBG_ROUTES 2    /* route or hna added / changed / deleted */
-#define DBG_ALL 3
-
-#define LOG_BUF_LEN 8192          /* has to be a power of 2 */
-
-
-/*
- *  Vis
- */
-
-/* #define VIS_SUBCLUSTERS_DISABLED */
-
-/*
- * Kernel headers
- */
-
-#include <linux/mutex.h>        /* mutex */
-#include <linux/module.h>       /* needed by all modules */
-#include <linux/netdevice.h>    /* netdevice */
-#include <linux/if_ether.h>     /* ethernet header */
-#include <linux/poll.h>         /* poll_table */
-#include <linux/kthread.h>      /* kernel threads */
-#include <linux/pkt_sched.h>    /* schedule types */
-#include <linux/workqueue.h>    /* workqueue */
-#include <linux/slab.h>
-#include <net/sock.h>           /* struct sock */
-#include <linux/jiffies.h>
-#include <linux/seq_file.h>
-#include "types.h"
-
-#ifndef REVISION_VERSION
-#define REVISION_VERSION_STR ""
-#else
-#define REVISION_VERSION_STR " "REVISION_VERSION
-#endif
-
-extern struct list_head if_list;
-
-extern unsigned char broadcast_addr[];
-extern struct workqueue_struct *bat_event_workqueue;
-
-int mesh_init(struct net_device *soft_iface);
-void mesh_free(struct net_device *soft_iface);
-void inc_module_count(void);
-void dec_module_count(void);
-int compare_orig(void *data1, void *data2);
-int choose_orig(void *data, int32_t size);
-int is_my_mac(uint8_t *addr);
-int is_bcast(uint8_t *addr);
-int is_mcast(uint8_t *addr);
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-int debug_log(struct bat_priv *bat_priv, char *fmt, ...);
-
-#define bat_dbg(type, bat_priv, fmt, arg...)                    \
-        do {                                                    \
-                if (atomic_read(&bat_priv->log_level) & type)   \
-                        debug_log(bat_priv, fmt, ## arg);       \
-        }                                                       \
-        while (0)
-#else /* !CONFIG_BATMAN_ADV_DEBUG */
-static inline void bat_dbg(char type __attribute__((unused)),
-                           struct bat_priv *bat_priv __attribute__((unused)),
-                           char *fmt __attribute__((unused)), ...)
-{
-}
-#endif
-
-#define bat_warning(net_dev, fmt, arg...)                               \
-        do {                                                            \
-                struct net_device *_netdev = (net_dev);                 \
-                struct bat_priv *_batpriv = netdev_priv(_netdev);       \
-                bat_dbg(DBG_ALL, _batpriv, fmt, ## arg);                \
-                pr_warning("%s: " fmt, _netdev->name, ## arg);          \
-        } while (0)
-#define bat_info(net_dev, fmt, arg...)                                  \
-        do {                                                            \
-                struct net_device *_netdev = (net_dev);                 \
-                struct bat_priv *_batpriv = netdev_priv(_netdev);       \
-                bat_dbg(DBG_ALL, _batpriv, fmt, ## arg);                \
-                pr_info("%s: " fmt, _netdev->name, ## arg);             \
-        } while (0)
-#define bat_err(net_dev, fmt, arg...)                                   \
-        do {                                                            \
-                struct net_device *_netdev = (net_dev);                 \
-                struct bat_priv *_batpriv = netdev_priv(_netdev);       \
-                bat_dbg(DBG_ALL, _batpriv, fmt, ## arg);                \
-                pr_err("%s: " fmt, _netdev->name, ## arg);              \
-        } while (0)
-
-#endif /* _NET_BATMAN_ADV_MAIN_H_ */
diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
deleted file mode 100644
index 55270080a44b..000000000000
--- a/drivers/staging/batman-adv/originator.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-/* increase the reference counter for this originator */
-
-#include "main.h"
-#include "originator.h"
-#include "hash.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "hard-interface.h"
-#include "unicast.h"
-
-static void purge_orig(struct work_struct *work);
-
-static void start_purge_timer(struct bat_priv *bat_priv)
-{
-        INIT_DELAYED_WORK(&bat_priv->orig_work, purge_orig);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->orig_work, 1 * HZ);
-}
-
-int originator_init(struct bat_priv *bat_priv)
-{
-        unsigned long flags;
-        if (bat_priv->orig_hash)
-                return 1;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        bat_priv->orig_hash = hash_new(128, compare_orig, choose_orig);
-
-        if (!bat_priv->orig_hash)
-                goto err;
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        start_purge_timer(bat_priv);
-        return 1;
-
-err:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        return 0;
-}
-
-struct neigh_node *
-create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
-                uint8_t *neigh, struct batman_if *if_incoming)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct neigh_node *neigh_node;
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new last-hop neighbor of originator\n");
-
-        neigh_node = kzalloc(sizeof(struct neigh_node), GFP_ATOMIC);
-        if (!neigh_node)
-                return NULL;
-
-        INIT_LIST_HEAD(&neigh_node->list);
-
-        memcpy(neigh_node->addr, neigh, ETH_ALEN);
-        neigh_node->orig_node = orig_neigh_node;
-        neigh_node->if_incoming = if_incoming;
-
-        list_add_tail(&neigh_node->list, &orig_node->neigh_list);
-        return neigh_node;
-}
-
-static void free_orig_node(void *data, void *arg)
-{
-        struct list_head *list_pos, *list_pos_tmp;
-        struct neigh_node *neigh_node;
-        struct orig_node *orig_node = (struct orig_node *)data;
-        struct bat_priv *bat_priv = (struct bat_priv *)arg;
-
-        /* for all neighbors towards this originator ... */
-        list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) {
-                neigh_node = list_entry(list_pos, struct neigh_node, list);
-
-                list_del(list_pos);
-                kfree(neigh_node);
-        }
-
-        frag_list_free(&orig_node->frag_list);
-        hna_global_del_orig(bat_priv, orig_node, "originator timed out");
-
-        kfree(orig_node->bcast_own);
-        kfree(orig_node->bcast_own_sum);
-        kfree(orig_node);
-}
-
-void originator_free(struct bat_priv *bat_priv)
-{
-        unsigned long flags;
-
-        if (!bat_priv->orig_hash)
-                return;
-
-        cancel_delayed_work_sync(&bat_priv->orig_work);
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        hash_delete(bat_priv->orig_hash, free_orig_node, bat_priv);
-        bat_priv->orig_hash = NULL;
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-}
-
-/* this function finds or creates an originator entry for the given
- * address if it does not exits */
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr)
-{
-        struct orig_node *orig_node;
-        struct hashtable_t *swaphash;
-        int size;
-
-        orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash, addr));
-
-        if (orig_node)
-                return orig_node;
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new originator: %pM\n", addr);
-
-        orig_node = kzalloc(sizeof(struct orig_node), GFP_ATOMIC);
-        if (!orig_node)
-                return NULL;
-
-        INIT_LIST_HEAD(&orig_node->neigh_list);
-
-        memcpy(orig_node->orig, addr, ETH_ALEN);
-        orig_node->router = NULL;
-        orig_node->hna_buff = NULL;
-        orig_node->bcast_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
-        orig_node->batman_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
-
-        size = bat_priv->num_ifaces * sizeof(TYPE_OF_WORD) * NUM_WORDS;
-
-        orig_node->bcast_own = kzalloc(size, GFP_ATOMIC);
-        if (!orig_node->bcast_own)
-                goto free_orig_node;
-
-        size = bat_priv->num_ifaces * sizeof(uint8_t);
-        orig_node->bcast_own_sum = kzalloc(size, GFP_ATOMIC);
-
-        INIT_LIST_HEAD(&orig_node->frag_list);
-        orig_node->last_frag_packet = 0;
-
-        if (!orig_node->bcast_own_sum)
-                goto free_bcast_own;
-
-        if (hash_add(bat_priv->orig_hash, orig_node) < 0)
-                goto free_bcast_own_sum;
-
-        if (bat_priv->orig_hash->elements * 4 > bat_priv->orig_hash->size) {
-                swaphash = hash_resize(bat_priv->orig_hash,
-                                       bat_priv->orig_hash->size * 2);
-
-                if (!swaphash)
-                        bat_dbg(DBG_BATMAN, bat_priv,
-                                "Couldn't resize orig hash table\n");
-                else
-                        bat_priv->orig_hash = swaphash;
-        }
-
-        return orig_node;
-free_bcast_own_sum:
-        kfree(orig_node->bcast_own_sum);
-free_bcast_own:
-        kfree(orig_node->bcast_own);
-free_orig_node:
-        kfree(orig_node);
-        return NULL;
-}
-
-static bool purge_orig_neighbors(struct bat_priv *bat_priv,
-                                 struct orig_node *orig_node,
-                                 struct neigh_node **best_neigh_node)
-{
-        struct list_head *list_pos, *list_pos_tmp;
-        struct neigh_node *neigh_node;
-        bool neigh_purged = false;
-
-        *best_neigh_node = NULL;
-
-        /* for all neighbors towards this originator ... */
-        list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) {
-                neigh_node = list_entry(list_pos, struct neigh_node, list);
-
-                if ((time_after(jiffies,
-                        neigh_node->last_valid + PURGE_TIMEOUT * HZ)) ||
-                    (neigh_node->if_incoming->if_status == IF_INACTIVE) ||
-                    (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
-
-                        if (neigh_node->if_incoming->if_status ==
-                                                        IF_TO_BE_REMOVED)
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor purge: originator %pM, "
-                                        "neighbor: %pM, iface: %s\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        neigh_node->if_incoming->net_dev->name);
-                        else
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor timeout: originator %pM, "
-                                        "neighbor: %pM, last_valid: %lu\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        (neigh_node->last_valid / HZ));
-
-                        neigh_purged = true;
-                        list_del(list_pos);
-                        kfree(neigh_node);
-                } else {
-                        if ((*best_neigh_node == NULL) ||
-                            (neigh_node->tq_avg > (*best_neigh_node)->tq_avg))
-                                *best_neigh_node = neigh_node;
-                }
-        }
-        return neigh_purged;
-}
-
-static bool purge_orig_node(struct bat_priv *bat_priv,
-                            struct orig_node *orig_node)
-{
-        struct neigh_node *best_neigh_node;
-
-        if (time_after(jiffies,
-                orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) {
-
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Originator timeout: originator %pM, last_valid %lu\n",
-                        orig_node->orig, (orig_node->last_valid / HZ));
-                return true;
-        } else {
-                if (purge_orig_neighbors(bat_priv, orig_node,
-                                                        &best_neigh_node)) {
-                        update_routes(bat_priv, orig_node,
-                                      best_neigh_node,
-                                      orig_node->hna_buff,
-                                      orig_node->hna_buff_len);
-                        /* update bonding candidates, we could have lost
-                         * some candidates. */
-                        update_bonding_candidates(bat_priv, orig_node);
-                }
-        }
-
-        return false;
-}
-
-static void _purge_orig(struct bat_priv *bat_priv)
-{
-        HASHIT(hashit);
-        struct orig_node *orig_node;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        /* for all origins... */
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-
-                if (purge_orig_node(bat_priv, orig_node)) {
-                        hash_remove_bucket(bat_priv->orig_hash, &hashit);
-                        free_orig_node(orig_node, bat_priv);
-                }
-
-                if (time_after(jiffies, (orig_node->last_frag_packet +
-                                        msecs_to_jiffies(FRAG_TIMEOUT))))
-                        frag_list_free(&orig_node->frag_list);
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-}
-
-static void purge_orig(struct work_struct *work)
-{
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, orig_work);
-
-        _purge_orig(bat_priv);
-        start_purge_timer(bat_priv);
-}
-
-void purge_orig_ref(struct bat_priv *bat_priv)
-{
-        _purge_orig(bat_priv);
-}
-
-int orig_seq_print_text(struct seq_file *seq, void *offset)
-{
-        HASHIT(hashit);
-        struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct orig_node *orig_node;
-        struct neigh_node *neigh_node;
-        int batman_count = 0;
-        int last_seen_secs;
-        int last_seen_msecs;
-        unsigned long flags;
-
-        if ((!bat_priv->primary_if) ||
-            (bat_priv->primary_if->if_status != IF_ACTIVE)) {
-                if (!bat_priv->primary_if)
-                        return seq_printf(seq, "BATMAN mesh %s disabled - "
-                                     "please specify interfaces to enable it\n",
-                                     net_dev->name);
-
-                return seq_printf(seq, "BATMAN mesh %s "
-                                  "disabled - primary interface not active\n",
-                                  net_dev->name);
-        }
-
-        seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",
-                   SOURCE_VERSION, REVISION_VERSION_STR,
-                   bat_priv->primary_if->net_dev->name,
-                   bat_priv->primary_if->net_dev->dev_addr, net_dev->name);
-        seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
-                   "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",
-                   "outgoingIF", "Potential nexthops");
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-
-                orig_node = hashit.bucket->data;
-
-                if (!orig_node->router)
-                        continue;
-
-                if (orig_node->router->tq_avg == 0)
-                        continue;
-
-                last_seen_secs = jiffies_to_msecs(jiffies -
-                                                orig_node->last_valid) / 1000;
-                last_seen_msecs = jiffies_to_msecs(jiffies -
-                                                orig_node->last_valid) % 1000;
-
-                seq_printf(seq, "%pM %4i.%03is   (%3i) %pM [%10s]:",
-                           orig_node->orig, last_seen_secs, last_seen_msecs,
-                           orig_node->router->tq_avg, orig_node->router->addr,
-                           orig_node->router->if_incoming->net_dev->name);
-
-                list_for_each_entry(neigh_node, &orig_node->neigh_list, list) {
-                        seq_printf(seq, " %pM (%3i)", neigh_node->addr,
-                                           neigh_node->tq_avg);
-                }
-
-                seq_printf(seq, "\n");
-                batman_count++;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        if ((batman_count == 0))
-                seq_printf(seq, "No batman nodes in range ...\n");
-
-        return 0;
-}
-
-static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
-{
-        void *data_ptr;
-
-        data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS,
-                           GFP_ATOMIC);
-        if (!data_ptr) {
-                pr_err("Can't resize orig: out of memory\n");
-                return -1;
-        }
-
-        memcpy(data_ptr, orig_node->bcast_own,
-               (max_if_num - 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS);
-        kfree(orig_node->bcast_own);
-        orig_node->bcast_own = data_ptr;
-
-        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
-        if (!data_ptr) {
-                pr_err("Can't resize orig: out of memory\n");
-                return -1;
-        }
-
-        memcpy(data_ptr, orig_node->bcast_own_sum,
-               (max_if_num - 1) * sizeof(uint8_t));
-        kfree(orig_node->bcast_own_sum);
-        orig_node->bcast_own_sum = data_ptr;
-
-        return 0;
-}
-
-int orig_hash_add_if(struct batman_if *batman_if, int max_if_num)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        struct orig_node *orig_node;
-        unsigned long flags;
-        HASHIT(hashit);
-
-        /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-
-                if (orig_node_add_if(orig_node, max_if_num) == -1)
-                        goto err;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        return 0;
-
-err:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        return -ENOMEM;
-}
-
-static int orig_node_del_if(struct orig_node *orig_node,
-                     int max_if_num, int del_if_num)
-{
-        void *data_ptr = NULL;
-        int chunk_size;
-
-        /* last interface was removed */
-        if (max_if_num == 0)
-                goto free_bcast_own;
-
-        chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS;
-        data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
-        if (!data_ptr) {
-                pr_err("Can't resize orig: out of memory\n");
-                return -1;
-        }
-
-        /* copy first part */
-        memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
-
-        /* copy second part */
-        memcpy(data_ptr + del_if_num * chunk_size,
-               orig_node->bcast_own + ((del_if_num + 1) * chunk_size),
-               (max_if_num - del_if_num) * chunk_size);
-
-free_bcast_own:
-        kfree(orig_node->bcast_own);
-        orig_node->bcast_own = data_ptr;
-
-        if (max_if_num == 0)
-                goto free_own_sum;
-
-        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
-        if (!data_ptr) {
-                pr_err("Can't resize orig: out of memory\n");
-                return -1;
-        }
-
-        memcpy(data_ptr, orig_node->bcast_own_sum,
-               del_if_num * sizeof(uint8_t));
-
-        memcpy(data_ptr + del_if_num * sizeof(uint8_t),
-               orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)),
-               (max_if_num - del_if_num) * sizeof(uint8_t));
-
-free_own_sum:
-        kfree(orig_node->bcast_own_sum);
-        orig_node->bcast_own_sum = data_ptr;
-
-        return 0;
-}
-
-int orig_hash_del_if(struct batman_if *batman_if, int max_if_num)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        struct batman_if *batman_if_tmp;
-        struct orig_node *orig_node;
-        unsigned long flags;
-        HASHIT(hashit);
-        int ret;
-
-        /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-
-                ret = orig_node_del_if(orig_node, max_if_num,
-                                       batman_if->if_num);
-
-                if (ret == -1)
-                        goto err;
-        }
-
-        /* renumber remaining batman interfaces _inside_ of orig_hash_lock */
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if_tmp, &if_list, list) {
-                if (batman_if_tmp->if_status == IF_NOT_IN_USE)
-                        continue;
-
-                if (batman_if == batman_if_tmp)
-                        continue;
-
-                if (batman_if->soft_iface != batman_if_tmp->soft_iface)
-                        continue;
-
-                if (batman_if_tmp->if_num > batman_if->if_num)
-                        batman_if_tmp->if_num--;
-        }
-        rcu_read_unlock();
-
-        batman_if->if_num = -1;
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        return 0;
-
-err:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        return -ENOMEM;
-}
diff --git a/drivers/staging/batman-adv/originator.h b/drivers/staging/batman-adv/originator.h
deleted file mode 100644
index a97c4004776a..000000000000
--- a/drivers/staging/batman-adv/originator.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ORIGINATOR_H_
-#define _NET_BATMAN_ADV_ORIGINATOR_H_
-
-int originator_init(struct bat_priv *bat_priv);
-void originator_free(struct bat_priv *bat_priv);
-void purge_orig_ref(struct bat_priv *bat_priv);
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr);
-struct neigh_node *
-create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
-                uint8_t *neigh, struct batman_if *if_incoming);
-int orig_seq_print_text(struct seq_file *seq, void *offset);
-int orig_hash_add_if(struct batman_if *batman_if, int max_if_num);
-int orig_hash_del_if(struct batman_if *batman_if, int max_if_num);
-
-#endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */
diff --git a/drivers/staging/batman-adv/packet.h b/drivers/staging/batman-adv/packet.h
deleted file mode 100644
index 2693383889a4..000000000000
--- a/drivers/staging/batman-adv/packet.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_PACKET_H_
-#define _NET_BATMAN_ADV_PACKET_H_
-
-#define ETH_P_BATMAN  0x4305    /* unofficial/not registered Ethertype */
-
-#define BAT_PACKET       0x01
-#define BAT_ICMP         0x02
-#define BAT_UNICAST      0x03
-#define BAT_BCAST        0x04
-#define BAT_VIS          0x05
-#define BAT_UNICAST_FRAG 0x06
-
-/* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 13
-#define DIRECTLINK 0x40
-#define VIS_SERVER 0x20
-#define PRIMARIES_FIRST_HOP 0x10
-
-/* ICMP message types */
-#define ECHO_REPLY 0
-#define DESTINATION_UNREACHABLE 3
-#define ECHO_REQUEST 8
-#define TTL_EXCEEDED 11
-#define PARAMETER_PROBLEM 12
-
-/* vis defines */
-#define VIS_TYPE_SERVER_SYNC            0
-#define VIS_TYPE_CLIENT_UPDATE          1
-
-/* fragmentation defines */
-#define UNI_FRAG_HEAD 0x01
-
-struct batman_packet {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
-        uint8_t  tq;
-        uint32_t seqno;
-        uint8_t  orig[6];
-        uint8_t  prev_sender[6];
-        uint8_t  ttl;
-        uint8_t  num_hna;
-} __attribute__((packed));
-
-#define BAT_PACKET_LEN sizeof(struct batman_packet)
-
-struct icmp_packet {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  msg_type; /* see ICMP message types above */
-        uint8_t  ttl;
-        uint8_t  dst[6];
-        uint8_t  orig[6];
-        uint16_t seqno;
-        uint8_t  uid;
-} __attribute__((packed));
-
-#define BAT_RR_LEN 16
-
-/* icmp_packet_rr must start with all fields from imcp_packet
- * as this is assumed by code that handles ICMP packets */
-struct icmp_packet_rr {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  msg_type; /* see ICMP message types above */
-        uint8_t  ttl;
-        uint8_t  dst[6];
-        uint8_t  orig[6];
-        uint16_t seqno;
-        uint8_t  uid;
-        uint8_t  rr_cur;
-        uint8_t  rr[BAT_RR_LEN][ETH_ALEN];
-} __attribute__((packed));
-
-struct unicast_packet {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  dest[6];
-        uint8_t  ttl;
-} __attribute__((packed));
-
-struct unicast_frag_packet {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  dest[6];
-        uint8_t  ttl;
-        uint8_t  flags;
-        uint8_t  orig[6];
-        uint16_t seqno;
-} __attribute__((packed));
-
-struct bcast_packet {
-        uint8_t  packet_type;
-        uint8_t  version;  /* batman version field */
-        uint8_t  orig[6];
-        uint8_t  ttl;
-        uint32_t seqno;
-} __attribute__((packed));
-
-struct vis_packet {
-        uint8_t  packet_type;
-        uint8_t  version;        /* batman version field */
-        uint8_t  vis_type;       /* which type of vis-participant sent this? */
-        uint8_t  entries;        /* number of entries behind this struct */
-        uint32_t seqno;          /* sequence number */
-        uint8_t  ttl;            /* TTL */
-        uint8_t  vis_orig[6];    /* originator that informs about its
-                                  * neighbors */
-        uint8_t  target_orig[6]; /* who should receive this packet */
-        uint8_t  sender_orig[6]; /* who sent or rebroadcasted this packet */
-} __attribute__((packed));
-
-#endif /* _NET_BATMAN_ADV_PACKET_H_ */
diff --git a/drivers/staging/batman-adv/ring_buffer.c b/drivers/staging/batman-adv/ring_buffer.c
deleted file mode 100644
index defd37c9be1f..000000000000
--- a/drivers/staging/batman-adv/ring_buffer.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "ring_buffer.h"
-
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value)
-{
-        lq_recv[*lq_index] = value;
-        *lq_index = (*lq_index + 1) % TQ_GLOBAL_WINDOW_SIZE;
-}
-
-uint8_t ring_buffer_avg(uint8_t lq_recv[])
-{
-        uint8_t *ptr;
-        uint16_t count = 0, i = 0, sum = 0;
-
-        ptr = lq_recv;
-
-        while (i < TQ_GLOBAL_WINDOW_SIZE) {
-                if (*ptr != 0) {
-                        count++;
-                        sum += *ptr;
-                }
-
-                i++;
-                ptr++;
-        }
-
-        if (count == 0)
-                return 0;
-
-        return (uint8_t)(sum / count);
-}
diff --git a/drivers/staging/batman-adv/ring_buffer.h b/drivers/staging/batman-adv/ring_buffer.h
deleted file mode 100644
index 6b0cb9aaeba5..000000000000
--- a/drivers/staging/batman-adv/ring_buffer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_
-#define _NET_BATMAN_ADV_RING_BUFFER_H_
-
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value);
-uint8_t ring_buffer_avg(uint8_t lq_recv[]);
-
-#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
deleted file mode 100644
index 657b69e6b957..000000000000
--- a/drivers/staging/batman-adv/routing.c
+++ /dev/null
@@ -1,1389 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "routing.h"
-#include "send.h"
-#include "hash.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "icmp_socket.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "types.h"
-#include "ring_buffer.h"
-#include "vis.h"
-#include "aggregation.h"
-#include "unicast.h"
-
-void slide_own_bcast_window(struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        HASHIT(hashit);
-        struct orig_node *orig_node;
-        TYPE_OF_WORD *word;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-                word = &(orig_node->bcast_own[batman_if->if_num * NUM_WORDS]);
-
-                bit_get_packet(bat_priv, word, 1, 0);
-                orig_node->bcast_own_sum[batman_if->if_num] =
-                        bit_packet_count(word);
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-}
-
-static void update_HNA(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                       unsigned char *hna_buff, int hna_buff_len)
-{
-        if ((hna_buff_len != orig_node->hna_buff_len) ||
-            ((hna_buff_len > 0) &&
-             (orig_node->hna_buff_len > 0) &&
-             (memcmp(orig_node->hna_buff, hna_buff, hna_buff_len) != 0))) {
-
-                if (orig_node->hna_buff_len > 0)
-                        hna_global_del_orig(bat_priv, orig_node,
-                                            "originator changed hna");
-
-                if ((hna_buff_len > 0) && (hna_buff != NULL))
-                        hna_global_add_orig(bat_priv, orig_node,
-                                            hna_buff, hna_buff_len);
-        }
-}
-
-static void update_route(struct bat_priv *bat_priv,
-                         struct orig_node *orig_node,
-                         struct neigh_node *neigh_node,
-                         unsigned char *hna_buff, int hna_buff_len)
-{
-        /* route deleted */
-        if ((orig_node->router != NULL) && (neigh_node == NULL)) {
-
-                bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n",
-                        orig_node->orig);
-                hna_global_del_orig(bat_priv, orig_node,
-                                    "originator timed out");
-
-                /* route added */
-        } else if ((orig_node->router == NULL) && (neigh_node != NULL)) {
-
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "Adding route towards: %pM (via %pM)\n",
-                        orig_node->orig, neigh_node->addr);
-                hna_global_add_orig(bat_priv, orig_node,
-                                    hna_buff, hna_buff_len);
-
-                /* route changed */
-        } else {
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "Changing route towards: %pM "
-                        "(now via %pM - was via %pM)\n",
-                        orig_node->orig, neigh_node->addr,
-                        orig_node->router->addr);
-        }
-
-        orig_node->router = neigh_node;
-}
-
-
-void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                   struct neigh_node *neigh_node, unsigned char *hna_buff,
-                   int hna_buff_len)
-{
-
-        if (orig_node == NULL)
-                return;
-
-        if (orig_node->router != neigh_node)
-                update_route(bat_priv, orig_node, neigh_node,
-                             hna_buff, hna_buff_len);
-        /* may be just HNA changed */
-        else
-                update_HNA(bat_priv, orig_node, hna_buff, hna_buff_len);
-}
-
-static int is_bidirectional_neigh(struct orig_node *orig_node,
-                                struct orig_node *orig_neigh_node,
-                                struct batman_packet *batman_packet,
-                                struct batman_if *if_incoming)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
-        unsigned char total_count;
-
-        if (orig_node == orig_neigh_node) {
-                list_for_each_entry(tmp_neigh_node,
-                                    &orig_node->neigh_list,
-                                    list) {
-
-                        if (compare_orig(tmp_neigh_node->addr,
-                                         orig_neigh_node->orig) &&
-                            (tmp_neigh_node->if_incoming == if_incoming))
-                                neigh_node = tmp_neigh_node;
-                }
-
-                if (!neigh_node)
-                        neigh_node = create_neighbor(orig_node,
-                                                     orig_neigh_node,
-                                                     orig_neigh_node->orig,
-                                                     if_incoming);
-                /* create_neighbor failed, return 0 */
-                if (!neigh_node)
-                        return 0;
-
-                neigh_node->last_valid = jiffies;
-        } else {
-                /* find packet count of corresponding one hop neighbor */
-                list_for_each_entry(tmp_neigh_node,
-                                    &orig_neigh_node->neigh_list, list) {
-
-                        if (compare_orig(tmp_neigh_node->addr,
-                                         orig_neigh_node->orig) &&
-                            (tmp_neigh_node->if_incoming == if_incoming))
-                                neigh_node = tmp_neigh_node;
-                }
-
-                if (!neigh_node)
-                        neigh_node = create_neighbor(orig_neigh_node,
-                                                     orig_neigh_node,
-                                                     orig_neigh_node->orig,
-                                                     if_incoming);
-                /* create_neighbor failed, return 0 */
-                if (!neigh_node)
-                        return 0;
-        }
-
-        orig_node->last_valid = jiffies;
-
-        /* pay attention to not get a value bigger than 100 % */
-        total_count = (orig_neigh_node->bcast_own_sum[if_incoming->if_num] >
-                       neigh_node->real_packet_count ?
-                       neigh_node->real_packet_count :
-                       orig_neigh_node->bcast_own_sum[if_incoming->if_num]);
-
-        /* if we have too few packets (too less data) we set tq_own to zero */
-        /* if we receive too few packets it is not considered bidirectional */
-        if ((total_count < TQ_LOCAL_BIDRECT_SEND_MINIMUM) ||
-            (neigh_node->real_packet_count < TQ_LOCAL_BIDRECT_RECV_MINIMUM))
-                orig_neigh_node->tq_own = 0;
-        else
-                /* neigh_node->real_packet_count is never zero as we
-                 * only purge old information when getting new
-                 * information */
-                orig_neigh_node->tq_own = (TQ_MAX_VALUE * total_count) /
-                        neigh_node->real_packet_count;
-
-        /*
-         * 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does
-         * affect the nearly-symmetric links only a little, but
-         * punishes asymmetric links more.  This will give a value
-         * between 0 and TQ_MAX_VALUE
-         */
-        orig_neigh_node->tq_asym_penalty =
-                TQ_MAX_VALUE -
-                (TQ_MAX_VALUE *
-                 (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count) *
-                 (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count) *
-                 (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count)) /
-                (TQ_LOCAL_WINDOW_SIZE *
-                 TQ_LOCAL_WINDOW_SIZE *
-                 TQ_LOCAL_WINDOW_SIZE);
-
-        batman_packet->tq = ((batman_packet->tq *
-                              orig_neigh_node->tq_own *
-                              orig_neigh_node->tq_asym_penalty) /
-                             (TQ_MAX_VALUE * TQ_MAX_VALUE));
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "bidirectional: "
-                "orig = %-15pM neigh = %-15pM => own_bcast = %2i, "
-                "real recv = %2i, local tq: %3i, asym_penalty: %3i, "
-                "total tq: %3i\n",
-                orig_node->orig, orig_neigh_node->orig, total_count,
-                neigh_node->real_packet_count, orig_neigh_node->tq_own,
-                orig_neigh_node->tq_asym_penalty, batman_packet->tq);
-
-        /* if link has the minimum required transmission quality
-         * consider it bidirectional */
-        if (batman_packet->tq >= TQ_TOTAL_BIDRECT_LIMIT)
-                return 1;
-
-        return 0;
-}
-
-static void update_orig(struct bat_priv *bat_priv,
-                        struct orig_node *orig_node,
-                        struct ethhdr *ethhdr,
-                        struct batman_packet *batman_packet,
-                        struct batman_if *if_incoming,
-                        unsigned char *hna_buff, int hna_buff_len,
-                        char is_duplicate)
-{
-        struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
-        int tmp_hna_buff_len;
-
-        bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): "
-                "Searching and updating originator entry of received packet\n");
-
-        list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-                if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) &&
-                    (tmp_neigh_node->if_incoming == if_incoming)) {
-                        neigh_node = tmp_neigh_node;
-                        continue;
-                }
-
-                if (is_duplicate)
-                        continue;
-
-                ring_buffer_set(tmp_neigh_node->tq_recv,
-                                &tmp_neigh_node->tq_index, 0);
-                tmp_neigh_node->tq_avg =
-                        ring_buffer_avg(tmp_neigh_node->tq_recv);
-        }
-
-        if (!neigh_node) {
-                struct orig_node *orig_tmp;
-
-                orig_tmp = get_orig_node(bat_priv, ethhdr->h_source);
-                if (!orig_tmp)
-                        return;
-
-                neigh_node = create_neighbor(orig_node, orig_tmp,
-                                             ethhdr->h_source, if_incoming);
-                if (!neigh_node)
-                        return;
-        } else
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Updating existing last-hop neighbor of originator\n");
-
-        orig_node->flags = batman_packet->flags;
-        neigh_node->last_valid = jiffies;
-
-        ring_buffer_set(neigh_node->tq_recv,
-                        &neigh_node->tq_index,
-                        batman_packet->tq);
-        neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv);
-
-        if (!is_duplicate) {
-                orig_node->last_ttl = batman_packet->ttl;
-                neigh_node->last_ttl = batman_packet->ttl;
-        }
-
-        tmp_hna_buff_len = (hna_buff_len > batman_packet->num_hna * ETH_ALEN ?
-                            batman_packet->num_hna * ETH_ALEN : hna_buff_len);
-
-        /* if this neighbor already is our next hop there is nothing
-         * to change */
-        if (orig_node->router == neigh_node)
-                goto update_hna;
-
-        /* if this neighbor does not offer a better TQ we won't consider it */
-        if ((orig_node->router) &&
-            (orig_node->router->tq_avg > neigh_node->tq_avg))
-                goto update_hna;
-
-        /* if the TQ is the same and the link not more symetric we
-         * won't consider it either */
-        if ((orig_node->router) &&
-             ((neigh_node->tq_avg == orig_node->router->tq_avg) &&
-             (orig_node->router->orig_node->bcast_own_sum[if_incoming->if_num]
-              >= neigh_node->orig_node->bcast_own_sum[if_incoming->if_num])))
-                goto update_hna;
-
-        update_routes(bat_priv, orig_node, neigh_node,
-                      hna_buff, tmp_hna_buff_len);
-        return;
-
-update_hna:
-        update_routes(bat_priv, orig_node, orig_node->router,
-                      hna_buff, tmp_hna_buff_len);
-}
-
-/* checks whether the host restarted and is in the protection time.
- * returns:
- *  0 if the packet is to be accepted
- *  1 if the packet is to be ignored.
- */
-static int window_protected(struct bat_priv *bat_priv,
-                            int32_t seq_num_diff,
-                            unsigned long *last_reset)
-{
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
-                || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
-                if (time_after(jiffies, *last_reset +
-                        msecs_to_jiffies(RESET_PROTECTION_MS))) {
-
-                        *last_reset = jiffies;
-                        bat_dbg(DBG_BATMAN, bat_priv,
-                                "old packet received, start protection\n");
-
-                        return 0;
-                } else
-                        return 1;
-        }
-        return 0;
-}
-
-/* processes a batman packet for all interfaces, adjusts the sequence number and
- * finds out whether it is a duplicate.
- * returns:
- *   1 the packet is a duplicate
- *   0 the packet has not yet been received
- *  -1 the packet is old and has been received while the seqno window
- *     was protected. Caller should drop it.
- */
-static char count_real_packets(struct ethhdr *ethhdr,
-                               struct batman_packet *batman_packet,
-                               struct batman_if *if_incoming)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct orig_node *orig_node;
-        struct neigh_node *tmp_neigh_node;
-        char is_duplicate = 0;
-        int32_t seq_diff;
-        int need_update = 0;
-        int set_mark;
-
-        orig_node = get_orig_node(bat_priv, batman_packet->orig);
-        if (orig_node == NULL)
-                return 0;
-
-        seq_diff = batman_packet->seqno - orig_node->last_real_seqno;
-
-        /* signalize caller that the packet is to be dropped. */
-        if (window_protected(bat_priv, seq_diff,
-                             &orig_node->batman_seqno_reset))
-                return -1;
-
-        list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-
-                is_duplicate |= get_bit_status(tmp_neigh_node->real_bits,
-                                               orig_node->last_real_seqno,
-                                               batman_packet->seqno);
-
-                if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) &&
-                    (tmp_neigh_node->if_incoming == if_incoming))
-                        set_mark = 1;
-                else
-                        set_mark = 0;
-
-                /* if the window moved, set the update flag. */
-                need_update |= bit_get_packet(bat_priv,
-                                              tmp_neigh_node->real_bits,
-                                              seq_diff, set_mark);
-
-                tmp_neigh_node->real_packet_count =
-                        bit_packet_count(tmp_neigh_node->real_bits);
-        }
-
-        if (need_update) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "updating last_seqno: old %d, new %d\n",
-                        orig_node->last_real_seqno, batman_packet->seqno);
-                orig_node->last_real_seqno = batman_packet->seqno;
-        }
-
-        return is_duplicate;
-}
-
-/* copy primary address for bonding */
-static void mark_bonding_address(struct bat_priv *bat_priv,
-                                 struct orig_node *orig_node,
-                                 struct orig_node *orig_neigh_node,
-                                 struct batman_packet *batman_packet)
-
-{
-        if (batman_packet->flags & PRIMARIES_FIRST_HOP)
-                memcpy(orig_neigh_node->primary_addr,
-                       orig_node->orig, ETH_ALEN);
-
-        return;
-}
-
-/* mark possible bond.candidates in the neighbor list */
-void update_bonding_candidates(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node)
-{
-        int candidates;
-        int interference_candidate;
-        int best_tq;
-        struct neigh_node *tmp_neigh_node, *tmp_neigh_node2;
-        struct neigh_node *first_candidate, *last_candidate;
-
-        /* update the candidates for this originator */
-        if (!orig_node->router) {
-                orig_node->bond.candidates = 0;
-                return;
-        }
-
-        best_tq = orig_node->router->tq_avg;
-
-        /* update bond.candidates */
-
-        candidates = 0;
-
-        /* mark other nodes which also received "PRIMARIES FIRST HOP" packets
-         * as "bonding partner" */
-
-        /* first, zero the list */
-        list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-                tmp_neigh_node->next_bond_candidate = NULL;
-        }
-
-        first_candidate = NULL;
-        last_candidate = NULL;
-        list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-
-                /* only consider if it has the same primary address ...  */
-                if (memcmp(orig_node->orig,
-                                tmp_neigh_node->orig_node->primary_addr,
-                                ETH_ALEN) != 0)
-                        continue;
-
-                /* ... and is good enough to be considered */
-                if (tmp_neigh_node->tq_avg < best_tq - BONDING_TQ_THRESHOLD)
-                        continue;
-
-                /* check if we have another candidate with the same
-                 * mac address or interface. If we do, we won't
-                 * select this candidate because of possible interference. */
-
-                interference_candidate = 0;
-                list_for_each_entry(tmp_neigh_node2,
-                                &orig_node->neigh_list, list) {
-
-                        if (tmp_neigh_node2 == tmp_neigh_node)
-                                continue;
-
-                        /* we only care if the other candidate is even
-                         * considered as candidate. */
-                        if (tmp_neigh_node2->next_bond_candidate == NULL)
-                                continue;
-
-
-                        if ((tmp_neigh_node->if_incoming ==
-                                tmp_neigh_node2->if_incoming)
-                                || (memcmp(tmp_neigh_node->addr,
-                                tmp_neigh_node2->addr, ETH_ALEN) == 0)) {
-
-                                interference_candidate = 1;
-                                break;
-                        }
-                }
-                /* don't care further if it is an interference candidate */
-                if (interference_candidate)
-                        continue;
-
-                if (first_candidate == NULL) {
-                        first_candidate = tmp_neigh_node;
-                        tmp_neigh_node->next_bond_candidate = first_candidate;
-                } else
-                        tmp_neigh_node->next_bond_candidate = last_candidate;
-
-                last_candidate = tmp_neigh_node;
-
-                candidates++;
-        }
-
-        if (candidates > 0) {
-                first_candidate->next_bond_candidate = last_candidate;
-                orig_node->bond.selected = first_candidate;
-        }
-
-        orig_node->bond.candidates = candidates;
-}
-
-void receive_bat_packet(struct ethhdr *ethhdr,
-                                struct batman_packet *batman_packet,
-                                unsigned char *hna_buff, int hna_buff_len,
-                                struct batman_if *if_incoming)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct batman_if *batman_if;
-        struct orig_node *orig_neigh_node, *orig_node;
-        char has_directlink_flag;
-        char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
-        char is_broadcast = 0, is_bidirectional, is_single_hop_neigh;
-        char is_duplicate;
-        uint32_t if_incoming_seqno;
-
-        /* Silently drop when the batman packet is actually not a
-         * correct packet.
-         *
-         * This might happen if a packet is padded (e.g. Ethernet has a
-         * minimum frame length of 64 byte) and the aggregation interprets
-         * it as an additional length.
-         *
-         * TODO: A more sane solution would be to have a bit in the
-         * batman_packet to detect whether the packet is the last
-         * packet in an aggregation.  Here we expect that the padding
-         * is always zero (or not 0x01)
-         */
-        if (batman_packet->packet_type != BAT_PACKET)
-                return;
-
-        /* could be changed by schedule_own_packet() */
-        if_incoming_seqno = atomic_read(&if_incoming->seqno);
-
-        has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-
-        is_single_hop_neigh = (compare_orig(ethhdr->h_source,
-                                            batman_packet->orig) ? 1 : 0);
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Received BATMAN packet via NB: %pM, IF: %s [%pM] "
-                "(from OG: %pM, via prev OG: %pM, seqno %d, tq %d, "
-                "TTL %d, V %d, IDF %d)\n",
-                ethhdr->h_source, if_incoming->net_dev->name,
-                if_incoming->net_dev->dev_addr, batman_packet->orig,
-                batman_packet->prev_sender, batman_packet->seqno,
-                batman_packet->tq, batman_packet->ttl, batman_packet->version,
-                has_directlink_flag);
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->if_status != IF_ACTIVE)
-                        continue;
-
-                if (batman_if->soft_iface != if_incoming->soft_iface)
-                        continue;
-
-                if (compare_orig(ethhdr->h_source,
-                                 batman_if->net_dev->dev_addr))
-                        is_my_addr = 1;
-
-                if (compare_orig(batman_packet->orig,
-                                 batman_if->net_dev->dev_addr))
-                        is_my_orig = 1;
-
-                if (compare_orig(batman_packet->prev_sender,
-                                 batman_if->net_dev->dev_addr))
-                        is_my_oldorig = 1;
-
-                if (compare_orig(ethhdr->h_source, broadcast_addr))
-                        is_broadcast = 1;
-        }
-        rcu_read_unlock();
-
-        if (batman_packet->version != COMPAT_VERSION) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: incompatible batman version (%i)\n",
-                        batman_packet->version);
-                return;
-        }
-
-        if (is_my_addr) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: received my own broadcast (sender: %pM"
-                        ")\n",
-                        ethhdr->h_source);
-                return;
-        }
-
-        if (is_broadcast) {
-                bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
-                "ignoring all packets with broadcast source addr (sender: %pM"
-                ")\n", ethhdr->h_source);
-                return;
-        }
-
-        if (is_my_orig) {
-                TYPE_OF_WORD *word;
-                int offset;
-
-                orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source);
-
-                if (!orig_neigh_node)
-                        return;
-
-                /* neighbor has to indicate direct link and it has to
-                 * come via the corresponding interface */
-                /* if received seqno equals last send seqno save new
-                 * seqno for bidirectional check */
-                if (has_directlink_flag &&
-                    compare_orig(if_incoming->net_dev->dev_addr,
-                                 batman_packet->orig) &&
-                    (batman_packet->seqno - if_incoming_seqno + 2 == 0)) {
-                        offset = if_incoming->if_num * NUM_WORDS;
-                        word = &(orig_neigh_node->bcast_own[offset]);
-                        bit_mark(word, 0);
-                        orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
-                                bit_packet_count(word);
-                }
-
-                bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
-                        "originator packet from myself (via neighbor)\n");
-                return;
-        }
-
-        if (is_my_oldorig) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all rebroadcast echos (sender: "
-                        "%pM)\n", ethhdr->h_source);
-                return;
-        }
-
-        orig_node = get_orig_node(bat_priv, batman_packet->orig);
-        if (orig_node == NULL)
-                return;
-
-        is_duplicate = count_real_packets(ethhdr, batman_packet, if_incoming);
-
-        if (is_duplicate == -1) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: packet within seqno protection time "
-                        "(sender: %pM)\n", ethhdr->h_source);
-                return;
-        }
-
-        if (batman_packet->tq == 0) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: originator packet with tq equal 0\n");
-                return;
-        }
-
-        /* avoid temporary routing loops */
-        if ((orig_node->router) &&
-            (orig_node->router->orig_node->router) &&
-            (compare_orig(orig_node->router->addr,
-                          batman_packet->prev_sender)) &&
-            !(compare_orig(batman_packet->orig, batman_packet->prev_sender)) &&
-            (compare_orig(orig_node->router->addr,
-                          orig_node->router->orig_node->router->addr))) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all rebroadcast packets that "
-                        "may make me loop (sender: %pM)\n", ethhdr->h_source);
-                return;
-        }
-
-        /* if sender is a direct neighbor the sender mac equals
-         * originator mac */
-        orig_neigh_node = (is_single_hop_neigh ?
-                           orig_node :
-                           get_orig_node(bat_priv, ethhdr->h_source));
-        if (orig_neigh_node == NULL)
-                return;
-
-        /* drop packet if sender is not a direct neighbor and if we
-         * don't route towards it */
-        if (!is_single_hop_neigh &&
-            (orig_neigh_node->router == NULL)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: OGM via unknown neighbor!\n");
-                return;
-        }
-
-        is_bidirectional = is_bidirectional_neigh(orig_node, orig_neigh_node,
-                                                batman_packet, if_incoming);
-
-        /* update ranking if it is not a duplicate or has the same
-         * seqno and similar ttl as the non-duplicate */
-        if (is_bidirectional &&
-            (!is_duplicate ||
-             ((orig_node->last_real_seqno == batman_packet->seqno) &&
-              (orig_node->last_ttl - 3 <= batman_packet->ttl))))
-                update_orig(bat_priv, orig_node, ethhdr, batman_packet,
-                            if_incoming, hna_buff, hna_buff_len, is_duplicate);
-
-        mark_bonding_address(bat_priv, orig_node,
-                             orig_neigh_node, batman_packet);
-        update_bonding_candidates(bat_priv, orig_node);
-
-        /* is single hop (direct) neighbor */
-        if (is_single_hop_neigh) {
-
-                /* mark direct link on incoming interface */
-                schedule_forward_packet(orig_node, ethhdr, batman_packet,
-                                        1, hna_buff_len, if_incoming);
-
-                bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: "
-                        "rebroadcast neighbor packet with direct link flag\n");
-                return;
-        }
-
-        /* multihop originator */
-        if (!is_bidirectional) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: not received via bidirectional link\n");
-                return;
-        }
-
-        if (is_duplicate) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: duplicate packet received\n");
-                return;
-        }
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Forwarding packet: rebroadcast originator packet\n");
-        schedule_forward_packet(orig_node, ethhdr, batman_packet,
-                                0, hna_buff_len, if_incoming);
-}
-
-int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        struct ethhdr *ethhdr;
-        unsigned long flags;
-
-        /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct batman_packet))))
-                return NET_RX_DROP;
-
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* packet with broadcast indication but unicast recipient */
-        if (!is_bcast(ethhdr->h_dest))
-                return NET_RX_DROP;
-
-        /* packet with broadcast sender address */
-        if (is_bcast(ethhdr->h_source))
-                return NET_RX_DROP;
-
-        /* create a copy of the skb, if needed, to modify it. */
-        if (skb_cow(skb, 0) < 0)
-                return NET_RX_DROP;
-
-        /* keep skb linear */
-        if (skb_linearize(skb) < 0)
-                return NET_RX_DROP;
-
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        receive_aggr_bat_packet(ethhdr,
-                                skb->data,
-                                skb_headlen(skb),
-                                batman_if);
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        kfree_skb(skb);
-        return NET_RX_SUCCESS;
-}
-
-static int recv_my_icmp_packet(struct bat_priv *bat_priv,
-                               struct sk_buff *skb, size_t icmp_len)
-{
-        struct orig_node *orig_node;
-        struct icmp_packet_rr *icmp_packet;
-        struct ethhdr *ethhdr;
-        struct batman_if *batman_if;
-        int ret;
-        unsigned long flags;
-        uint8_t dstaddr[ETH_ALEN];
-
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* add data to device queue */
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
-                bat_socket_receive_packet(icmp_packet, icmp_len);
-                return NET_RX_DROP;
-        }
-
-        if (!bat_priv->primary_if)
-                return NET_RX_DROP;
-
-        /* answer echo request (ping) */
-        /* get routing information */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
-                                                   icmp_packet->orig));
-        ret = NET_RX_DROP;
-
-        if ((orig_node != NULL) &&
-            (orig_node->router != NULL)) {
-
-                /* don't lock while sending the packets ... we therefore
-                 * copy the required data before sending */
-                batman_if = orig_node->router->if_incoming;
-                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-                /* create a copy of the skb, if needed, to modify it. */
-                if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
-                        return NET_RX_DROP;
-
-                icmp_packet = (struct icmp_packet_rr *)skb->data;
-                ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-                memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
-                memcpy(icmp_packet->orig,
-                       bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-                icmp_packet->msg_type = ECHO_REPLY;
-                icmp_packet->ttl = TTL;
-
-                send_skb_packet(skb, batman_if, dstaddr);
-                ret = NET_RX_SUCCESS;
-
-        } else
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        return ret;
-}
-
-static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
-                                  struct sk_buff *skb, size_t icmp_len)
-{
-        struct orig_node *orig_node;
-        struct icmp_packet *icmp_packet;
-        struct ethhdr *ethhdr;
-        struct batman_if *batman_if;
-        int ret;
-        unsigned long flags;
-        uint8_t dstaddr[ETH_ALEN];
-
-        icmp_packet = (struct icmp_packet *)skb->data;
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* send TTL exceeded if packet is an echo request (traceroute) */
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
-                pr_debug("Warning - can't forward icmp packet from %pM to "
-                         "%pM: ttl exceeded\n", icmp_packet->orig,
-                         icmp_packet->dst);
-                return NET_RX_DROP;
-        }
-
-        if (!bat_priv->primary_if)
-                return NET_RX_DROP;
-
-        /* get routing information */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)
-                     hash_find(bat_priv->orig_hash, icmp_packet->orig));
-        ret = NET_RX_DROP;
-
-        if ((orig_node != NULL) &&
-            (orig_node->router != NULL)) {
-
-                /* don't lock while sending the packets ... we therefore
-                 * copy the required data before sending */
-                batman_if = orig_node->router->if_incoming;
-                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-                /* create a copy of the skb, if needed, to modify it. */
-                if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
-                        return NET_RX_DROP;
-
-                icmp_packet = (struct icmp_packet *) skb->data;
-                ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-                memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
-                memcpy(icmp_packet->orig,
-                       bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-                icmp_packet->msg_type = TTL_EXCEEDED;
-                icmp_packet->ttl = TTL;
-
-                send_skb_packet(skb, batman_if, dstaddr);
-                ret = NET_RX_SUCCESS;
-
-        } else
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        return ret;
-}
-
-
-int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct icmp_packet_rr *icmp_packet;
-        struct ethhdr *ethhdr;
-        struct orig_node *orig_node;
-        struct batman_if *batman_if;
-        int hdr_size = sizeof(struct icmp_packet);
-        int ret;
-        unsigned long flags;
-        uint8_t dstaddr[ETH_ALEN];
-
-        /**
-         * we truncate all incoming icmp packets if they don't match our size
-         */
-        if (skb->len >= sizeof(struct icmp_packet_rr))
-                hdr_size = sizeof(struct icmp_packet_rr);
-
-        /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, hdr_size)))
-                return NET_RX_DROP;
-
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* packet with unicast indication but broadcast recipient */
-        if (is_bcast(ethhdr->h_dest))
-                return NET_RX_DROP;
-
-        /* packet with broadcast sender address */
-        if (is_bcast(ethhdr->h_source))
-                return NET_RX_DROP;
-
-        /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
-                return NET_RX_DROP;
-
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
-
-        /* add record route information if not full */
-        if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
-            (icmp_packet->rr_cur < BAT_RR_LEN)) {
-                memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
-                        ethhdr->h_dest, ETH_ALEN);
-                icmp_packet->rr_cur++;
-        }
-
-        /* packet for me */
-        if (is_my_mac(icmp_packet->dst))
-                return recv_my_icmp_packet(bat_priv, skb, hdr_size);
-
-        /* TTL exceeded */
-        if (icmp_packet->ttl < 2)
-                return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size);
-
-        ret = NET_RX_DROP;
-
-        /* get routing information */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)
-                     hash_find(bat_priv->orig_hash, icmp_packet->dst));
-
-        if ((orig_node != NULL) &&
-            (orig_node->router != NULL)) {
-
-                /* don't lock while sending the packets ... we therefore
-                 * copy the required data before sending */
-                batman_if = orig_node->router->if_incoming;
-                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-                /* create a copy of the skb, if needed, to modify it. */
-                if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
-                        return NET_RX_DROP;
-
-                icmp_packet = (struct icmp_packet_rr *)skb->data;
-                ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-                /* decrement ttl */
-                icmp_packet->ttl--;
-
-                /* route it */
-                send_skb_packet(skb, batman_if, dstaddr);
-                ret = NET_RX_SUCCESS;
-
-        } else
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        return ret;
-}
-
-/* find a suitable router for this originator, and use
- * bonding if possible. */
-struct neigh_node *find_router(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node,
-                               struct batman_if *recv_if)
-{
-        struct orig_node *primary_orig_node;
-        struct orig_node *router_orig;
-        struct neigh_node *router, *first_candidate, *best_router;
-        static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
-        int bonding_enabled;
-
-        if (!orig_node)
-                return NULL;
-
-        if (!orig_node->router)
-                return NULL;
-
-        /* without bonding, the first node should
-         * always choose the default router. */
-
-        bonding_enabled = atomic_read(&bat_priv->bonding_enabled);
-
-        if ((!recv_if) && (!bonding_enabled))
-                return orig_node->router;
-
-        router_orig = orig_node->router->orig_node;
-
-        /* if we have something in the primary_addr, we can search
-         * for a potential bonding candidate. */
-        if (memcmp(router_orig->primary_addr, zero_mac, ETH_ALEN) == 0)
-                return orig_node->router;
-
-        /* find the orig_node which has the primary interface. might
-         * even be the same as our router_orig in many cases */
-
-        if (memcmp(router_orig->primary_addr,
-                                router_orig->orig, ETH_ALEN) == 0) {
-                primary_orig_node = router_orig;
-        } else {
-                primary_orig_node = hash_find(bat_priv->orig_hash,
-                                                router_orig->primary_addr);
-
-                if (!primary_orig_node)
-                        return orig_node->router;
-        }
-
-        /* with less than 2 candidates, we can't do any
-         * bonding and prefer the original router. */
-
-        if (primary_orig_node->bond.candidates < 2)
-                return orig_node->router;
-
-
-        /* all nodes between should choose a candidate which
-         * is is not on the interface where the packet came
-         * in. */
-        first_candidate = primary_orig_node->bond.selected;
-        router = first_candidate;
-
-        if (bonding_enabled) {
-                /* in the bonding case, send the packets in a round
-                 * robin fashion over the remaining interfaces. */
-                do {
-                        /* recv_if == NULL on the first node. */
-                        if (router->if_incoming != recv_if)
-                                break;
-
-                        router = router->next_bond_candidate;
-                } while (router != first_candidate);
-
-                primary_orig_node->bond.selected = router->next_bond_candidate;
-
-        } else {
-                /* if bonding is disabled, use the best of the
-                 * remaining candidates which are not using
-                 * this interface. */
-                best_router = first_candidate;
-
-                do {
-                        /* recv_if == NULL on the first node. */
-                        if ((router->if_incoming != recv_if) &&
-                                (router->tq_avg > best_router->tq_avg))
-                                        best_router = router;
-
-                        router = router->next_bond_candidate;
-                } while (router != first_candidate);
-
-                router = best_router;
-        }
-
-        return router;
-}
-
-static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
-{
-        struct ethhdr *ethhdr;
-
-        /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, hdr_size)))
-                return -1;
-
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* packet with unicast indication but broadcast recipient */
-        if (is_bcast(ethhdr->h_dest))
-                return -1;
-
-        /* packet with broadcast sender address */
-        if (is_bcast(ethhdr->h_source))
-                return -1;
-
-        /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
-                return -1;
-
-        return 0;
-}
-
-static int route_unicast_packet(struct sk_buff *skb,
-                                struct batman_if *recv_if, int hdr_size)
-{
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct orig_node *orig_node;
-        struct neigh_node *router;
-        struct batman_if *batman_if;
-        uint8_t dstaddr[ETH_ALEN];
-        unsigned long flags;
-        struct unicast_packet *unicast_packet;
-        struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        unicast_packet = (struct unicast_packet *)skb->data;
-
-        /* packet for me */
-        if (is_my_mac(unicast_packet->dest)) {
-                interface_rx(recv_if->soft_iface, skb, hdr_size);
-                return NET_RX_SUCCESS;
-        }
-
-        /* TTL exceeded */
-        if (unicast_packet->ttl < 2) {
-                pr_debug("Warning - can't forward unicast packet from %pM to "
-                         "%pM: ttl exceeded\n", ethhdr->h_source,
-                         unicast_packet->dest);
-                return NET_RX_DROP;
-        }
-
-        /* get routing information */
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)
-                     hash_find(bat_priv->orig_hash, unicast_packet->dest));
-
-        router = find_router(bat_priv, orig_node, recv_if);
-
-        if (!router) {
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-                return NET_RX_DROP;
-        }
-
-        /* don't lock while sending the packets ... we therefore
-         * copy the required data before sending */
-
-        batman_if = router->if_incoming;
-        memcpy(dstaddr, router->addr, ETH_ALEN);
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        /* create a copy of the skb, if needed, to modify it. */
-        if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
-                return NET_RX_DROP;
-
-        unicast_packet = (struct unicast_packet *)skb->data;
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* decrement ttl */
-        unicast_packet->ttl--;
-
-        /* route it */
-        send_skb_packet(skb, batman_if, dstaddr);
-
-        return NET_RX_SUCCESS;
-}
-
-int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
-        struct unicast_packet *unicast_packet;
-        int hdr_size = sizeof(struct unicast_packet);
-
-        if (check_unicast_packet(skb, hdr_size) < 0)
-                return NET_RX_DROP;
-
-        unicast_packet = (struct unicast_packet *)skb->data;
-
-        /* packet for me */
-        if (is_my_mac(unicast_packet->dest)) {
-                interface_rx(recv_if->soft_iface, skb, hdr_size);
-                return NET_RX_SUCCESS;
-        }
-
-        return route_unicast_packet(skb, recv_if, hdr_size);
-}
-
-int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct unicast_frag_packet *unicast_packet;
-        struct orig_node *orig_node;
-        struct frag_packet_list_entry *tmp_frag_entry;
-        int hdr_size = sizeof(struct unicast_frag_packet);
-        unsigned long flags;
-
-        if (check_unicast_packet(skb, hdr_size) < 0)
-                return NET_RX_DROP;
-
-        unicast_packet = (struct unicast_frag_packet *)skb->data;
-
-        /* packet for me */
-        if (is_my_mac(unicast_packet->dest)) {
-
-                spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-                orig_node = ((struct orig_node *)
-                        hash_find(bat_priv->orig_hash, unicast_packet->orig));
-
-                if (!orig_node) {
-                        pr_debug("couldn't find orig node for fragmentation\n");
-                        spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-                                               flags);
-                        return NET_RX_DROP;
-                }
-
-                orig_node->last_frag_packet = jiffies;
-
-                if (list_empty(&orig_node->frag_list) &&
-                        create_frag_buffer(&orig_node->frag_list)) {
-                        spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-                                               flags);
-                        return NET_RX_DROP;
-                }
-
-                tmp_frag_entry =
-                        search_frag_packet(&orig_node->frag_list,
-                                           unicast_packet);
-
-                if (!tmp_frag_entry) {
-                        create_frag_entry(&orig_node->frag_list, skb);
-                        spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-                                               flags);
-                        return NET_RX_SUCCESS;
-                }
-
-                skb = merge_frag_packet(&orig_node->frag_list,
-                                        tmp_frag_entry, skb);
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-                if (!skb)
-                        return NET_RX_DROP;
-
-                interface_rx(recv_if->soft_iface, skb, hdr_size);
-                return NET_RX_SUCCESS;
-        }
-
-        return route_unicast_packet(skb, recv_if, hdr_size);
-}
-
-
-int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct orig_node *orig_node;
-        struct bcast_packet *bcast_packet;
-        struct ethhdr *ethhdr;
-        int hdr_size = sizeof(struct bcast_packet);
-        int32_t seq_diff;
-        unsigned long flags;
-
-        /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, hdr_size)))
-                return NET_RX_DROP;
-
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* packet with broadcast indication but unicast recipient */
-        if (!is_bcast(ethhdr->h_dest))
-                return NET_RX_DROP;
-
-        /* packet with broadcast sender address */
-        if (is_bcast(ethhdr->h_source))
-                return NET_RX_DROP;
-
-        /* ignore broadcasts sent by myself */
-        if (is_my_mac(ethhdr->h_source))
-                return NET_RX_DROP;
-
-        bcast_packet = (struct bcast_packet *)skb->data;
-
-        /* ignore broadcasts originated by myself */
-        if (is_my_mac(bcast_packet->orig))
-                return NET_RX_DROP;
-
-        if (bcast_packet->ttl < 2)
-                return NET_RX_DROP;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        orig_node = ((struct orig_node *)
-                     hash_find(bat_priv->orig_hash, bcast_packet->orig));
-
-        if (orig_node == NULL) {
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-                return NET_RX_DROP;
-        }
-
-        /* check whether the packet is a duplicate */
-        if (get_bit_status(orig_node->bcast_bits,
-                           orig_node->last_bcast_seqno,
-                           ntohl(bcast_packet->seqno))) {
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-                return NET_RX_DROP;
-        }
-
-        seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno;
-
-        /* check whether the packet is old and the host just restarted. */
-        if (window_protected(bat_priv, seq_diff,
-                             &orig_node->bcast_seqno_reset)) {
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-                return NET_RX_DROP;
-        }
-
-        /* mark broadcast in flood history, update window position
-         * if required. */
-        if (bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1))
-                orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno);
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-        /* rebroadcast packet */
-        add_bcast_packet_to_list(bat_priv, skb);
-
-        /* broadcast for me */
-        interface_rx(recv_if->soft_iface, skb, hdr_size);
-
-        return NET_RX_SUCCESS;
-}
-
-int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
-        struct vis_packet *vis_packet;
-        struct ethhdr *ethhdr;
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        int hdr_size = sizeof(struct vis_packet);
-
-        /* keep skb linear */
-        if (skb_linearize(skb) < 0)
-                return NET_RX_DROP;
-
-        if (unlikely(!pskb_may_pull(skb, hdr_size)))
-                return NET_RX_DROP;
-
-        vis_packet = (struct vis_packet *)skb->data;
-        ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
-        /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
-                return NET_RX_DROP;
-
-        /* ignore own packets */
-        if (is_my_mac(vis_packet->vis_orig))
-                return NET_RX_DROP;
-
-        if (is_my_mac(vis_packet->sender_orig))
-                return NET_RX_DROP;
-
-        switch (vis_packet->vis_type) {
-        case VIS_TYPE_SERVER_SYNC:
-                receive_server_sync_packet(bat_priv, vis_packet,
-                                           skb_headlen(skb));
-                break;
-
-        case VIS_TYPE_CLIENT_UPDATE:
-                receive_client_update_packet(bat_priv, vis_packet,
-                                             skb_headlen(skb));
-                break;
-
-        default:        /* ignore unknown packet */
-                break;
-        }
-
-        /* We take a copy of the data in the packet, so we should
-           always free the skbuf. */
-        return NET_RX_DROP;
-}
diff --git a/drivers/staging/batman-adv/routing.h b/drivers/staging/batman-adv/routing.h
deleted file mode 100644
index 92674c8d9c03..000000000000
--- a/drivers/staging/batman-adv/routing.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ROUTING_H_
-#define _NET_BATMAN_ADV_ROUTING_H_
-
-#include "types.h"
-
-void slide_own_bcast_window(struct batman_if *batman_if);
-void receive_bat_packet(struct ethhdr *ethhdr,
-                                struct batman_packet *batman_packet,
-                                unsigned char *hna_buff, int hna_buff_len,
-                                struct batman_if *if_incoming);
-void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                   struct neigh_node *neigh_node, unsigned char *hna_buff,
-                   int hna_buff_len);
-int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if);
-struct neigh_node *find_router(struct bat_priv *bat_priv,
-                struct orig_node *orig_node, struct batman_if *recv_if);
-void update_bonding_candidates(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node);
-
-#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c
deleted file mode 100644
index 7adf76ddd0ba..000000000000
--- a/drivers/staging/batman-adv/send.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "send.h"
-#include "routing.h"
-#include "translation-table.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "types.h"
-#include "vis.h"
-#include "aggregation.h"
-
-
-static void send_outstanding_bcast_packet(struct work_struct *work);
-
-/* apply hop penalty for a normal link */
-static uint8_t hop_penalty(const uint8_t tq)
-{
-        return (tq * (TQ_MAX_VALUE - TQ_HOP_PENALTY)) / (TQ_MAX_VALUE);
-}
-
-/* when do we schedule our own packet to be sent */
-static unsigned long own_send_time(struct bat_priv *bat_priv)
-{
-        return jiffies + msecs_to_jiffies(
-                   atomic_read(&bat_priv->orig_interval) -
-                   JITTER + (random32() % 2*JITTER));
-}
-
-/* when do we schedule a forwarded packet to be sent */
-static unsigned long forward_send_time(struct bat_priv *bat_priv)
-{
-        return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
-}
-
-/* send out an already prepared packet to the given address via the
- * specified batman interface */
-int send_skb_packet(struct sk_buff *skb,
-                                struct batman_if *batman_if,
-                                uint8_t *dst_addr)
-{
-        struct ethhdr *ethhdr;
-
-        if (batman_if->if_status != IF_ACTIVE)
-                goto send_skb_err;
-
-        if (unlikely(!batman_if->net_dev))
-                goto send_skb_err;
-
-        if (!(batman_if->net_dev->flags & IFF_UP)) {
-                pr_warning("Interface %s is not up - can't send packet via "
-                           "that interface!\n", batman_if->net_dev->name);
-                goto send_skb_err;
-        }
-
-        /* push to the ethernet header. */
-        if (my_skb_head_push(skb, sizeof(struct ethhdr)) < 0)
-                goto send_skb_err;
-
-        skb_reset_mac_header(skb);
-
-        ethhdr = (struct ethhdr *) skb_mac_header(skb);
-        memcpy(ethhdr->h_source, batman_if->net_dev->dev_addr, ETH_ALEN);
-        memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
-        ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);
-
-        skb_set_network_header(skb, ETH_HLEN);
-        skb->priority = TC_PRIO_CONTROL;
-        skb->protocol = __constant_htons(ETH_P_BATMAN);
-
-        skb->dev = batman_if->net_dev;
-
-        /* dev_queue_xmit() returns a negative result on error.  However on
-         * congestion and traffic shaping, it drops and returns NET_XMIT_DROP
-         * (which is > 0). This will not be treated as an error. */
-
-        return dev_queue_xmit(skb);
-send_skb_err:
-        kfree_skb(skb);
-        return NET_XMIT_DROP;
-}
-
-/* Send a packet to a given interface */
-static void send_packet_to_if(struct forw_packet *forw_packet,
-                              struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        char *fwd_str;
-        uint8_t packet_num;
-        int16_t buff_pos;
-        struct batman_packet *batman_packet;
-        struct sk_buff *skb;
-
-        if (batman_if->if_status != IF_ACTIVE)
-                return;
-
-        packet_num = 0;
-        buff_pos = 0;
-        batman_packet = (struct batman_packet *)forw_packet->skb->data;
-
-        /* adjust all flags and log packets */
-        while (aggregated_packet(buff_pos,
-                                 forw_packet->packet_len,
-                                 batman_packet->num_hna)) {
-
-                /* we might have aggregated direct link packets with an
-                 * ordinary base packet */
-                if ((forw_packet->direct_link_flags & (1 << packet_num)) &&
-                    (forw_packet->if_incoming == batman_if))
-                        batman_packet->flags |= DIRECTLINK;
-                else
-                        batman_packet->flags &= ~DIRECTLINK;
-
-                fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?
-                                                            "Sending own" :
-                                                            "Forwarding"));
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d,"
-                        " IDF %s) on interface %s [%pM]\n",
-                        fwd_str, (packet_num > 0 ? "aggregated " : ""),
-                        batman_packet->orig, ntohl(batman_packet->seqno),
-                        batman_packet->tq, batman_packet->ttl,
-                        (batman_packet->flags & DIRECTLINK ?
-                         "on" : "off"),
-                        batman_if->net_dev->name, batman_if->net_dev->dev_addr);
-
-                buff_pos += sizeof(struct batman_packet) +
-                        (batman_packet->num_hna * ETH_ALEN);
-                packet_num++;
-                batman_packet = (struct batman_packet *)
-                        (forw_packet->skb->data + buff_pos);
-        }
-
-        /* create clone because function is called more than once */
-        skb = skb_clone(forw_packet->skb, GFP_ATOMIC);
-        if (skb)
-                send_skb_packet(skb, batman_if, broadcast_addr);
-}
-
-/* send a batman packet */
-static void send_packet(struct forw_packet *forw_packet)
-{
-        struct batman_if *batman_if;
-        struct net_device *soft_iface;
-        struct bat_priv *bat_priv;
-        struct batman_packet *batman_packet =
-                (struct batman_packet *)(forw_packet->skb->data);
-        unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-
-        if (!forw_packet->if_incoming) {
-                pr_err("Error - can't forward packet: incoming iface not "
-                       "specified\n");
-                return;
-        }
-
-        soft_iface = forw_packet->if_incoming->soft_iface;
-        bat_priv = netdev_priv(soft_iface);
-
-        if (forw_packet->if_incoming->if_status != IF_ACTIVE)
-                return;
-
-        /* multihomed peer assumed */
-        /* non-primary OGMs are only broadcasted on their interface */
-        if ((directlink && (batman_packet->ttl == 1)) ||
-            (forw_packet->own && (forw_packet->if_incoming->if_num > 0))) {
-
-                /* FIXME: what about aggregated packets ? */
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "%s packet (originator %pM, seqno %d, TTL %d) "
-                        "on interface %s [%pM]\n",
-                        (forw_packet->own ? "Sending own" : "Forwarding"),
-                        batman_packet->orig, ntohl(batman_packet->seqno),
-                        batman_packet->ttl,
-                        forw_packet->if_incoming->net_dev->name,
-                        forw_packet->if_incoming->net_dev->dev_addr);
-
-                /* skb is only used once and than forw_packet is free'd */
-                send_skb_packet(forw_packet->skb, forw_packet->if_incoming,
-                                broadcast_addr);
-                forw_packet->skb = NULL;
-
-                return;
-        }
-
-        /* broadcast on every interface */
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->soft_iface != soft_iface)
-                        continue;
-
-                send_packet_to_if(forw_packet, batman_if);
-        }
-        rcu_read_unlock();
-}
-
-static void rebuild_batman_packet(struct bat_priv *bat_priv,
-                                  struct batman_if *batman_if)
-{
-        int new_len;
-        unsigned char *new_buff;
-        struct batman_packet *batman_packet;
-
-        new_len = sizeof(struct batman_packet) +
-                        (bat_priv->num_local_hna * ETH_ALEN);
-        new_buff = kmalloc(new_len, GFP_ATOMIC);
-
-        /* keep old buffer if kmalloc should fail */
-        if (new_buff) {
-                memcpy(new_buff, batman_if->packet_buff,
-                       sizeof(struct batman_packet));
-                batman_packet = (struct batman_packet *)new_buff;
-
-                batman_packet->num_hna = hna_local_fill_buffer(bat_priv,
-                                new_buff + sizeof(struct batman_packet),
-                                new_len - sizeof(struct batman_packet));
-
-                kfree(batman_if->packet_buff);
-                batman_if->packet_buff = new_buff;
-                batman_if->packet_len = new_len;
-        }
-}
-
-void schedule_own_packet(struct batman_if *batman_if)
-{
-        struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-        unsigned long send_time;
-        struct batman_packet *batman_packet;
-        int vis_server;
-
-        if ((batman_if->if_status == IF_NOT_IN_USE) ||
-            (batman_if->if_status == IF_TO_BE_REMOVED))
-                return;
-
-        vis_server = atomic_read(&bat_priv->vis_mode);
-
-        /**
-         * the interface gets activated here to avoid race conditions between
-         * the moment of activating the interface in
-         * hardif_activate_interface() where the originator mac is set and
-         * outdated packets (especially uninitialized mac addresses) in the
-         * packet queue
-         */
-        if (batman_if->if_status == IF_TO_BE_ACTIVATED)
-                batman_if->if_status = IF_ACTIVE;
-
-        /* if local hna has changed and interface is a primary interface */
-        if ((atomic_read(&bat_priv->hna_local_changed)) &&
-            (batman_if == bat_priv->primary_if))
-                rebuild_batman_packet(bat_priv, batman_if);
-
-        /**
-         * NOTE: packet_buff might just have been re-allocated in
-         * rebuild_batman_packet()
-         */
-        batman_packet = (struct batman_packet *)batman_if->packet_buff;
-
-        /* change sequence number to network order */
-        batman_packet->seqno =
-                htonl((uint32_t)atomic_read(&batman_if->seqno));
-
-        if (vis_server == VIS_TYPE_SERVER_SYNC)
-                batman_packet->flags |= VIS_SERVER;
-        else
-                batman_packet->flags &= ~VIS_SERVER;
-
-        atomic_inc(&batman_if->seqno);
-
-        slide_own_bcast_window(batman_if);
-        send_time = own_send_time(bat_priv);
-        add_bat_packet_to_list(bat_priv,
-                               batman_if->packet_buff,
-                               batman_if->packet_len,
-                               batman_if, 1, send_time);
-}
-
-void schedule_forward_packet(struct orig_node *orig_node,
-                             struct ethhdr *ethhdr,
-                             struct batman_packet *batman_packet,
-                             uint8_t directlink, int hna_buff_len,
-                             struct batman_if *if_incoming)
-{
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        unsigned char in_tq, in_ttl, tq_avg = 0;
-        unsigned long send_time;
-
-        if (batman_packet->ttl <= 1) {
-                bat_dbg(DBG_BATMAN, bat_priv, "ttl exceeded\n");
-                return;
-        }
-
-        in_tq = batman_packet->tq;
-        in_ttl = batman_packet->ttl;
-
-        batman_packet->ttl--;
-        memcpy(batman_packet->prev_sender, ethhdr->h_source, ETH_ALEN);
-
-        /* rebroadcast tq of our best ranking neighbor to ensure the rebroadcast
-         * of our best tq value */
-        if ((orig_node->router) && (orig_node->router->tq_avg != 0)) {
-
-                /* rebroadcast ogm of best ranking neighbor as is */
-                if (!compare_orig(orig_node->router->addr, ethhdr->h_source)) {
-                        batman_packet->tq = orig_node->router->tq_avg;
-
-                        if (orig_node->router->last_ttl)
-                                batman_packet->ttl = orig_node->router->last_ttl
-                                                        - 1;
-                }
-
-                tq_avg = orig_node->router->tq_avg;
-        }
-
-        /* apply hop penalty */
-        batman_packet->tq = hop_penalty(batman_packet->tq);
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Forwarding packet: tq_orig: %i, tq_avg: %i, "
-                "tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n",
-                in_tq, tq_avg, batman_packet->tq, in_ttl - 1,
-                batman_packet->ttl);
-
-        batman_packet->seqno = htonl(batman_packet->seqno);
-
-        /* switch of primaries first hop flag when forwarding */
-        batman_packet->flags &= ~PRIMARIES_FIRST_HOP;
-        if (directlink)
-                batman_packet->flags |= DIRECTLINK;
-        else
-                batman_packet->flags &= ~DIRECTLINK;
-
-        send_time = forward_send_time(bat_priv);
-        add_bat_packet_to_list(bat_priv,
-                               (unsigned char *)batman_packet,
-                               sizeof(struct batman_packet) + hna_buff_len,
-                               if_incoming, 0, send_time);
-}
-
-static void forw_packet_free(struct forw_packet *forw_packet)
-{
-        if (forw_packet->skb)
-                kfree_skb(forw_packet->skb);
-        kfree(forw_packet);
-}
-
-static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
-                                      struct forw_packet *forw_packet,
-                                      unsigned long send_time)
-{
-        unsigned long flags;
-        INIT_HLIST_NODE(&forw_packet->list);
-
-        /* add new packet to packet list */
-        spin_lock_irqsave(&bat_priv->forw_bcast_list_lock, flags);
-        hlist_add_head(&forw_packet->list, &bat_priv->forw_bcast_list);
-        spin_unlock_irqrestore(&bat_priv->forw_bcast_list_lock, flags);
-
-        /* start timer for this packet */
-        INIT_DELAYED_WORK(&forw_packet->delayed_work,
-                          send_outstanding_bcast_packet);
-        queue_delayed_work(bat_event_workqueue, &forw_packet->delayed_work,
-                           send_time);
-}
-
-#define atomic_dec_not_zero(v)          atomic_add_unless((v), -1, 0)
-/* add a broadcast packet to the queue and setup timers. broadcast packets
- * are sent multiple times to increase probability for beeing received.
- *
- * This function returns NETDEV_TX_OK on success and NETDEV_TX_BUSY on
- * errors.
- *
- * The skb is not consumed, so the caller should make sure that the
- * skb is freed. */
-int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb)
-{
-        struct forw_packet *forw_packet;
-        struct bcast_packet *bcast_packet;
-
-        if (!atomic_dec_not_zero(&bat_priv->bcast_queue_left)) {
-                bat_dbg(DBG_BATMAN, bat_priv, "bcast packet queue full\n");
-                goto out;
-        }
-
-        if (!bat_priv->primary_if)
-                goto out;
-
-        forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);
-
-        if (!forw_packet)
-                goto out_and_inc;
-
-        skb = skb_copy(skb, GFP_ATOMIC);
-        if (!skb)
-                goto packet_free;
-
-        /* as we have a copy now, it is safe to decrease the TTL */
-        bcast_packet = (struct bcast_packet *)skb->data;
-        bcast_packet->ttl--;
-
-        skb_reset_mac_header(skb);
-
-        forw_packet->skb = skb;
-        forw_packet->if_incoming = bat_priv->primary_if;
-
-        /* how often did we send the bcast packet ? */
-        forw_packet->num_packets = 0;
-
-        _add_bcast_packet_to_list(bat_priv, forw_packet, 1);
-        return NETDEV_TX_OK;
-
-packet_free:
-        kfree(forw_packet);
-out_and_inc:
-        atomic_inc(&bat_priv->bcast_queue_left);
-out:
-        return NETDEV_TX_BUSY;
-}
-
-static void send_outstanding_bcast_packet(struct work_struct *work)
-{
-        struct batman_if *batman_if;
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct forw_packet *forw_packet =
-                container_of(delayed_work, struct forw_packet, delayed_work);
-        unsigned long flags;
-        struct sk_buff *skb1;
-        struct net_device *soft_iface = forw_packet->if_incoming->soft_iface;
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
-        spin_lock_irqsave(&bat_priv->forw_bcast_list_lock, flags);
-        hlist_del(&forw_packet->list);
-        spin_unlock_irqrestore(&bat_priv->forw_bcast_list_lock, flags);
-
-        if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
-                goto out;
-
-        /* rebroadcast packet */
-        rcu_read_lock();
-        list_for_each_entry_rcu(batman_if, &if_list, list) {
-                if (batman_if->soft_iface != soft_iface)
-                        continue;
-
-                /* send a copy of the saved skb */
-                skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
-                if (skb1)
-                        send_skb_packet(skb1, batman_if, broadcast_addr);
-        }
-        rcu_read_unlock();
-
-        forw_packet->num_packets++;
-
-        /* if we still have some more bcasts to send */
-        if (forw_packet->num_packets < 3) {
-                _add_bcast_packet_to_list(bat_priv, forw_packet,
-                                          ((5 * HZ) / 1000));
-                return;
-        }
-
-out:
-        forw_packet_free(forw_packet);
-        atomic_inc(&bat_priv->bcast_queue_left);
-}
-
-void send_outstanding_bat_packet(struct work_struct *work)
-{
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct forw_packet *forw_packet =
-                container_of(delayed_work, struct forw_packet, delayed_work);
-        unsigned long flags;
-        struct bat_priv *bat_priv;
-
-        bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface);
-        spin_lock_irqsave(&bat_priv->forw_bat_list_lock, flags);
-        hlist_del(&forw_packet->list);
-        spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-
-        if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
-                goto out;
-
-        send_packet(forw_packet);
-
-        /**
-         * we have to have at least one packet in the queue
-         * to determine the queues wake up time unless we are
-         * shutting down
-         */
-        if (forw_packet->own)
-                schedule_own_packet(forw_packet->if_incoming);
-
-out:
-        /* don't count own packet */
-        if (!forw_packet->own)
-                atomic_inc(&bat_priv->batman_queue_left);
-
-        forw_packet_free(forw_packet);
-}
-
-void purge_outstanding_packets(struct bat_priv *bat_priv,
-                               struct batman_if *batman_if)
-{
-        struct forw_packet *forw_packet;
-        struct hlist_node *tmp_node, *safe_tmp_node;
-        unsigned long flags;
-
-        if (batman_if)
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "purge_outstanding_packets(): %s\n",
-                        batman_if->net_dev->name);
-        else
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "purge_outstanding_packets()\n");
-
-        /* free bcast list */
-        spin_lock_irqsave(&bat_priv->forw_bcast_list_lock, flags);
-        hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
-                                  &bat_priv->forw_bcast_list, list) {
-
-                /**
-                 * if purge_outstanding_packets() was called with an argmument
-                 * we delete only packets belonging to the given interface
-                 */
-                if ((batman_if) &&
-                    (forw_packet->if_incoming != batman_if))
-                        continue;
-
-                spin_unlock_irqrestore(&bat_priv->forw_bcast_list_lock, flags);
-
-                /**
-                 * send_outstanding_bcast_packet() will lock the list to
-                 * delete the item from the list
-                 */
-                cancel_delayed_work_sync(&forw_packet->delayed_work);
-                spin_lock_irqsave(&bat_priv->forw_bcast_list_lock, flags);
-        }
-        spin_unlock_irqrestore(&bat_priv->forw_bcast_list_lock, flags);
-
-        /* free batman packet list */
-        spin_lock_irqsave(&bat_priv->forw_bat_list_lock, flags);
-        hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
-                                  &bat_priv->forw_bat_list, list) {
-
-                /**
-                 * if purge_outstanding_packets() was called with an argmument
-                 * we delete only packets belonging to the given interface
-                 */
-                if ((batman_if) &&
-                    (forw_packet->if_incoming != batman_if))
-                        continue;
-
-                spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-
-                /**
-                 * send_outstanding_bat_packet() will lock the list to
-                 * delete the item from the list
-                 */
-                cancel_delayed_work_sync(&forw_packet->delayed_work);
-                spin_lock_irqsave(&bat_priv->forw_bat_list_lock, flags);
-        }
-        spin_unlock_irqrestore(&bat_priv->forw_bat_list_lock, flags);
-}
diff --git a/drivers/staging/batman-adv/send.h b/drivers/staging/batman-adv/send.h
deleted file mode 100644
index c4cefa8e4f85..000000000000
--- a/drivers/staging/batman-adv/send.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_SEND_H_
-#define _NET_BATMAN_ADV_SEND_H_
-
-#include "types.h"
-
-int send_skb_packet(struct sk_buff *skb,
-                                struct batman_if *batman_if,
-                                uint8_t *dst_addr);
-void schedule_own_packet(struct batman_if *batman_if);
-void schedule_forward_packet(struct orig_node *orig_node,
-                             struct ethhdr *ethhdr,
-                             struct batman_packet *batman_packet,
-                             uint8_t directlink, int hna_buff_len,
-                             struct batman_if *if_outgoing);
-int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb);
-void send_outstanding_bat_packet(struct work_struct *work);
-void purge_outstanding_packets(struct bat_priv *bat_priv,
-                               struct batman_if *batman_if);
-
-#endif /* _NET_BATMAN_ADV_SEND_H_ */
diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
deleted file mode 100644
index 0e996181daf7..000000000000
--- a/drivers/staging/batman-adv/soft-interface.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "routing.h"
-#include "send.h"
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "types.h"
-#include "hash.h"
-#include "send.h"
-#include "bat_sysfs.h"
-#include <linux/slab.h>
-#include <linux/ethtool.h>
-#include <linux/etherdevice.h>
-#include "unicast.h"
-
-
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info);
-static u32 bat_get_msglevel(struct net_device *dev);
-static void bat_set_msglevel(struct net_device *dev, u32 value);
-static u32 bat_get_link(struct net_device *dev);
-static u32 bat_get_rx_csum(struct net_device *dev);
-static int bat_set_rx_csum(struct net_device *dev, u32 data);
-
-static const struct ethtool_ops bat_ethtool_ops = {
-        .get_settings = bat_get_settings,
-        .get_drvinfo = bat_get_drvinfo,
-        .get_msglevel = bat_get_msglevel,
-        .set_msglevel = bat_set_msglevel,
-        .get_link = bat_get_link,
-        .get_rx_csum = bat_get_rx_csum,
-        .set_rx_csum = bat_set_rx_csum
-};
-
-int my_skb_head_push(struct sk_buff *skb, unsigned int len)
-{
-        int result;
-
-        /**
-         * TODO: We must check if we can release all references to non-payload
-         * data using skb_header_release in our skbs to allow skb_cow_header to
-         * work optimally. This means that those skbs are not allowed to read
-         * or write any data which is before the current position of skb->data
-         * after that call and thus allow other skbs with the same data buffer
-         * to write freely in that area.
-         */
-        result = skb_cow_head(skb, len);
-        if (result < 0)
-                return result;
-
-        skb_push(skb, len);
-        return 0;
-}
-
-static int interface_open(struct net_device *dev)
-{
-        netif_start_queue(dev);
-        return 0;
-}
-
-static int interface_release(struct net_device *dev)
-{
-        netif_stop_queue(dev);
-        return 0;
-}
-
-static struct net_device_stats *interface_stats(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        return &bat_priv->stats;
-}
-
-static int interface_set_mac_addr(struct net_device *dev, void *p)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct sockaddr *addr = p;
-
-        if (!is_valid_ether_addr(addr->sa_data))
-                return -EADDRNOTAVAIL;
-
-        /* only modify hna-table if it has been initialised before */
-        if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) {
-                hna_local_remove(bat_priv, dev->dev_addr,
-                                 "mac address changed");
-                hna_local_add(dev, addr->sa_data);
-        }
-
-        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-
-        return 0;
-}
-
-static int interface_change_mtu(struct net_device *dev, int new_mtu)
-{
-        /* check ranges */
-        if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))
-                return -EINVAL;
-
-        dev->mtu = new_mtu;
-
-        return 0;
-}
-
-int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
-{
-        struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        struct bcast_packet *bcast_packet;
-        int data_len = skb->len, ret;
-
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
-                goto dropped;
-
-        soft_iface->trans_start = jiffies;
-
-        /* TODO: check this for locks */
-        hna_local_add(soft_iface, ethhdr->h_source);
-
-        /* ethernet packet should be broadcasted */
-        if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) {
-                if (!bat_priv->primary_if)
-                        goto dropped;
-
-                if (my_skb_head_push(skb, sizeof(struct bcast_packet)) < 0)
-                        goto dropped;
-
-                bcast_packet = (struct bcast_packet *)skb->data;
-                bcast_packet->version = COMPAT_VERSION;
-                bcast_packet->ttl = TTL;
-
-                /* batman packet type: broadcast */
-                bcast_packet->packet_type = BAT_BCAST;
-
-                /* hw address of first interface is the orig mac because only
-                 * this mac is known throughout the mesh */
-                memcpy(bcast_packet->orig,
-                       bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-
-                /* set broadcast sequence number */
-                bcast_packet->seqno =
-                        htonl(atomic_inc_return(&bat_priv->bcast_seqno));
-
-                add_bcast_packet_to_list(bat_priv, skb);
-
-                /* a copy is stored in the bcast list, therefore removing
-                 * the original skb. */
-                kfree_skb(skb);
-
-        /* unicast packet */
-        } else {
-                ret = unicast_send_skb(skb, bat_priv);
-                if (ret != 0)
-                        goto dropped_freed;
-        }
-
-        bat_priv->stats.tx_packets++;
-        bat_priv->stats.tx_bytes += data_len;
-        goto end;
-
-dropped:
-        kfree_skb(skb);
-dropped_freed:
-        bat_priv->stats.tx_dropped++;
-end:
-        return NETDEV_TX_OK;
-}
-
-void interface_rx(struct net_device *soft_iface,
-                  struct sk_buff *skb, int hdr_size)
-{
-        struct bat_priv *priv = netdev_priv(soft_iface);
-
-        /* check if enough space is available for pulling, and pull */
-        if (!pskb_may_pull(skb, hdr_size))
-                goto dropped;
-
-        skb_pull_rcsum(skb, hdr_size);
-/*      skb_set_mac_header(skb, -sizeof(struct ethhdr));*/
-
-        /* skb->dev & skb->pkt_type are set here */
-        if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))
-                goto dropped;
-        skb->protocol = eth_type_trans(skb, soft_iface);
-
-        /* should not be neccesary anymore as we use skb_pull_rcsum()
-         * TODO: please verify this and remove this TODO
-         * -- Dec 21st 2009, Simon Wunderlich */
-
-/*      skb->ip_summed = CHECKSUM_UNNECESSARY;*/
-
-        priv->stats.rx_packets++;
-        priv->stats.rx_bytes += skb->len + sizeof(struct ethhdr);
-
-        soft_iface->last_rx = jiffies;
-
-        netif_rx(skb);
-        return;
-
-dropped:
-        kfree_skb(skb);
-        return;
-}
-
-#ifdef HAVE_NET_DEVICE_OPS
-static const struct net_device_ops bat_netdev_ops = {
-        .ndo_open = interface_open,
-        .ndo_stop = interface_release,
-        .ndo_get_stats = interface_stats,
-        .ndo_set_mac_address = interface_set_mac_addr,
-        .ndo_change_mtu = interface_change_mtu,
-        .ndo_start_xmit = interface_tx,
-        .ndo_validate_addr = eth_validate_addr
-};
-#endif
-
-static void interface_setup(struct net_device *dev)
-{
-        struct bat_priv *priv = netdev_priv(dev);
-        char dev_addr[ETH_ALEN];
-
-        ether_setup(dev);
-
-#ifdef HAVE_NET_DEVICE_OPS
-        dev->netdev_ops = &bat_netdev_ops;
-#else
-        dev->open = interface_open;
-        dev->stop = interface_release;
-        dev->get_stats = interface_stats;
-        dev->set_mac_address = interface_set_mac_addr;
-        dev->change_mtu = interface_change_mtu;
-        dev->hard_start_xmit = interface_tx;
-#endif
-        dev->destructor = free_netdev;
-
-        /**
-         * can't call min_mtu, because the needed variables
-         * have not been initialized yet
-         */
-        dev->mtu = ETH_DATA_LEN;
-        dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the
-                                                * skbuff for our header */
-
-        /* generate random address */
-        random_ether_addr(dev_addr);
-        memcpy(dev->dev_addr, dev_addr, ETH_ALEN);
-
-        SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);
-
-        memset(priv, 0, sizeof(struct bat_priv));
-}
-
-struct net_device *softif_create(char *name)
-{
-        struct net_device *soft_iface;
-        struct bat_priv *bat_priv;
-        int ret;
-
-        soft_iface = alloc_netdev(sizeof(struct bat_priv) , name,
-                                   interface_setup);
-
-        if (!soft_iface) {
-                pr_err("Unable to allocate the batman interface: %s\n", name);
-                goto out;
-        }
-
-        ret = register_netdev(soft_iface);
-        if (ret < 0) {
-                pr_err("Unable to register the batman interface '%s': %i\n",
-                       name, ret);
-                goto free_soft_iface;
-        }
-
-        bat_priv = netdev_priv(soft_iface);
-
-        atomic_set(&bat_priv->aggregation_enabled, 1);
-        atomic_set(&bat_priv->bonding_enabled, 0);
-        atomic_set(&bat_priv->vis_mode, VIS_TYPE_CLIENT_UPDATE);
-        atomic_set(&bat_priv->orig_interval, 1000);
-        atomic_set(&bat_priv->log_level, 0);
-        atomic_set(&bat_priv->frag_enabled, 1);
-        atomic_set(&bat_priv->bcast_queue_left, BCAST_QUEUE_LEN);
-        atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
-
-        atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
-        atomic_set(&bat_priv->bcast_seqno, 1);
-        atomic_set(&bat_priv->hna_local_changed, 0);
-
-        bat_priv->primary_if = NULL;
-        bat_priv->num_ifaces = 0;
-
-        ret = sysfs_add_meshif(soft_iface);
-        if (ret < 0)
-                goto unreg_soft_iface;
-
-        ret = debugfs_add_meshif(soft_iface);
-        if (ret < 0)
-                goto unreg_sysfs;
-
-        ret = mesh_init(soft_iface);
-        if (ret < 0)
-                goto unreg_debugfs;
-
-        return soft_iface;
-
-unreg_debugfs:
-        debugfs_del_meshif(soft_iface);
-unreg_sysfs:
-        sysfs_del_meshif(soft_iface);
-unreg_soft_iface:
-        unregister_netdev(soft_iface);
-        return NULL;
-
-free_soft_iface:
-        free_netdev(soft_iface);
-out:
-        return NULL;
-}
-
-void softif_destroy(struct net_device *soft_iface)
-{
-        debugfs_del_meshif(soft_iface);
-        sysfs_del_meshif(soft_iface);
-        mesh_free(soft_iface);
-        unregister_netdevice(soft_iface);
-}
-
-/* ethtool */
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-        cmd->supported = 0;
-        cmd->advertising = 0;
-        cmd->speed = SPEED_10;
-        cmd->duplex = DUPLEX_FULL;
-        cmd->port = PORT_TP;
-        cmd->phy_address = 0;
-        cmd->transceiver = XCVR_INTERNAL;
-        cmd->autoneg = AUTONEG_DISABLE;
-        cmd->maxtxpkt = 0;
-        cmd->maxrxpkt = 0;
-
-        return 0;
-}
-
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info)
-{
-        strcpy(info->driver, "B.A.T.M.A.N. advanced");
-        strcpy(info->version, SOURCE_VERSION);
-        strcpy(info->fw_version, "N/A");
-        strcpy(info->bus_info, "batman");
-}
-
-static u32 bat_get_msglevel(struct net_device *dev)
-{
-        return -EOPNOTSUPP;
-}
-
-static void bat_set_msglevel(struct net_device *dev, u32 value)
-{
-}
-
-static u32 bat_get_link(struct net_device *dev)
-{
-        return 1;
-}
-
-static u32 bat_get_rx_csum(struct net_device *dev)
-{
-        return 0;
-}
-
-static int bat_set_rx_csum(struct net_device *dev, u32 data)
-{
-        return -EOPNOTSUPP;
-}
diff --git a/drivers/staging/batman-adv/soft-interface.h b/drivers/staging/batman-adv/soft-interface.h
deleted file mode 100644
index 843a7ec082fe..000000000000
--- a/drivers/staging/batman-adv/soft-interface.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
-#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_
-
-int my_skb_head_push(struct sk_buff *skb, unsigned int len);
-int interface_tx(struct sk_buff *skb, struct net_device *soft_iface);
-void interface_rx(struct net_device *soft_iface,
-                  struct sk_buff *skb, int hdr_size);
-struct net_device *softif_create(char *name);
-void softif_destroy(struct net_device *soft_iface);
-
-#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
diff --git a/drivers/staging/batman-adv/sysfs-class-net-batman-adv b/drivers/staging/batman-adv/sysfs-class-net-batman-adv
deleted file mode 100644
index 38dd762def4b..000000000000
--- a/drivers/staging/batman-adv/sysfs-class-net-batman-adv
+++ /dev/null
@@ -1,14 +0,0 @@
-
-What:           /sys/class/net/<iface>/batman-adv/mesh_iface
-Date:           May 2010
-Contact:        Marek Lindner <lindner_marek@yahoo.de>
-Description:
-                The /sys/class/net/<iface>/batman-adv/mesh_iface file
-                displays the batman mesh interface this <iface>
-                currently is associated with.
-
-What:           /sys/class/net/<iface>/batman-adv/iface_status
-Date:           May 2010
-Contact:        Marek Lindner <lindner_marek@yahoo.de>
-Description:
-                Indicates the status of <iface> as it is seen by batman.
diff --git a/drivers/staging/batman-adv/sysfs-class-net-mesh b/drivers/staging/batman-adv/sysfs-class-net-mesh
deleted file mode 100644
index b4cdb6038bf1..000000000000
--- a/drivers/staging/batman-adv/sysfs-class-net-mesh
+++ /dev/null
@@ -1,41 +0,0 @@
-
-What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
-Date:           May 2010
-Contact:        Marek Lindner <lindner_marek@yahoo.de>
-Description:
-                Indicates whether the batman protocol messages of the
-                mesh <mesh_iface> shall be aggregated or not.
-
-What:           /sys/class/net/<mesh_iface>/mesh/bonding
-Date:           June 2010
-Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
-Description:
-                Indicates whether the data traffic going through the
-                mesh will be sent using multiple interfaces at the
-                same time (if available).
-
-What:           /sys/class/net/<mesh_iface>/mesh/fragmentation
-Date:           October 2010
-Contact:        Andreas Langer <an.langer@gmx.de>
-Description:
-                Indicates whether the data traffic going through the
-                mesh will be fragmented or silently discarded if the
-                packet size exceeds the outgoing interface MTU.
-
-What:           /sys/class/net/<mesh_iface>/mesh/orig_interval
-Date:           May 2010
-Contact:        Marek Lindner <lindner_marek@yahoo.de>
-Description:
-                Defines the interval in milliseconds in which batman
-                sends its protocol messages.
-
-What:           /sys/class/net/<mesh_iface>/mesh/vis_mode
-Date:           May 2010
-Contact:        Marek Lindner <lindner_marek@yahoo.de>
-Description:
-                Each batman node only maintains information about its
-                own local neighborhood, therefore generating graphs
-                showing the topology of the entire mesh is not easily
-                feasible without having a central instance to collect
-                the local topologies from all nodes. This file allows
-                to activate the collecting (server) mode.
diff --git a/drivers/staging/batman-adv/translation-table.c b/drivers/staging/batman-adv/translation-table.c
deleted file mode 100644
index 681ccbda3eac..000000000000
--- a/drivers/staging/batman-adv/translation-table.c
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "translation-table.h"
-#include "soft-interface.h"
-#include "types.h"
-#include "hash.h"
-
-static void hna_local_purge(struct work_struct *work);
-static void _hna_global_del_orig(struct bat_priv *bat_priv,
-                                 struct hna_global_entry *hna_global_entry,
-                                 char *message);
-
-static void hna_local_start_timer(struct bat_priv *bat_priv)
-{
-        INIT_DELAYED_WORK(&bat_priv->hna_work, hna_local_purge);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->hna_work, 10 * HZ);
-}
-
-int hna_local_init(struct bat_priv *bat_priv)
-{
-        if (bat_priv->hna_local_hash)
-                return 1;
-
-        bat_priv->hna_local_hash = hash_new(128, compare_orig, choose_orig);
-
-        if (!bat_priv->hna_local_hash)
-                return 0;
-
-        atomic_set(&bat_priv->hna_local_changed, 0);
-        hna_local_start_timer(bat_priv);
-
-        return 1;
-}
-
-void hna_local_add(struct net_device *soft_iface, uint8_t *addr)
-{
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        struct hna_local_entry *hna_local_entry;
-        struct hna_global_entry *hna_global_entry;
-        struct hashtable_t *swaphash;
-        unsigned long flags;
-        int required_bytes;
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-        hna_local_entry =
-                ((struct hna_local_entry *)hash_find(bat_priv->hna_local_hash,
-                                                     addr));
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-
-        if (hna_local_entry) {
-                hna_local_entry->last_seen = jiffies;
-                return;
-        }
-
-        /* only announce as many hosts as possible in the batman-packet and
-           space in batman_packet->num_hna That also should give a limit to
-           MAC-flooding. */
-        required_bytes = (bat_priv->num_local_hna + 1) * ETH_ALEN;
-        required_bytes += BAT_PACKET_LEN;
-
-        if ((required_bytes > ETH_DATA_LEN) ||
-            (atomic_read(&bat_priv->aggregation_enabled) &&
-             required_bytes > MAX_AGGREGATION_BYTES) ||
-            (bat_priv->num_local_hna + 1 > 255)) {
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "Can't add new local hna entry (%pM): "
-                        "number of local hna entries exceeds packet size\n",
-                        addr);
-                return;
-        }
-
-        bat_dbg(DBG_ROUTES, bat_priv,
-                "Creating new local hna entry: %pM\n", addr);
-
-        hna_local_entry = kmalloc(sizeof(struct hna_local_entry), GFP_ATOMIC);
-        if (!hna_local_entry)
-                return;
-
-        memcpy(hna_local_entry->addr, addr, ETH_ALEN);
-        hna_local_entry->last_seen = jiffies;
-
-        /* the batman interface mac address should never be purged */
-        if (compare_orig(addr, soft_iface->dev_addr))
-                hna_local_entry->never_purge = 1;
-        else
-                hna_local_entry->never_purge = 0;
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-        hash_add(bat_priv->hna_local_hash, hna_local_entry);
-        bat_priv->num_local_hna++;
-        atomic_set(&bat_priv->hna_local_changed, 1);
-
-        if (bat_priv->hna_local_hash->elements * 4 >
-                                        bat_priv->hna_local_hash->size) {
-                swaphash = hash_resize(bat_priv->hna_local_hash,
-                                       bat_priv->hna_local_hash->size * 2);
-
-                if (!swaphash)
-                        pr_err("Couldn't resize local hna hash table\n");
-                else
-                        bat_priv->hna_local_hash = swaphash;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-
-        /* remove address from global hash if present */
-        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-
-        hna_global_entry = ((struct hna_global_entry *)
-                                hash_find(bat_priv->hna_global_hash, addr));
-
-        if (hna_global_entry)
-                _hna_global_del_orig(bat_priv, hna_global_entry,
-                                     "local hna received");
-
-        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-}
-
-int hna_local_fill_buffer(struct bat_priv *bat_priv,
-                          unsigned char *buff, int buff_len)
-{
-        struct hna_local_entry *hna_local_entry;
-        HASHIT(hashit);
-        int i = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-        while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
-
-                if (buff_len < (i + 1) * ETH_ALEN)
-                        break;
-
-                hna_local_entry = hashit.bucket->data;
-                memcpy(buff + (i * ETH_ALEN), hna_local_entry->addr, ETH_ALEN);
-
-                i++;
-        }
-
-        /* if we did not get all new local hnas see you next time  ;-) */
-        if (i == bat_priv->num_local_hna)
-                atomic_set(&bat_priv->hna_local_changed, 0);
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-        return i;
-}
-
-int hna_local_seq_print_text(struct seq_file *seq, void *offset)
-{
-        struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hna_local_entry *hna_local_entry;
-        HASHIT(hashit);
-        HASHIT(hashit_count);
-        unsigned long flags;
-        size_t buf_size, pos;
-        char *buff;
-
-        if (!bat_priv->primary_if) {
-                return seq_printf(seq, "BATMAN mesh %s disabled - "
-                               "please specify interfaces to enable it\n",
-                               net_dev->name);
-        }
-
-        seq_printf(seq, "Locally retrieved addresses (from %s) "
-                   "announced via HNA:\n",
-                   net_dev->name);
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-        buf_size = 1;
-        /* Estimate length for: " * xx:xx:xx:xx:xx:xx\n" */
-        while (hash_iterate(bat_priv->hna_local_hash, &hashit_count))
-                buf_size += 21;
-
-        buff = kmalloc(buf_size, GFP_ATOMIC);
-        if (!buff) {
-                spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-                return -ENOMEM;
-        }
-        buff[0] = '\0';
-        pos = 0;
-
-        while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
-                hna_local_entry = hashit.bucket->data;
-
-                pos += snprintf(buff + pos, 22, " * %pM\n",
-                                hna_local_entry->addr);
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-
-        seq_printf(seq, "%s", buff);
-        kfree(buff);
-        return 0;
-}
-
-static void _hna_local_del(void *data, void *arg)
-{
-        struct bat_priv *bat_priv = (struct bat_priv *)arg;
-
-        kfree(data);
-        bat_priv->num_local_hna--;
-        atomic_set(&bat_priv->hna_local_changed, 1);
-}
-
-static void hna_local_del(struct bat_priv *bat_priv,
-                          struct hna_local_entry *hna_local_entry,
-                          char *message)
-{
-        bat_dbg(DBG_ROUTES, bat_priv, "Deleting local hna entry (%pM): %s\n",
-                hna_local_entry->addr, message);
-
-        hash_remove(bat_priv->hna_local_hash, hna_local_entry->addr);
-        _hna_local_del(hna_local_entry, bat_priv);
-}
-
-void hna_local_remove(struct bat_priv *bat_priv,
-                      uint8_t *addr, char *message)
-{
-        struct hna_local_entry *hna_local_entry;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-        hna_local_entry = (struct hna_local_entry *)
-                hash_find(bat_priv->hna_local_hash, addr);
-        if (hna_local_entry)
-                hna_local_del(bat_priv, hna_local_entry, message);
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-}
-
-static void hna_local_purge(struct work_struct *work)
-{
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, hna_work);
-        struct hna_local_entry *hna_local_entry;
-        HASHIT(hashit);
-        unsigned long flags;
-        unsigned long timeout;
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-        while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
-                hna_local_entry = hashit.bucket->data;
-
-                timeout = hna_local_entry->last_seen + LOCAL_HNA_TIMEOUT * HZ;
-
-                if ((!hna_local_entry->never_purge) &&
-                    time_after(jiffies, timeout))
-                        hna_local_del(bat_priv, hna_local_entry,
-                                      "address timed out");
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-        hna_local_start_timer(bat_priv);
-}
-
-void hna_local_free(struct bat_priv *bat_priv)
-{
-        if (!bat_priv->hna_local_hash)
-                return;
-
-        cancel_delayed_work_sync(&bat_priv->hna_work);
-        hash_delete(bat_priv->hna_local_hash, _hna_local_del, bat_priv);
-        bat_priv->hna_local_hash = NULL;
-}
-
-int hna_global_init(struct bat_priv *bat_priv)
-{
-        if (bat_priv->hna_global_hash)
-                return 1;
-
-        bat_priv->hna_global_hash = hash_new(128, compare_orig, choose_orig);
-
-        if (!bat_priv->hna_global_hash)
-                return 0;
-
-        return 1;
-}
-
-void hna_global_add_orig(struct bat_priv *bat_priv,
-                         struct orig_node *orig_node,
-                         unsigned char *hna_buff, int hna_buff_len)
-{
-        struct hna_global_entry *hna_global_entry;
-        struct hna_local_entry *hna_local_entry;
-        struct hashtable_t *swaphash;
-        int hna_buff_count = 0;
-        unsigned long flags;
-        unsigned char *hna_ptr;
-
-        while ((hna_buff_count + 1) * ETH_ALEN <= hna_buff_len) {
-                spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-
-                hna_ptr = hna_buff + (hna_buff_count * ETH_ALEN);
-                hna_global_entry = (struct hna_global_entry *)
-                        hash_find(bat_priv->hna_global_hash, hna_ptr);
-
-                if (!hna_global_entry) {
-                        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock,
-                                               flags);
-
-                        hna_global_entry =
-                                kmalloc(sizeof(struct hna_global_entry),
-                                        GFP_ATOMIC);
-
-                        if (!hna_global_entry)
-                                break;
-
-                        memcpy(hna_global_entry->addr, hna_ptr, ETH_ALEN);
-
-                        bat_dbg(DBG_ROUTES, bat_priv,
-                                "Creating new global hna entry: "
-                                "%pM (via %pM)\n",
-                                hna_global_entry->addr, orig_node->orig);
-
-                        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-                        hash_add(bat_priv->hna_global_hash, hna_global_entry);
-
-                }
-
-                hna_global_entry->orig_node = orig_node;
-                spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-
-                /* remove address from local hash if present */
-                spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-
-                hna_ptr = hna_buff + (hna_buff_count * ETH_ALEN);
-                hna_local_entry = (struct hna_local_entry *)
-                        hash_find(bat_priv->hna_local_hash, hna_ptr);
-
-                if (hna_local_entry)
-                        hna_local_del(bat_priv, hna_local_entry,
-                                      "global hna received");
-
-                spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-
-                hna_buff_count++;
-        }
-
-        /* initialize, and overwrite if malloc succeeds */
-        orig_node->hna_buff = NULL;
-        orig_node->hna_buff_len = 0;
-
-        if (hna_buff_len > 0) {
-                orig_node->hna_buff = kmalloc(hna_buff_len, GFP_ATOMIC);
-                if (orig_node->hna_buff) {
-                        memcpy(orig_node->hna_buff, hna_buff, hna_buff_len);
-                        orig_node->hna_buff_len = hna_buff_len;
-                }
-        }
-
-        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-
-        if (bat_priv->hna_global_hash->elements * 4 >
-                                        bat_priv->hna_global_hash->size) {
-                swaphash = hash_resize(bat_priv->hna_global_hash,
-                                       bat_priv->hna_global_hash->size * 2);
-
-                if (!swaphash)
-                        pr_err("Couldn't resize global hna hash table\n");
-                else
-                        bat_priv->hna_global_hash = swaphash;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-}
-
-int hna_global_seq_print_text(struct seq_file *seq, void *offset)
-{
-        struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hna_global_entry *hna_global_entry;
-        HASHIT(hashit);
-        HASHIT(hashit_count);
-        unsigned long flags;
-        size_t buf_size, pos;
-        char *buff;
-
-        if (!bat_priv->primary_if) {
-                return seq_printf(seq, "BATMAN mesh %s disabled - "
-                                  "please specify interfaces to enable it\n",
-                                  net_dev->name);
-        }
-
-        seq_printf(seq, "Globally announced HNAs received via the mesh %s\n",
-                   net_dev->name);
-
-        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-
-        buf_size = 1;
-        /* Estimate length for: " * xx:xx:xx:xx:xx:xx via xx:xx:xx:xx:xx:xx\n"*/
-        while (hash_iterate(bat_priv->hna_global_hash, &hashit_count))
-                buf_size += 43;
-
-        buff = kmalloc(buf_size, GFP_ATOMIC);
-        if (!buff) {
-                spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-                return -ENOMEM;
-        }
-        buff[0] = '\0';
-        pos = 0;
-
-        while (hash_iterate(bat_priv->hna_global_hash, &hashit)) {
-                hna_global_entry = hashit.bucket->data;
-
-                pos += snprintf(buff + pos, 44,
-                                " * %pM via %pM\n", hna_global_entry->addr,
-                                hna_global_entry->orig_node->orig);
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-
-        seq_printf(seq, "%s", buff);
-        kfree(buff);
-        return 0;
-}
-
-static void _hna_global_del_orig(struct bat_priv *bat_priv,
-                                 struct hna_global_entry *hna_global_entry,
-                                 char *message)
-{
-        bat_dbg(DBG_ROUTES, bat_priv,
-                "Deleting global hna entry %pM (via %pM): %s\n",
-                hna_global_entry->addr, hna_global_entry->orig_node->orig,
-                message);
-
-        hash_remove(bat_priv->hna_global_hash, hna_global_entry->addr);
-        kfree(hna_global_entry);
-}
-
-void hna_global_del_orig(struct bat_priv *bat_priv,
-                         struct orig_node *orig_node, char *message)
-{
-        struct hna_global_entry *hna_global_entry;
-        int hna_buff_count = 0;
-        unsigned long flags;
-        unsigned char *hna_ptr;
-
-        if (orig_node->hna_buff_len == 0)
-                return;
-
-        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-
-        while ((hna_buff_count + 1) * ETH_ALEN <= orig_node->hna_buff_len) {
-                hna_ptr = orig_node->hna_buff + (hna_buff_count * ETH_ALEN);
-                hna_global_entry = (struct hna_global_entry *)
-                        hash_find(bat_priv->hna_global_hash, hna_ptr);
-
-                if ((hna_global_entry) &&
-                    (hna_global_entry->orig_node == orig_node))
-                        _hna_global_del_orig(bat_priv, hna_global_entry,
-                                             message);
-
-                hna_buff_count++;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-
-        orig_node->hna_buff_len = 0;
-        kfree(orig_node->hna_buff);
-        orig_node->hna_buff = NULL;
-}
-
-static void hna_global_del(void *data, void *arg)
-{
-        kfree(data);
-}
-
-void hna_global_free(struct bat_priv *bat_priv)
-{
-        if (!bat_priv->hna_global_hash)
-                return;
-
-        hash_delete(bat_priv->hna_global_hash, hna_global_del, NULL);
-        bat_priv->hna_global_hash = NULL;
-}
-
-struct orig_node *transtable_search(struct bat_priv *bat_priv, uint8_t *addr)
-{
-        struct hna_global_entry *hna_global_entry;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->hna_ghash_lock, flags);
-        hna_global_entry = (struct hna_global_entry *)
-                                hash_find(bat_priv->hna_global_hash, addr);
-        spin_unlock_irqrestore(&bat_priv->hna_ghash_lock, flags);
-
-        if (!hna_global_entry)
-                return NULL;
-
-        return hna_global_entry->orig_node;
-}
diff --git a/drivers/staging/batman-adv/translation-table.h b/drivers/staging/batman-adv/translation-table.h
deleted file mode 100644
index 10c4c5c319b6..000000000000
--- a/drivers/staging/batman-adv/translation-table.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
-#define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
-
-#include "types.h"
-
-int hna_local_init(struct bat_priv *bat_priv);
-void hna_local_add(struct net_device *soft_iface, uint8_t *addr);
-void hna_local_remove(struct bat_priv *bat_priv,
-                      uint8_t *addr, char *message);
-int hna_local_fill_buffer(struct bat_priv *bat_priv,
-                          unsigned char *buff, int buff_len);
-int hna_local_seq_print_text(struct seq_file *seq, void *offset);
-void hna_local_free(struct bat_priv *bat_priv);
-int hna_global_init(struct bat_priv *bat_priv);
-void hna_global_add_orig(struct bat_priv *bat_priv,
-                         struct orig_node *orig_node,
-                         unsigned char *hna_buff, int hna_buff_len);
-int hna_global_seq_print_text(struct seq_file *seq, void *offset);
-void hna_global_del_orig(struct bat_priv *bat_priv,
-                         struct orig_node *orig_node, char *message);
-void hna_global_free(struct bat_priv *bat_priv);
-struct orig_node *transtable_search(struct bat_priv *bat_priv, uint8_t *addr);
-
-#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
deleted file mode 100644
index f3f7366231e7..000000000000
--- a/drivers/staging/batman-adv/types.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-
-#ifndef _NET_BATMAN_ADV_TYPES_H_
-#define _NET_BATMAN_ADV_TYPES_H_
-
-#include "packet.h"
-#include "bitarray.h"
-
-#define BAT_HEADER_LEN (sizeof(struct ethhdr) + \
-        ((sizeof(struct unicast_packet) > sizeof(struct bcast_packet) ? \
-         sizeof(struct unicast_packet) : \
-         sizeof(struct bcast_packet))))
-
-
-struct batman_if {
-        struct list_head list;
-        int16_t if_num;
-        char if_status;
-        struct net_device *net_dev;
-        atomic_t seqno;
-        atomic_t frag_seqno;
-        unsigned char *packet_buff;
-        int packet_len;
-        struct kobject *hardif_obj;
-        atomic_t refcnt;
-        struct packet_type batman_adv_ptype;
-        struct net_device *soft_iface;
-};
-
-/**
- *      orig_node - structure for orig_list maintaining nodes of mesh
- *      @primary_addr: hosts primary interface address
- *      @last_valid: when last packet from this node was received
- *      @bcast_seqno_reset: time when the broadcast seqno window was reset
- *      @batman_seqno_reset: time when the batman seqno window was reset
- *      @flags: for now only VIS_SERVER flag
- *      @last_real_seqno: last and best known squence number
- *      @last_ttl: ttl of last received packet
- *      @last_bcast_seqno: last broadcast sequence number received by this host
- *
- *      @candidates: how many candidates are available
- *      @selected: next bonding candidate
- */
-struct orig_node {
-        uint8_t orig[ETH_ALEN];
-        uint8_t primary_addr[ETH_ALEN];
-        struct neigh_node *router;
-        TYPE_OF_WORD *bcast_own;
-        uint8_t *bcast_own_sum;
-        uint8_t tq_own;
-        int tq_asym_penalty;
-        unsigned long last_valid;
-        unsigned long bcast_seqno_reset;
-        unsigned long batman_seqno_reset;
-        uint8_t  flags;
-        unsigned char *hna_buff;
-        int16_t hna_buff_len;
-        uint32_t last_real_seqno;
-        uint8_t last_ttl;
-        TYPE_OF_WORD bcast_bits[NUM_WORDS];
-        uint32_t last_bcast_seqno;
-        struct list_head neigh_list;
-        struct list_head frag_list;
-        unsigned long last_frag_packet;
-        struct {
-                uint8_t candidates;
-                struct neigh_node *selected;
-        } bond;
-};
-
-/**
- *      neigh_node
- *      @last_valid: when last packet via this neighbor was received
- */
-struct neigh_node {
-        struct list_head list;
-        uint8_t addr[ETH_ALEN];
-        uint8_t real_packet_count;
-        uint8_t tq_recv[TQ_GLOBAL_WINDOW_SIZE];
-        uint8_t tq_index;
-        uint8_t tq_avg;
-        uint8_t last_ttl;
-        struct neigh_node *next_bond_candidate;
-        unsigned long last_valid;
-        TYPE_OF_WORD real_bits[NUM_WORDS];
-        struct orig_node *orig_node;
-        struct batman_if *if_incoming;
-};
-
-
-struct bat_priv {
-        atomic_t mesh_state;
-        struct net_device_stats stats;
-        atomic_t aggregation_enabled;
-        atomic_t bonding_enabled;
-        atomic_t frag_enabled;
-        atomic_t vis_mode;
-        atomic_t orig_interval;
-        atomic_t log_level;
-        atomic_t bcast_seqno;
-        atomic_t bcast_queue_left;
-        atomic_t batman_queue_left;
-        char num_ifaces;
-        struct debug_log *debug_log;
-        struct batman_if *primary_if;
-        struct kobject *mesh_obj;
-        struct dentry *debug_dir;
-        struct hlist_head forw_bat_list;
-        struct hlist_head forw_bcast_list;
-        struct list_head vis_send_list;
-        struct hashtable_t *orig_hash;
-        struct hashtable_t *hna_local_hash;
-        struct hashtable_t *hna_global_hash;
-        struct hashtable_t *vis_hash;
-        spinlock_t orig_hash_lock; /* protects orig_hash */
-        spinlock_t forw_bat_list_lock; /* protects forw_bat_list */
-        spinlock_t forw_bcast_list_lock; /* protects  */
-        spinlock_t hna_lhash_lock; /* protects hna_local_hash */
-        spinlock_t hna_ghash_lock; /* protects hna_global_hash */
-        spinlock_t vis_hash_lock; /* protects vis_hash */
-        spinlock_t vis_list_lock; /* protects vis_info::recv_list */
-        int16_t num_local_hna;
-        atomic_t hna_local_changed;
-        struct delayed_work hna_work;
-        struct delayed_work orig_work;
-        struct delayed_work vis_work;
-        struct vis_info *my_vis_info;
-};
-
-struct socket_client {
-        struct list_head queue_list;
-        unsigned int queue_len;
-        unsigned char index;
-        spinlock_t lock; /* protects queue_list, queue_len, index */
-        wait_queue_head_t queue_wait;
-        struct bat_priv *bat_priv;
-};
-
-struct socket_packet {
-        struct list_head list;
-        size_t icmp_len;
-        struct icmp_packet_rr icmp_packet;
-};
-
-struct hna_local_entry {
-        uint8_t addr[ETH_ALEN];
-        unsigned long last_seen;
-        char never_purge;
-};
-
-struct hna_global_entry {
-        uint8_t addr[ETH_ALEN];
-        struct orig_node *orig_node;
-};
-
-/**
- *      forw_packet - structure for forw_list maintaining packets to be
- *                    send/forwarded
- */
-struct forw_packet {
-        struct hlist_node list;
-        unsigned long send_time;
-        uint8_t own;
-        struct sk_buff *skb;
-        uint16_t packet_len;
-        uint32_t direct_link_flags;
-        uint8_t num_packets;
-        struct delayed_work delayed_work;
-        struct batman_if *if_incoming;
-};
-
-/* While scanning for vis-entries of a particular vis-originator
- * this list collects its interfaces to create a subgraph/cluster
- * out of them later
- */
-struct if_list_entry {
-        uint8_t addr[ETH_ALEN];
-        bool primary;
-        struct hlist_node list;
-};
-
-struct debug_log {
-        char log_buff[LOG_BUF_LEN];
-        unsigned long log_start;
-        unsigned long log_end;
-        spinlock_t lock; /* protects log_buff, log_start and log_end */
-        wait_queue_head_t queue_wait;
-};
-
-struct frag_packet_list_entry {
-        struct list_head list;
-        uint16_t seqno;
-        struct sk_buff *skb;
-};
-
-struct vis_info {
-        unsigned long       first_seen;
-        struct list_head    recv_list;
-                            /* list of server-neighbors we received a vis-packet
-                             * from.  we should not reply to them. */
-        struct list_head send_list;
-        struct kref refcount;
-        struct bat_priv *bat_priv;
-        /* this packet might be part of the vis send queue. */
-        struct sk_buff *skb_packet;
-        /* vis_info may follow here*/
-} __attribute__((packed));
-
-struct vis_info_entry {
-        uint8_t  src[ETH_ALEN];
-        uint8_t  dest[ETH_ALEN];
-        uint8_t  quality;       /* quality = 0 means HNA */
-} __attribute__((packed));
-
-struct recvlist_node {
-        struct list_head list;
-        uint8_t mac[ETH_ALEN];
-};
-
-#endif /* _NET_BATMAN_ADV_TYPES_H_ */
diff --git a/drivers/staging/batman-adv/unicast.c b/drivers/staging/batman-adv/unicast.c
deleted file mode 100644
index 0459413ff67f..000000000000
--- a/drivers/staging/batman-adv/unicast.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Andreas Langer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "unicast.h"
-#include "send.h"
-#include "soft-interface.h"
-#include "hash.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "hard-interface.h"
-
-
-struct sk_buff *merge_frag_packet(struct list_head *head,
-                                  struct frag_packet_list_entry *tfp,
-                                  struct sk_buff *skb)
-{
-        struct unicast_frag_packet *up =
-                (struct unicast_frag_packet *)skb->data;
-        struct sk_buff *tmp_skb;
-
-        /* set skb to the first part and tmp_skb to the second part */
-        if (up->flags & UNI_FRAG_HEAD) {
-                tmp_skb = tfp->skb;
-        } else {
-                tmp_skb = skb;
-                skb = tfp->skb;
-        }
-
-        skb_pull(tmp_skb, sizeof(struct unicast_frag_packet));
-        if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) {
-                /* free buffered skb, skb will be freed later */
-                kfree_skb(tfp->skb);
-                return NULL;
-        }
-
-        /* move free entry to end */
-        tfp->skb = NULL;
-        tfp->seqno = 0;
-        list_move_tail(&tfp->list, head);
-
-        memcpy(skb_put(skb, tmp_skb->len), tmp_skb->data, tmp_skb->len);
-        kfree_skb(tmp_skb);
-        return skb;
-}
-
-void create_frag_entry(struct list_head *head, struct sk_buff *skb)
-{
-        struct frag_packet_list_entry *tfp;
-        struct unicast_frag_packet *up =
-                (struct unicast_frag_packet *)skb->data;
-
-        /* free and oldest packets stand at the end */
-        tfp = list_entry((head)->prev, typeof(*tfp), list);
-        kfree_skb(tfp->skb);
-
-        tfp->seqno = ntohs(up->seqno);
-        tfp->skb = skb;
-        list_move(&tfp->list, head);
-        return;
-}
-
-int create_frag_buffer(struct list_head *head)
-{
-        int i;
-        struct frag_packet_list_entry *tfp;
-
-        for (i = 0; i < FRAG_BUFFER_SIZE; i++) {
-                tfp = kmalloc(sizeof(struct frag_packet_list_entry),
-                        GFP_ATOMIC);
-                if (!tfp) {
-                        frag_list_free(head);
-                        return -ENOMEM;
-                }
-                tfp->skb = NULL;
-                tfp->seqno = 0;
-                INIT_LIST_HEAD(&tfp->list);
-                list_add(&tfp->list, head);
-        }
-
-        return 0;
-}
-
-struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
-                                                 struct unicast_frag_packet *up)
-{
-        struct frag_packet_list_entry *tfp;
-        struct unicast_frag_packet *tmp_up = NULL;
-        uint16_t search_seqno;
-
-        if (up->flags & UNI_FRAG_HEAD)
-                search_seqno = ntohs(up->seqno)+1;
-        else
-                search_seqno = ntohs(up->seqno)-1;
-
-        list_for_each_entry(tfp, head, list) {
-
-                if (!tfp->skb)
-                        continue;
-
-                if (tfp->seqno == ntohs(up->seqno))
-                        goto mov_tail;
-
-                tmp_up = (struct unicast_frag_packet *)tfp->skb->data;
-
-                if (tfp->seqno == search_seqno) {
-
-                        if ((tmp_up->flags & UNI_FRAG_HEAD) !=
-                            (up->flags & UNI_FRAG_HEAD))
-                                return tfp;
-                        else
-                                goto mov_tail;
-                }
-        }
-        return NULL;
-
-mov_tail:
-        list_move_tail(&tfp->list, head);
-        return NULL;
-}
-
-void frag_list_free(struct list_head *head)
-{
-        struct frag_packet_list_entry *pf, *tmp_pf;
-
-        if (!list_empty(head)) {
-
-                list_for_each_entry_safe(pf, tmp_pf, head, list) {
-                        kfree_skb(pf->skb);
-                        list_del(&pf->list);
-                        kfree(pf);
-                }
-        }
-        return;
-}
-
-static int unicast_send_frag_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                          struct batman_if *batman_if, uint8_t dstaddr[],
-                          struct orig_node *orig_node)
-{
-        struct unicast_frag_packet *ucast_frag1, *ucast_frag2;
-        int hdr_len = sizeof(struct unicast_frag_packet);
-        struct sk_buff *frag_skb;
-        int data_len = skb->len;
-
-        if (!bat_priv->primary_if)
-                goto dropped;
-
-        frag_skb = dev_alloc_skb(data_len - (data_len / 2) + hdr_len);
-        skb_split(skb, frag_skb, data_len / 2);
-
-        if (my_skb_head_push(frag_skb, hdr_len) < 0 ||
-            my_skb_head_push(skb, hdr_len) < 0)
-                goto drop_frag;
-
-        ucast_frag1 = (struct unicast_frag_packet *)skb->data;
-        ucast_frag2 = (struct unicast_frag_packet *)frag_skb->data;
-
-        ucast_frag1->version = COMPAT_VERSION;
-        ucast_frag1->packet_type = BAT_UNICAST_FRAG;
-        ucast_frag1->ttl = TTL;
-        memcpy(ucast_frag1->orig,
-               bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-        memcpy(ucast_frag1->dest, orig_node->orig, ETH_ALEN);
-
-        memcpy(ucast_frag2, ucast_frag1, sizeof(struct unicast_frag_packet));
-
-        ucast_frag1->flags |= UNI_FRAG_HEAD;
-        ucast_frag2->flags &= ~UNI_FRAG_HEAD;
-
-        ucast_frag1->seqno = htons((uint16_t)atomic_inc_return(
-                                                &batman_if->frag_seqno));
-
-        ucast_frag2->seqno = htons((uint16_t)atomic_inc_return(
-                                                &batman_if->frag_seqno));
-
-        send_skb_packet(skb, batman_if, dstaddr);
-        send_skb_packet(frag_skb, batman_if, dstaddr);
-        return 0;
-
-drop_frag:
-        kfree_skb(frag_skb);
-dropped:
-        kfree_skb(skb);
-        return 1;
-}
-
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
-{
-        struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
-        struct unicast_packet *unicast_packet;
-        struct orig_node *orig_node;
-        struct batman_if *batman_if;
-        struct neigh_node *router;
-        int data_len = skb->len;
-        uint8_t dstaddr[6];
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        /* get routing information */
-        orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
-                                                   ethhdr->h_dest));
-
-        /* check for hna host */
-        if (!orig_node)
-                orig_node = transtable_search(bat_priv, ethhdr->h_dest);
-
-        router = find_router(bat_priv, orig_node, NULL);
-
-        if (!router)
-                goto unlock;
-
-        /* don't lock while sending the packets ... we therefore
-                * copy the required data before sending */
-
-        batman_if = router->if_incoming;
-        memcpy(dstaddr, router->addr, ETH_ALEN);
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        if (batman_if->if_status != IF_ACTIVE)
-                goto dropped;
-
-        if (atomic_read(&bat_priv->frag_enabled) &&
-            data_len + sizeof(struct unicast_packet) > batman_if->net_dev->mtu)
-                return unicast_send_frag_skb(skb, bat_priv, batman_if,
-                                             dstaddr, orig_node);
-
-        if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0)
-                goto dropped;
-
-        unicast_packet = (struct unicast_packet *)skb->data;
-
-        unicast_packet->version = COMPAT_VERSION;
-        /* batman packet type: unicast */
-        unicast_packet->packet_type = BAT_UNICAST;
-        /* set unicast ttl */
-        unicast_packet->ttl = TTL;
-        /* copy the destination for faster routing */
-        memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
-
-        send_skb_packet(skb, batman_if, dstaddr);
-        return 0;
-
-unlock:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-dropped:
-        kfree_skb(skb);
-        return 1;
-}
diff --git a/drivers/staging/batman-adv/unicast.h b/drivers/staging/batman-adv/unicast.h
deleted file mode 100644
index 797369771900..000000000000
--- a/drivers/staging/batman-adv/unicast.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Andreas Langer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_UNICAST_H_
-#define _NET_BATMAN_ADV_UNICAST_H_
-
-#define FRAG_TIMEOUT 10000      /* purge frag list entrys after time in ms */
-#define FRAG_BUFFER_SIZE 6      /* number of list elements in buffer */
-
-struct sk_buff *merge_frag_packet(struct list_head *head,
-        struct frag_packet_list_entry *tfp,
-        struct sk_buff *skb);
-
-void create_frag_entry(struct list_head *head, struct sk_buff *skb);
-int create_frag_buffer(struct list_head *head);
-struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
-        struct unicast_frag_packet *up);
-void frag_list_free(struct list_head *head);
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
-
-#endif /* _NET_BATMAN_ADV_UNICAST_H_ */
diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c
deleted file mode 100644
index 3d2c1bccf2e6..000000000000
--- a/drivers/staging/batman-adv/vis.c
+++ /dev/null
@@ -1,895 +0,0 @@
-/*
- * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "send.h"
-#include "translation-table.h"
-#include "vis.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "hash.h"
-
-#define MAX_VIS_PACKET_SIZE 1000
-
-/* Returns the smallest signed integer in two's complement with the sizeof x */
-#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
-
-/* Checks if a sequence number x is a predecessor/successor of y.
- * they handle overflows/underflows and can correctly check for a
- * predecessor/successor unless the variable sequence number has grown by
- * more then 2**(bitwidth(x)-1)-1.
- * This means that for a uint8_t with the maximum value 255, it would think:
- *  - when adding nothing - it is neither a predecessor nor a successor
- *  - before adding more than 127 to the starting value - it is a predecessor,
- *  - when adding 128 - it is neither a predecessor nor a successor,
- *  - after adding more than 127 to the starting value - it is a successor */
-#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \
-                        _dummy > smallest_signed_int(_dummy); })
-#define seq_after(x, y) seq_before(y, x)
-
-static void start_vis_timer(struct bat_priv *bat_priv);
-
-/* free the info */
-static void free_info(struct kref *ref)
-{
-        struct vis_info *info = container_of(ref, struct vis_info, refcount);
-        struct bat_priv *bat_priv = info->bat_priv;
-        struct recvlist_node *entry, *tmp;
-        unsigned long flags;
-
-        list_del_init(&info->send_list);
-        spin_lock_irqsave(&bat_priv->vis_list_lock, flags);
-        list_for_each_entry_safe(entry, tmp, &info->recv_list, list) {
-                list_del(&entry->list);
-                kfree(entry);
-        }
-
-        spin_unlock_irqrestore(&bat_priv->vis_list_lock, flags);
-        kfree_skb(info->skb_packet);
-}
-
-/* Compare two vis packets, used by the hashing algorithm */
-static int vis_info_cmp(void *data1, void *data2)
-{
-        struct vis_info *d1, *d2;
-        struct vis_packet *p1, *p2;
-        d1 = data1;
-        d2 = data2;
-        p1 = (struct vis_packet *)d1->skb_packet->data;
-        p2 = (struct vis_packet *)d2->skb_packet->data;
-        return compare_orig(p1->vis_orig, p2->vis_orig);
-}
-
-/* hash function to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-static int vis_info_choose(void *data, int size)
-{
-        struct vis_info *vis_info = data;
-        struct vis_packet *packet;
-        unsigned char *key;
-        uint32_t hash = 0;
-        size_t i;
-
-        packet = (struct vis_packet *)vis_info->skb_packet->data;
-        key = packet->vis_orig;
-        for (i = 0; i < ETH_ALEN; i++) {
-                hash += key[i];
-                hash += (hash << 10);
-                hash ^= (hash >> 6);
-        }
-
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-
-        return hash % size;
-}
-
-/* insert interface to the list of interfaces of one originator, if it
- * does not already exist in the list */
-static void vis_data_insert_interface(const uint8_t *interface,
-                                      struct hlist_head *if_list,
-                                      bool primary)
-{
-        struct if_list_entry *entry;
-        struct hlist_node *pos;
-
-        hlist_for_each_entry(entry, pos, if_list, list) {
-                if (compare_orig(entry->addr, (void *)interface))
-                        return;
-        }
-
-        /* its a new address, add it to the list */
-        entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
-        if (!entry)
-                return;
-        memcpy(entry->addr, interface, ETH_ALEN);
-        entry->primary = primary;
-        hlist_add_head(&entry->list, if_list);
-}
-
-static ssize_t vis_data_read_prim_sec(char *buff, struct hlist_head *if_list)
-{
-        struct if_list_entry *entry;
-        struct hlist_node *pos;
-        size_t len = 0;
-
-        hlist_for_each_entry(entry, pos, if_list, list) {
-                if (entry->primary)
-                        len += sprintf(buff + len, "PRIMARY, ");
-                else {
-                        len += sprintf(buff + len,  "SEC %pM, ", entry->addr);
-                }
-        }
-
-        return len;
-}
-
-static size_t vis_data_count_prim_sec(struct hlist_head *if_list)
-{
-        struct if_list_entry *entry;
-        struct hlist_node *pos;
-        size_t count = 0;
-
-        hlist_for_each_entry(entry, pos, if_list, list) {
-                if (entry->primary)
-                        count += 9;
-                else
-                        count += 23;
-        }
-
-        return count;
-}
-
-/* read an entry  */
-static ssize_t vis_data_read_entry(char *buff, struct vis_info_entry *entry,
-                                   uint8_t *src, bool primary)
-{
-        /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */
-        if (primary && entry->quality == 0)
-                return sprintf(buff, "HNA %pM, ", entry->dest);
-        else if (compare_orig(entry->src, src))
-                return sprintf(buff, "TQ %pM %d, ", entry->dest,
-                               entry->quality);
-
-        return 0;
-}
-
-int vis_seq_print_text(struct seq_file *seq, void *offset)
-{
-        HASHIT(hashit);
-        HASHIT(hashit_count);
-        struct vis_info *info;
-        struct vis_packet *packet;
-        struct vis_info_entry *entries;
-        struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        HLIST_HEAD(vis_if_list);
-        struct if_list_entry *entry;
-        struct hlist_node *pos, *n;
-        int i;
-        unsigned long flags;
-        int vis_server = atomic_read(&bat_priv->vis_mode);
-        size_t buff_pos, buf_size;
-        char *buff;
-
-        if ((!bat_priv->primary_if) ||
-            (vis_server == VIS_TYPE_CLIENT_UPDATE))
-                return 0;
-
-        buf_size = 1;
-        /* Estimate length */
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-        while (hash_iterate(bat_priv->vis_hash, &hashit_count)) {
-                info = hashit_count.bucket->data;
-                packet = (struct vis_packet *)info->skb_packet->data;
-                entries = (struct vis_info_entry *)
-                          ((char *)packet + sizeof(struct vis_packet));
-
-                for (i = 0; i < packet->entries; i++) {
-                        if (entries[i].quality == 0)
-                                continue;
-                        vis_data_insert_interface(entries[i].src, &vis_if_list,
-                                compare_orig(entries[i].src, packet->vis_orig));
-                }
-
-                hlist_for_each_entry(entry, pos, &vis_if_list, list) {
-                        buf_size += 18 + 26 * packet->entries;
-
-                        /* add primary/secondary records */
-                        if (compare_orig(entry->addr, packet->vis_orig))
-                                buf_size +=
-                                        vis_data_count_prim_sec(&vis_if_list);
-
-                        buf_size += 1;
-                }
-
-                hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) {
-                        hlist_del(&entry->list);
-                        kfree(entry);
-                }
-        }
-
-        buff = kmalloc(buf_size, GFP_ATOMIC);
-        if (!buff) {
-                spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-                return -ENOMEM;
-        }
-        buff[0] = '\0';
-        buff_pos = 0;
-
-        while (hash_iterate(bat_priv->vis_hash, &hashit)) {
-                info = hashit.bucket->data;
-                packet = (struct vis_packet *)info->skb_packet->data;
-                entries = (struct vis_info_entry *)
-                          ((char *)packet + sizeof(struct vis_packet));
-
-                for (i = 0; i < packet->entries; i++) {
-                        if (entries[i].quality == 0)
-                                continue;
-                        vis_data_insert_interface(entries[i].src, &vis_if_list,
-                                compare_orig(entries[i].src, packet->vis_orig));
-                }
-
-                hlist_for_each_entry(entry, pos, &vis_if_list, list) {
-                        buff_pos += sprintf(buff + buff_pos, "%pM,",
-                                            entry->addr);
-
-                        for (i = 0; i < packet->entries; i++)
-                                buff_pos += vis_data_read_entry(buff + buff_pos,
-                                                                &entries[i],
-                                                                entry->addr,
-                                                                entry->primary);
-
-                        /* add primary/secondary records */
-                        if (compare_orig(entry->addr, packet->vis_orig))
-                                buff_pos +=
-                                        vis_data_read_prim_sec(buff + buff_pos,
-                                                               &vis_if_list);
-
-                        buff_pos += sprintf(buff + buff_pos, "\n");
-                }
-
-                hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) {
-                        hlist_del(&entry->list);
-                        kfree(entry);
-                }
-        }
-
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-
-        seq_printf(seq, "%s", buff);
-        kfree(buff);
-
-        return 0;
-}
-
-/* add the info packet to the send list, if it was not
- * already linked in. */
-static void send_list_add(struct bat_priv *bat_priv, struct vis_info *info)
-{
-        if (list_empty(&info->send_list)) {
-                kref_get(&info->refcount);
-                list_add_tail(&info->send_list, &bat_priv->vis_send_list);
-        }
-}
-
-/* delete the info packet from the send list, if it was
- * linked in. */
-static void send_list_del(struct vis_info *info)
-{
-        if (!list_empty(&info->send_list)) {
-                list_del_init(&info->send_list);
-                kref_put(&info->refcount, free_info);
-        }
-}
-
-/* tries to add one entry to the receive list. */
-static void recv_list_add(struct bat_priv *bat_priv,
-                          struct list_head *recv_list, char *mac)
-{
-        struct recvlist_node *entry;
-        unsigned long flags;
-
-        entry = kmalloc(sizeof(struct recvlist_node), GFP_ATOMIC);
-        if (!entry)
-                return;
-
-        memcpy(entry->mac, mac, ETH_ALEN);
-        spin_lock_irqsave(&bat_priv->vis_list_lock, flags);
-        list_add_tail(&entry->list, recv_list);
-        spin_unlock_irqrestore(&bat_priv->vis_list_lock, flags);
-}
-
-/* returns 1 if this mac is in the recv_list */
-static int recv_list_is_in(struct bat_priv *bat_priv,
-                           struct list_head *recv_list, char *mac)
-{
-        struct recvlist_node *entry;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->vis_list_lock, flags);
-        list_for_each_entry(entry, recv_list, list) {
-                if (memcmp(entry->mac, mac, ETH_ALEN) == 0) {
-                        spin_unlock_irqrestore(&bat_priv->vis_list_lock,
-                                               flags);
-                        return 1;
-                }
-        }
-        spin_unlock_irqrestore(&bat_priv->vis_list_lock, flags);
-        return 0;
-}
-
-/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old,
- * broken.. ).  vis hash must be locked outside.  is_new is set when the packet
- * is newer than old entries in the hash. */
-static struct vis_info *add_packet(struct bat_priv *bat_priv,
-                                   struct vis_packet *vis_packet,
-                                   int vis_info_len, int *is_new,
-                                   int make_broadcast)
-{
-        struct vis_info *info, *old_info;
-        struct vis_packet *search_packet, *old_packet;
-        struct vis_info search_elem;
-        struct vis_packet *packet;
-
-        *is_new = 0;
-        /* sanity check */
-        if (!bat_priv->vis_hash)
-                return NULL;
-
-        /* see if the packet is already in vis_hash */
-        search_elem.skb_packet = dev_alloc_skb(sizeof(struct vis_packet));
-        if (!search_elem.skb_packet)
-                return NULL;
-        search_packet = (struct vis_packet *)skb_put(search_elem.skb_packet,
-                                                     sizeof(struct vis_packet));
-
-        memcpy(search_packet->vis_orig, vis_packet->vis_orig, ETH_ALEN);
-        old_info = hash_find(bat_priv->vis_hash, &search_elem);
-        kfree_skb(search_elem.skb_packet);
-
-        if (old_info != NULL) {
-                old_packet = (struct vis_packet *)old_info->skb_packet->data;
-                if (!seq_after(ntohl(vis_packet->seqno),
-                               ntohl(old_packet->seqno))) {
-                        if (old_packet->seqno == vis_packet->seqno) {
-                                recv_list_add(bat_priv, &old_info->recv_list,
-                                              vis_packet->sender_orig);
-                                return old_info;
-                        } else {
-                                /* newer packet is already in hash. */
-                                return NULL;
-                        }
-                }
-                /* remove old entry */
-                hash_remove(bat_priv->vis_hash, old_info);
-                send_list_del(old_info);
-                kref_put(&old_info->refcount, free_info);
-        }
-
-        info = kmalloc(sizeof(struct vis_info), GFP_ATOMIC);
-        if (!info)
-                return NULL;
-
-        info->skb_packet = dev_alloc_skb(sizeof(struct vis_packet) +
-                                         vis_info_len + sizeof(struct ethhdr));
-        if (!info->skb_packet) {
-                kfree(info);
-                return NULL;
-        }
-        skb_reserve(info->skb_packet, sizeof(struct ethhdr));
-        packet = (struct vis_packet *)skb_put(info->skb_packet,
-                                              sizeof(struct vis_packet) +
-                                              vis_info_len);
-
-        kref_init(&info->refcount);
-        INIT_LIST_HEAD(&info->send_list);
-        INIT_LIST_HEAD(&info->recv_list);
-        info->first_seen = jiffies;
-        info->bat_priv = bat_priv;
-        memcpy(packet, vis_packet, sizeof(struct vis_packet) + vis_info_len);
-
-        /* initialize and add new packet. */
-        *is_new = 1;
-
-        /* Make it a broadcast packet, if required */
-        if (make_broadcast)
-                memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
-
-        /* repair if entries is longer than packet. */
-        if (packet->entries * sizeof(struct vis_info_entry) > vis_info_len)
-                packet->entries = vis_info_len / sizeof(struct vis_info_entry);
-
-        recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
-
-        /* try to add it */
-        if (hash_add(bat_priv->vis_hash, info) < 0) {
-                /* did not work (for some reason) */
-                kref_put(&old_info->refcount, free_info);
-                info = NULL;
-        }
-
-        return info;
-}
-
-/* handle the server sync packet, forward if needed. */
-void receive_server_sync_packet(struct bat_priv *bat_priv,
-                                struct vis_packet *vis_packet,
-                                int vis_info_len)
-{
-        struct vis_info *info;
-        int is_new, make_broadcast;
-        unsigned long flags;
-        int vis_server = atomic_read(&bat_priv->vis_mode);
-
-        make_broadcast = (vis_server == VIS_TYPE_SERVER_SYNC);
-
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-        info = add_packet(bat_priv, vis_packet, vis_info_len,
-                          &is_new, make_broadcast);
-        if (!info)
-                goto end;
-
-        /* only if we are server ourselves and packet is newer than the one in
-         * hash.*/
-        if (vis_server == VIS_TYPE_SERVER_SYNC && is_new)
-                send_list_add(bat_priv, info);
-end:
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-}
-
-/* handle an incoming client update packet and schedule forward if needed. */
-void receive_client_update_packet(struct bat_priv *bat_priv,
-                                  struct vis_packet *vis_packet,
-                                  int vis_info_len)
-{
-        struct vis_info *info;
-        struct vis_packet *packet;
-        int is_new;
-        unsigned long flags;
-        int vis_server = atomic_read(&bat_priv->vis_mode);
-        int are_target = 0;
-
-        /* clients shall not broadcast. */
-        if (is_bcast(vis_packet->target_orig))
-                return;
-
-        /* Are we the target for this VIS packet? */
-        if (vis_server == VIS_TYPE_SERVER_SYNC  &&
-            is_my_mac(vis_packet->target_orig))
-                are_target = 1;
-
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-        info = add_packet(bat_priv, vis_packet, vis_info_len,
-                          &is_new, are_target);
-
-        if (!info)
-                goto end;
-        /* note that outdated packets will be dropped at this point. */
-
-        packet = (struct vis_packet *)info->skb_packet->data;
-
-        /* send only if we're the target server or ... */
-        if (are_target && is_new) {
-                packet->vis_type = VIS_TYPE_SERVER_SYNC;        /* upgrade! */
-                send_list_add(bat_priv, info);
-
-                /* ... we're not the recipient (and thus need to forward). */
-        } else if (!is_my_mac(packet->target_orig)) {
-                send_list_add(bat_priv, info);
-        }
-
-end:
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-}
-
-/* Walk the originators and find the VIS server with the best tq. Set the packet
- * address to its address and return the best_tq.
- *
- * Must be called with the originator hash locked */
-static int find_best_vis_server(struct bat_priv *bat_priv,
-                                struct vis_info *info)
-{
-        HASHIT(hashit);
-        struct orig_node *orig_node;
-        struct vis_packet *packet;
-        int best_tq = -1;
-
-        packet = (struct vis_packet *)info->skb_packet->data;
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-                if ((orig_node) && (orig_node->router) &&
-                    (orig_node->flags & VIS_SERVER) &&
-                    (orig_node->router->tq_avg > best_tq)) {
-                        best_tq = orig_node->router->tq_avg;
-                        memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
-                }
-        }
-        return best_tq;
-}
-
-/* Return true if the vis packet is full. */
-static bool vis_packet_full(struct vis_info *info)
-{
-        struct vis_packet *packet;
-        packet = (struct vis_packet *)info->skb_packet->data;
-
-        if (MAX_VIS_PACKET_SIZE / sizeof(struct vis_info_entry)
-                < packet->entries + 1)
-                return true;
-        return false;
-}
-
-/* generates a packet of own vis data,
- * returns 0 on success, -1 if no packet could be generated */
-static int generate_vis_packet(struct bat_priv *bat_priv)
-{
-        HASHIT(hashit_local);
-        HASHIT(hashit_global);
-        struct orig_node *orig_node;
-        struct vis_info *info = (struct vis_info *)bat_priv->my_vis_info;
-        struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data;
-        struct vis_info_entry *entry;
-        struct hna_local_entry *hna_local_entry;
-        int best_tq = -1;
-        unsigned long flags;
-
-        info->first_seen = jiffies;
-        packet->vis_type = atomic_read(&bat_priv->vis_mode);
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
-        packet->ttl = TTL;
-        packet->seqno = htonl(ntohl(packet->seqno) + 1);
-        packet->entries = 0;
-        skb_trim(info->skb_packet, sizeof(struct vis_packet));
-
-        if (packet->vis_type == VIS_TYPE_CLIENT_UPDATE) {
-                best_tq = find_best_vis_server(bat_priv, info);
-
-                if (best_tq < 0) {
-                        spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
-                                               flags);
-                        return -1;
-                }
-        }
-
-        while (hash_iterate(bat_priv->orig_hash, &hashit_global)) {
-                orig_node = hashit_global.bucket->data;
-
-                if (!orig_node->router)
-                        continue;
-
-                if (!compare_orig(orig_node->router->addr, orig_node->orig))
-                        continue;
-
-                if (orig_node->router->if_incoming->if_status != IF_ACTIVE)
-                        continue;
-
-                if (orig_node->router->tq_avg < 1)
-                        continue;
-
-                /* fill one entry into buffer. */
-                entry = (struct vis_info_entry *)
-                                skb_put(info->skb_packet, sizeof(*entry));
-                memcpy(entry->src,
-                       orig_node->router->if_incoming->net_dev->dev_addr,
-                       ETH_ALEN);
-                memcpy(entry->dest, orig_node->orig, ETH_ALEN);
-                entry->quality = orig_node->router->tq_avg;
-                packet->entries++;
-
-                if (vis_packet_full(info)) {
-                        spin_unlock_irqrestore(
-                                        &bat_priv->orig_hash_lock, flags);
-                        return 0;
-                }
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags);
-        while (hash_iterate(bat_priv->hna_local_hash, &hashit_local)) {
-                hna_local_entry = hashit_local.bucket->data;
-                entry = (struct vis_info_entry *)skb_put(info->skb_packet,
-                                                         sizeof(*entry));
-                memset(entry->src, 0, ETH_ALEN);
-                memcpy(entry->dest, hna_local_entry->addr, ETH_ALEN);
-                entry->quality = 0; /* 0 means HNA */
-                packet->entries++;
-
-                if (vis_packet_full(info)) {
-                        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock,
-                                               flags);
-                        return 0;
-                }
-        }
-
-        spin_unlock_irqrestore(&bat_priv->hna_lhash_lock, flags);
-        return 0;
-}
-
-/* free old vis packets. Must be called with this vis_hash_lock
- * held */
-static void purge_vis_packets(struct bat_priv *bat_priv)
-{
-        HASHIT(hashit);
-        struct vis_info *info;
-
-        while (hash_iterate(bat_priv->vis_hash, &hashit)) {
-                info = hashit.bucket->data;
-
-                /* never purge own data. */
-                if (info == bat_priv->my_vis_info)
-                        continue;
-
-                if (time_after(jiffies,
-                               info->first_seen + VIS_TIMEOUT * HZ)) {
-                        hash_remove_bucket(bat_priv->vis_hash, &hashit);
-                        send_list_del(info);
-                        kref_put(&info->refcount, free_info);
-                }
-        }
-}
-
-static void broadcast_vis_packet(struct bat_priv *bat_priv,
-                                 struct vis_info *info)
-{
-        HASHIT(hashit);
-        struct orig_node *orig_node;
-        struct vis_packet *packet;
-        struct sk_buff *skb;
-        unsigned long flags;
-        struct batman_if *batman_if;
-        uint8_t dstaddr[ETH_ALEN];
-
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        packet = (struct vis_packet *)info->skb_packet->data;
-
-        /* send to all routers in range. */
-        while (hash_iterate(bat_priv->orig_hash, &hashit)) {
-                orig_node = hashit.bucket->data;
-
-                /* if it's a vis server and reachable, send it. */
-                if ((!orig_node) || (!orig_node->router))
-                        continue;
-                if (!(orig_node->flags & VIS_SERVER))
-                        continue;
-                /* don't send it if we already received the packet from
-                 * this node. */
-                if (recv_list_is_in(bat_priv, &info->recv_list,
-                                                        orig_node->orig))
-                        continue;
-
-                memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
-                batman_if = orig_node->router->if_incoming;
-                memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-                spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-                skb = skb_clone(info->skb_packet, GFP_ATOMIC);
-                if (skb)
-                        send_skb_packet(skb, batman_if, dstaddr);
-
-                spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-
-        }
-
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-}
-
-static void unicast_vis_packet(struct bat_priv *bat_priv,
-                               struct vis_info *info)
-{
-        struct orig_node *orig_node;
-        struct sk_buff *skb;
-        struct vis_packet *packet;
-        unsigned long flags;
-        struct batman_if *batman_if;
-        uint8_t dstaddr[ETH_ALEN];
-
-        spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
-        packet = (struct vis_packet *)info->skb_packet->data;
-        orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
-                                                   packet->target_orig));
-
-        if ((!orig_node) || (!orig_node->router))
-                goto out;
-
-        /* don't lock while sending the packets ... we therefore
-         * copy the required data before sending */
-        batman_if = orig_node->router->if_incoming;
-        memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-
-        skb = skb_clone(info->skb_packet, GFP_ATOMIC);
-        if (skb)
-                send_skb_packet(skb, batman_if, dstaddr);
-
-        return;
-
-out:
-        spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
-}
-
-/* only send one vis packet. called from send_vis_packets() */
-static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info)
-{
-        struct vis_packet *packet;
-
-        packet = (struct vis_packet *)info->skb_packet->data;
-        if (packet->ttl < 2) {
-                pr_debug("Error - can't send vis packet: ttl exceeded\n");
-                return;
-        }
-
-        memcpy(packet->sender_orig, bat_priv->primary_if->net_dev->dev_addr,
-               ETH_ALEN);
-        packet->ttl--;
-
-        if (is_bcast(packet->target_orig))
-                broadcast_vis_packet(bat_priv, info);
-        else
-                unicast_vis_packet(bat_priv, info);
-        packet->ttl++; /* restore TTL */
-}
-
-/* called from timer; send (and maybe generate) vis packet. */
-static void send_vis_packets(struct work_struct *work)
-{
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, vis_work);
-        struct vis_info *info, *temp;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-        purge_vis_packets(bat_priv);
-
-        if (generate_vis_packet(bat_priv) == 0) {
-                /* schedule if generation was successful */
-                send_list_add(bat_priv, bat_priv->my_vis_info);
-        }
-
-        list_for_each_entry_safe(info, temp, &bat_priv->vis_send_list,
-                                 send_list) {
-
-                kref_get(&info->refcount);
-                spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-
-                if (bat_priv->primary_if)
-                        send_vis_packet(bat_priv, info);
-
-                spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-                send_list_del(info);
-                kref_put(&info->refcount, free_info);
-        }
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-        start_vis_timer(bat_priv);
-}
-
-/* init the vis server. this may only be called when if_list is already
- * initialized (e.g. bat0 is initialized, interfaces have been added) */
-int vis_init(struct bat_priv *bat_priv)
-{
-        struct vis_packet *packet;
-        unsigned long flags;
-
-        if (bat_priv->vis_hash)
-                return 1;
-
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-
-        bat_priv->vis_hash = hash_new(256, vis_info_cmp, vis_info_choose);
-        if (!bat_priv->vis_hash) {
-                pr_err("Can't initialize vis_hash\n");
-                goto err;
-        }
-
-        bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
-        if (!bat_priv->my_vis_info) {
-                pr_err("Can't initialize vis packet\n");
-                goto err;
-        }
-
-        bat_priv->my_vis_info->skb_packet = dev_alloc_skb(
-                                                sizeof(struct vis_packet) +
-                                                MAX_VIS_PACKET_SIZE +
-                                                sizeof(struct ethhdr));
-        if (!bat_priv->my_vis_info->skb_packet)
-                goto free_info;
-
-        skb_reserve(bat_priv->my_vis_info->skb_packet, sizeof(struct ethhdr));
-        packet = (struct vis_packet *)skb_put(
-                                        bat_priv->my_vis_info->skb_packet,
-                                        sizeof(struct vis_packet));
-
-        /* prefill the vis info */
-        bat_priv->my_vis_info->first_seen = jiffies -
-                                                msecs_to_jiffies(VIS_INTERVAL);
-        INIT_LIST_HEAD(&bat_priv->my_vis_info->recv_list);
-        INIT_LIST_HEAD(&bat_priv->my_vis_info->send_list);
-        kref_init(&bat_priv->my_vis_info->refcount);
-        bat_priv->my_vis_info->bat_priv = bat_priv;
-        packet->version = COMPAT_VERSION;
-        packet->packet_type = BAT_VIS;
-        packet->ttl = TTL;
-        packet->seqno = 0;
-        packet->entries = 0;
-
-        INIT_LIST_HEAD(&bat_priv->vis_send_list);
-
-        if (hash_add(bat_priv->vis_hash, bat_priv->my_vis_info) < 0) {
-                pr_err("Can't add own vis packet into hash\n");
-                /* not in hash, need to remove it manually. */
-                kref_put(&bat_priv->my_vis_info->refcount, free_info);
-                goto err;
-        }
-
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-        start_vis_timer(bat_priv);
-        return 1;
-
-free_info:
-        kfree(bat_priv->my_vis_info);
-        bat_priv->my_vis_info = NULL;
-err:
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-        vis_quit(bat_priv);
-        return 0;
-}
-
-/* Decrease the reference count on a hash item info */
-static void free_info_ref(void *data, void *arg)
-{
-        struct vis_info *info = data;
-
-        send_list_del(info);
-        kref_put(&info->refcount, free_info);
-}
-
-/* shutdown vis-server */
-void vis_quit(struct bat_priv *bat_priv)
-{
-        unsigned long flags;
-        if (!bat_priv->vis_hash)
-                return;
-
-        cancel_delayed_work_sync(&bat_priv->vis_work);
-
-        spin_lock_irqsave(&bat_priv->vis_hash_lock, flags);
-        /* properly remove, kill timers ... */
-        hash_delete(bat_priv->vis_hash, free_info_ref, NULL);
-        bat_priv->vis_hash = NULL;
-        bat_priv->my_vis_info = NULL;
-        spin_unlock_irqrestore(&bat_priv->vis_hash_lock, flags);
-}
-
-/* schedule packets for (re)transmission */
-static void start_vis_timer(struct bat_priv *bat_priv)
-{
-        INIT_DELAYED_WORK(&bat_priv->vis_work, send_vis_packets);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->vis_work,
-                           msecs_to_jiffies(VIS_INTERVAL));
-}
diff --git a/drivers/staging/batman-adv/vis.h b/drivers/staging/batman-adv/vis.h
deleted file mode 100644
index 2c3b33089a9b..000000000000
--- a/drivers/staging/batman-adv/vis.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_VIS_H_
-#define _NET_BATMAN_ADV_VIS_H_
-
-#define VIS_TIMEOUT             200     /* timeout of vis packets in seconds */
-
-int vis_seq_print_text(struct seq_file *seq, void *offset);
-void receive_server_sync_packet(struct bat_priv *bat_priv,
-                                struct vis_packet *vis_packet,
-                                int vis_info_len);
-void receive_client_update_packet(struct bat_priv *bat_priv,
-                                  struct vis_packet *vis_packet,
-                                  int vis_info_len);
-int vis_init(struct bat_priv *bat_priv);
-void vis_quit(struct bat_priv *bat_priv);
-
-#endif /* _NET_BATMAN_ADV_VIS_H_ */
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 748460e898d8..32909e2938d5 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -7,53 +7,6 @@
 #define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256
 #include "Debug.h"
 
-typedef struct _LIST_ENTRY{
-        struct _LIST_ENTRY      *next;
-        struct _LIST_ENTRY      *prev;
-} LIST_ENTRY, *PLIST_ENTRY;
-
-typedef struct _BCM_LIST_ENTRY {
-
-    LIST_ENTRY                  Link;
-
-} BCM_LIST_ENTRY, *PBCM_LIST_ENTRY;
-
-typedef enum _RCB_STATUS
-{
-        DRIVER_PROCESSED=1,
-        APPLICATION_PROCESSED
-} RCB_STATUS, *PRCB_STATUS;
-
-#define fFILLED 1
-#define fEMPTY 0
-
-struct _BCM_CB
-{
-        // The network packet that this RCB is receiving
-        PVOID                           pv_packet;
-        // Describes the length of the packet .
-        UINT                ui_packet_length;
-        // Pointer to the first buffer in the packet (only one buffer for Rx)
-        PUCHAR                          buffer;
-        atomic_t                status;
-        UINT                filled;
-} __attribute__((packed));
-typedef struct _BCM_CB BCM_CB,*PBCM_CB;
-
-typedef BCM_CB BCM_RCB, *PBCM_RCB;
-typedef BCM_CB BCM_TCB, *PBCM_TCB;
-
-/* This is to be stored in the "pvOsDepData" of ADAPTER */
-typedef struct LINUX_DEP_DATA
-{
-        struct net_device               *virtualdev;    /* Our Interface (veth0) */
-        struct net_device               *actualdev;     /* True Interface (eth0) */
-        struct net_device_stats netstats;       /* Net statistics */
-        struct fasync_struct    *async_queue;   /* For asynchronus notification */
-
-} LINUX_DEP_DATA, *PLINUX_DEP_DATA;
-
-
 struct _LEADER
 {
         USHORT  Vcid;
@@ -429,26 +382,28 @@ Driver adapter data structure
 struct _MINI_ADAPTER
 {
         struct _MINI_ADAPTER *next;
-        PVOID                       pvOsDepData;
+        struct net_device       *dev;
+        u32                     msg_enable;
+
         CHAR                *caDsxReqResp;
-        atomic_t                        ApplicationRunning;
+        atomic_t                ApplicationRunning;
         volatile INT            CtrlQueueLen;
-        atomic_t            AppCtrlQueueLen;
-        BOOLEAN             AppCtrlQueueOverFlow;
-        atomic_t                        CurrentApplicationCount;
-        atomic_t                        RegisteredApplicationCount;
-        BOOLEAN                     TimerActive;
-        ULONG                           StatisticsPointer;
+        atomic_t                AppCtrlQueueLen;
+        BOOLEAN                 AppCtrlQueueOverFlow;
+        atomic_t                CurrentApplicationCount;
+        atomic_t                RegisteredApplicationCount;
+        BOOLEAN                 LinkUpStatus;
+        BOOLEAN                 TimerActive;
+        u32                     StatisticsPointer;
         struct sk_buff          *RxControlHead;
         struct sk_buff          *RxControlTail;
-//      spinlock_t                      RxControlQueuelock;
+
         struct semaphore        RxAppControlQueuelock;
         struct semaphore        fw_download_sema;
 
         PPER_TARANG_DATA    pTarangs;
         spinlock_t                      control_queue_lock;
         wait_queue_head_t       process_read_wait_queue;
-        ULONG                   bcm_jiffies;    /* Store Jiffies value */
 
         // the pointer to the first packet we have queued in send
         // deserialized miniport support variables
@@ -458,24 +413,15 @@ struct _MINI_ADAPTER
         // this to keep track of the Tx and Rx MailBox Registers.
         atomic_t                    CurrNumFreeTxDesc;
         // to keep track the no of byte recieved
-        atomic_t                        RxRollOverCount;
         USHORT                          PrevNumRecvDescs;
         USHORT                          CurrNumRecvDescs;
-        atomic_t                        GoodRxByteCount;
-        atomic_t                        GoodRxPktCount;
-        atomic_t                        BadRxByteCount;
-        atomic_t                        RxPacketDroppedCount;
-        atomic_t                        GoodTxByteCount;
-        atomic_t                        TxTotalPacketCount;
-        atomic_t                        TxDroppedPacketCount;
-        ULONG                           LinkUpStatus;
-        BOOLEAN                     TransferMode;
         UINT                            u32TotalDSD;
         PacketInfo                  PackInfo[NO_OF_QUEUES];
         S_CLASSIFIER_RULE       astClassifierTable[MAX_CLASSIFIERS];
+        BOOLEAN                     TransferMode;
 
         /*************** qos ******************/
-        UINT                            bETHCSEnabled;
+        BOOLEAN                     bETHCSEnabled;
 
         ULONG                       BEBucketSize;
         ULONG                       rtPSBucketSize;
@@ -483,7 +429,6 @@ struct _MINI_ADAPTER
         BOOLEAN                     AutoLinkUp;
         BOOLEAN                     AutoSyncup;
 
-        struct net_device       *dev;
         int                             major;
         int                             minor;
         wait_queue_head_t       tx_packet_wait_queue;
@@ -491,8 +436,6 @@ struct _MINI_ADAPTER
         atomic_t                        process_waiting;
         BOOLEAN                         fw_download_done;
 
-        unsigned int            ctrlpkt_present;
-        BOOLEAN                         packets_given_to_all;
         char                            *txctlpacket[MAX_CNTRL_PKTS];
         atomic_t                        cntrlpktCnt ;
         atomic_t                        index_app_read_cntrlpkt;
@@ -502,34 +445,30 @@ struct _MINI_ADAPTER
         struct semaphore        rdmwrmsync;
 
         STTARGETDSXBUFFER       astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
-        ULONG                           ulFreeTargetBufferCnt;
+        ULONG                   ulFreeTargetBufferCnt;
         ULONG                   ulCurrentTargetBuffer;
         ULONG                   ulTotalTargetBuffersAvailable;
-        unsigned int            timeout;
-        int                             irq;
+
         unsigned long           chip_id;
-        unsigned int            bFlashBoot;
-        unsigned int            if_up;
-//      spinlock_t                      sleeper_lock;
-        atomic_t                        rdm_wrm_access;
-        atomic_t                        tx_rx_access;
+
         wait_queue_head_t       lowpower_mode_wait_queue;
-        atomic_t                        bAbortedByHost;
-        BOOLEAN                         bBinDownloaded;
-        BOOLEAN                         bCfgDownloaded;
-        USHORT                          usBestEffortQueueIndex;
-        BOOLEAN                         bSyncUpRequestSent;
-//      struct semaphore        data_packet_queue_lock;
+
+        BOOLEAN                 bFlashBoot;
+        BOOLEAN                 bBinDownloaded;
+        BOOLEAN                 bCfgDownloaded;
+        BOOLEAN                 bSyncUpRequestSent;
+        USHORT                  usBestEffortQueueIndex;
+
         wait_queue_head_t       ioctl_fw_dnld_wait_queue;
         BOOLEAN                         waiting_to_fw_download_done;
         pid_t                           fw_download_process_pid;
         PSTARGETPARAMS          pstargetparams;
         BOOLEAN                         device_removed;
         BOOLEAN                         DeviceAccess;
-        INT                                     DDRSetting;
+        BOOLEAN                         bIsAutoCorrectEnabled;
         BOOLEAN                         bDDRInitDone;
+        INT                             DDRSetting;
         ULONG                           ulPowerSaveMode;
-        BOOLEAN                         bIsAutoCorrectEnabled;
         spinlock_t                      txtransmitlock;
         B_UINT8                         txtransmit_running;
         /* Thread for control packet handling */
@@ -567,13 +506,13 @@ struct _MINI_ADAPTER
         unsigned int    usIdleModePattern;
         //BOOLEAN                       bTriedToWakeUpFromShutdown;
         BOOLEAN                 bLinkDownRequested;
-        unsigned int    check_for_hang;
+
         int                     downloadDDR;
         PHS_DEVICE_EXTENSION stBCMPhsContext;
         S_HDR_SUPRESSION_CONTEXTINFO    stPhsTxContextInfo;
         uint8_t                 ucaPHSPktRestoreBuf[2048];
         uint8_t                 bPHSEnabled;
-        int                     AutoFirmDld;
+        BOOLEAN                 AutoFirmDld;
         BOOLEAN         bMipsConfig;
         BOOLEAN         bDPLLConfig;
         UINT32                  aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
@@ -599,10 +538,9 @@ struct _MINI_ADAPTER
 
 
         struct semaphore        NVMRdmWrmLock;
-        BOOLEAN                 bNetworkInterfaceRegistered;
-        BOOLEAN                 bNetdeviceNotifierRegistered;
+
         struct device *pstCreatedClassDevice;
-        BOOLEAN                 bUsbClassDriverRegistered;
+
 //      BOOLEAN                         InterfaceUpStatus;
         PFLASH2X_CS_INFO psFlash2xCSInfo;
         PFLASH_CS_INFO psFlashCSInfo ;
@@ -630,17 +568,13 @@ struct _MINI_ADAPTER
         struct semaphore        LowPowerModeSync;
         ULONG   liDrainCalculated;
         UINT gpioBitMap;
+
     S_BCM_DEBUG_STATE stDebugState;
 
 };
 typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
 
-
-typedef struct _DEVICE_EXTENSION
-{
-        PMINI_ADAPTER pAdapt;
-}DEVICE_EXTENSION,*PDEVICE_EXTENSION;
-
+#define GET_BCM_ADAPTER(net_dev)        netdev_priv(net_dev)
 
 struct _ETH_HEADER_STRUC {
     UCHAR       au8DestinationAddress[6];
@@ -667,8 +601,8 @@ typedef LINK_REQUEST CONTROL_MESSAGE;
 
 typedef struct _DDR_SETTING
 {
-        ULONG ulRegAddress;
-        ULONG ulRegValue;
+        UINT ulRegAddress;
+        UINT ulRegValue;
 }DDR_SETTING, *PDDR_SETTING;
 typedef DDR_SETTING DDR_SET_NODE, *PDDR_SET_NODE;
 INT
diff --git a/drivers/staging/bcm/Arp.c b/drivers/staging/bcm/Arp.c
deleted file mode 100644
index d60d8593d2ef..000000000000
--- a/drivers/staging/bcm/Arp.c
+++ /dev/null
@@ -1,94 +0,0 @@
-
-/*
- * File Name: Arp.c
- * Abstract: This file contains the routines for handling ARP PACKETS
- */
-#include "headers.h"
-#define ARP_PKT_SIZE    60
-
-/* =========================================================================
- * Function    - reply_to_arp_request()
- *
- * Description - When this host tries to broadcast ARP request packet through
- *                               the virtual interface (veth0), reply directly to upper layer.
- *                               This function allocates a new skb for ARP reply packet,
- *                               fills in the fields of the packet and then sends it to
- *                               upper layer.
- *
- * Parameters  - skb:   Pointer to sk_buff structure of the ARP request pkt.
- *
- * Returns     - None
- * =========================================================================*/
-
-VOID
-reply_to_arp_request(struct sk_buff *skb)
-{
-        PMINI_ADAPTER           Adapter;
-        struct ArpHeader        *pArpHdr = NULL;
-        struct ethhdr           *pethhdr = NULL;
-        UCHAR                           uiIPHdr[4];
-        /* Check for valid skb */
-        if(skb == NULL)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Invalid skb: Cannot reply to ARP request\n");
-                return;
-        }
-
-
-        Adapter = GET_BCM_ADAPTER(skb->dev);
-        /* Print the ARP Request Packet */
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, ARP_RESP, DBG_LVL_ALL, "ARP Packet Dump :");
-        BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, ARP_RESP, DBG_LVL_ALL, (PUCHAR)(skb->data), skb->len);
-
-        /*
-         * Extract the Ethernet Header and Arp Payload including Header
-     */
-        pethhdr = (struct ethhdr *)skb->data;
-        pArpHdr  = (struct ArpHeader *)(skb->data+ETH_HLEN);
-
-        if(Adapter->bETHCSEnabled)
-        {
-                if(memcmp(pethhdr->h_source, Adapter->dev->dev_addr, ETH_ALEN))
-                {
-                        bcm_kfree_skb(skb);
-                        return;
-                }
-        }
-
-        // Set the Ethernet Header First.
-        memcpy(pethhdr->h_dest, pethhdr->h_source, ETH_ALEN);
-        if(!memcmp(pethhdr->h_source, Adapter->dev->dev_addr, ETH_ALEN))
-        {
-                pethhdr->h_source[5]++;
-        }
-
-        /* Set the reply to ARP Reply */
-        pArpHdr->arp.ar_op = ntohs(ARPOP_REPLY);
-
-        /* Set the HW Address properly */
-        memcpy(pArpHdr->ar_sha, pethhdr->h_source, ETH_ALEN);
-        memcpy(pArpHdr->ar_tha, pethhdr->h_dest, ETH_ALEN);
-
-        // Swapping the IP Adddress
-        memcpy(uiIPHdr,pArpHdr->ar_sip,4);
-        memcpy(pArpHdr->ar_sip,pArpHdr->ar_tip,4);
-        memcpy(pArpHdr->ar_tip,uiIPHdr,4);
-
-        /* Print the ARP Reply Packet */
-
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, ARP_RESP, DBG_LVL_ALL, "ARP REPLY PACKET: ");
-
-        /* Send the Packet to upper layer */
-        BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, ARP_RESP, DBG_LVL_ALL, (PUCHAR)(skb->data), skb->len);
-
-        skb->protocol = eth_type_trans(skb,skb->dev);
-        skb->pkt_type = PACKET_HOST;
-
-//      skb->mac.raw=skb->data+LEADER_SIZE;
-        skb_set_mac_header (skb, LEADER_SIZE);
-        netif_rx(skb);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, ARP_RESP, DBG_LVL_ALL, "<=============\n");
-        return;
-}
-
-
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index fead9c56162e..31674ea1cd48 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -12,7 +12,7 @@
 *
 * Returns         - Zero(Success)
 ****************************************************************/
-static struct class *bcm_class = NULL;
+
 static int bcm_char_open(struct inode *inode, struct file * filp)
 {
         PMINI_ADAPTER           Adapter = NULL;
@@ -93,7 +93,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp)
     /*Stop Queuing the control response Packets*/
     atomic_dec(&Adapter->ApplicationRunning);
 
-    bcm_kfree(pTarang);
+    kfree(pTarang);
 
         /* remove this filp from the asynchronously notified filp's */
     filp->private_data = NULL;
@@ -102,11 +102,11 @@ static int bcm_char_release(struct inode *inode, struct file *filp)
 
 static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)
 {
-    PPER_TARANG_DATA pTarang = (PPER_TARANG_DATA)filp->private_data;
+        PPER_TARANG_DATA pTarang = filp->private_data;
         PMINI_ADAPTER   Adapter = pTarang->Adapter;
-    struct sk_buff* Packet = NULL;
-    UINT            PktLen = 0;
-        int                     wait_ret_val=0;
+        struct sk_buff* Packet = NULL;
+        ssize_t         PktLen = 0;
+        int             wait_ret_val=0;
 
         wait_ret_val = wait_event_interruptible(Adapter->process_read_wait_queue,
                 (pTarang->RxAppControlHead || Adapter->device_removed));
@@ -139,14 +139,16 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, l
         if(Packet)
         {
                 PktLen = Packet->len;
-                if(copy_to_user(buf, Packet->data, PktLen))
+                if(copy_to_user(buf, Packet->data, min_t(size_t, PktLen, size)))
                 {
-                        bcm_kfree_skb(Packet);
+                        dev_kfree_skb(Packet);
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\nReturning from copy to user failure \n");
                         return -EFAULT;
                 }
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read %d Bytes From Adapter packet = 0x%p by process %d!\n", PktLen, Packet, current->pid);
-                bcm_kfree_skb(Packet);
+                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                                "Read %zd Bytes From Adapter packet = %p by process %d!\n",
+                                PktLen, Packet, current->pid);
+                dev_kfree_skb(Packet);
         }
 
     BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<====\n");
@@ -155,15 +157,12 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, l
 
 static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 {
-    PPER_TARANG_DATA  pTarang = (PPER_TARANG_DATA)filp->private_data;
-        void __user *argp = (void __user *)argp;
+        PPER_TARANG_DATA  pTarang = filp->private_data;
+        void __user *argp = (void __user *)arg;
         PMINI_ADAPTER   Adapter = pTarang->Adapter;
         INT                     Status = STATUS_FAILURE;
-        IOCTL_BUFFER    IoBuffer={};
-#ifndef BCM_SHM_INTERFACE
-    int timeout = 0;
-#endif
-
+        int timeout = 0;
+        IOCTL_BUFFER    IoBuffer;
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX", cmd, arg);
 
@@ -204,50 +203,41 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
         Status = vendorextnIoctl(Adapter, cmd, arg);
         if(Status != CONTINUE_COMMON_PATH )
-        {
                  return Status;
-        }
 
         switch(cmd){
                 // Rdms for Swin Idle...
                 case IOCTL_BCM_REGISTER_READ_PRIVATE:
                 {
                         RDM_BUFFER  sRdmBuffer = {0};
-                        PCHAR temp_buff = NULL;
-                        UINT Bufflen = 0;
+                        PCHAR temp_buff;
+                        UINT Bufflen;
+
                         /* Copy Ioctl Buffer structure */
-                        if(copy_from_user((PCHAR)&IoBuffer, argp,
-                                sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+                                return -EINVAL;
 
+                        if(copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
+
+                        /* FIXME: need to restrict BuffLen */
                         Bufflen = IoBuffer.OutputLength + (4 - IoBuffer.OutputLength%4)%4;
-                        temp_buff = (PCHAR)kmalloc(Bufflen, GFP_KERNEL);
+                        temp_buff = kmalloc(Bufflen, GFP_KERNEL);
                         if(!temp_buff)
-                        {
-                                return STATUS_FAILURE;
-                        }
-                        if(copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
-                                IoBuffer.InputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -ENOMEM;
+
                         Status = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
                                         (PUINT)temp_buff, Bufflen);
-                        if(Status != STATUS_SUCCESS)
-                        {
-                                bcm_kfree(temp_buff);
-                                return Status;
-                        }
-                        if(copy_to_user(IoBuffer.OutputBuffer,
-                                (PCHAR)temp_buff, (UINT)IoBuffer.OutputLength))
+                        if(Status == STATUS_SUCCESS)
                         {
-                                Status = -EFAULT;
+                                if(copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))
+                                        Status = -EFAULT;
                         }
-                        bcm_kfree(temp_buff);
+
+                        kfree(temp_buff);
                         break;
                 }
                 case IOCTL_BCM_REGISTER_WRITE_PRIVATE:
@@ -256,19 +246,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         UINT uiTempVar=0;
                         /* Copy Ioctl Buffer structure */
 
-                        if(copy_from_user(&IoBuffer, argp,
-                                sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+                                return -EINVAL;
+
                         /* Get WrmBuffer structure */
-                        if(copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
-                                IoBuffer.InputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
+
                         uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
                         if(!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
                                 ((uiTempVar == EEPROM_REJECT_REG_1)||
@@ -277,8 +264,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 (uiTempVar == EEPROM_REJECT_REG_4)))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");
-                                Status = -EFAULT;
-                                break;
+                                return -EFAULT;
                         }
                         Status = wrmalt(Adapter, (UINT)sWrmBuffer.Register,
                                                 (PUINT)sWrmBuffer.Data, sizeof(ULONG));
@@ -305,56 +291,39 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Device in Idle Mode, Blocking Rdms\n");
-                                Status = -EACCES;
-                                break;
+                                return -EACCES;
                         }
                         /* Copy Ioctl Buffer structure */
-                        if(copy_from_user(&IoBuffer, argp,
-                                sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+                                return -EINVAL;
 
-                        temp_buff = (PCHAR)kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
+                        if(copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
+
+                        /* FIXME: don't trust user supplied length */
+                        temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
                         if(!temp_buff)
-                        {
                                 return STATUS_FAILURE;
-                        }
-                        if(copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
-                                IoBuffer.InputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
 
-                        if(
-#if !defined(BCM_SHM_INTERFACE)
-                                (((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-#endif
-                                        ((ULONG)sRdmBuffer.Register & 0x3)
-                          )
+                        if((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
+                           ((ULONG)sRdmBuffer.Register & 0x3))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "RDM Done On invalid Address : %x Access Denied.\n",
                                         (int)sRdmBuffer.Register);
-                                Status = -EINVAL;
-                                break;
+                                return -EINVAL;
                         }
 
                         uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
                         Status = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register,
                                                 (PUINT)temp_buff, IoBuffer.OutputLength);
-                        if(Status != STATUS_SUCCESS)
-                        {
-                                bcm_kfree(temp_buff);
-                                return Status;
-                        }
-                        if(copy_to_user(IoBuffer.OutputBuffer,
-                                (PCHAR)temp_buff, (UINT)IoBuffer.OutputLength))
-                        {
-                                Status = -EFAULT;
-                        }
-                        bcm_kfree(temp_buff);
+                        if(Status == STATUS_SUCCESS)
+                                if(copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))
+                                        Status = -EFAULT;
+
+                        kfree(temp_buff);
                         break;
                 }
                 case IOCTL_BCM_REGISTER_WRITE:
@@ -367,36 +336,28 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Device in Idle Mode, Blocking Wrms\n");
-                                Status = -EACCES;
-                                break;
+                                return -EACCES;
                         }
+
                         /* Copy Ioctl Buffer structure */
-                        if(copy_from_user((PCHAR)&IoBuffer, argp,
-                                        sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+                                return -EINVAL;
+
                         /* Get WrmBuffer structure */
-                        if(copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
-                                IoBuffer.InputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
-                        if(
-#if !defined(BCM_SHM_INTERFACE)
+                        if(copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
 
-                                (((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-#endif
-                                        ((ULONG)sWrmBuffer.Register & 0x3)
-                         )
+                        if( (((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
+                                        ((ULONG)sWrmBuffer.Register & 0x3) )
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WRM Done On invalid Address : %x Access Denied.\n",
                                                 (int)sWrmBuffer.Register);
-                                Status = -EINVAL;
-                                break;
+                                return -EINVAL;
                         }
+
                         uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
                         if(!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
                                 ((uiTempVar == EEPROM_REJECT_REG_1)||
@@ -406,8 +367,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 (cmd == IOCTL_BCM_REGISTER_WRITE))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");
-                                Status = -EFAULT;
-                                break;
+                                return -EFAULT;
                         }
 
                         Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
@@ -436,19 +396,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"GPIO Can't be set/clear in Low power Mode");
-                                Status = -EACCES;
-                                break;
+                                return -EACCES;
                         }
                         if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                    }
+                                return -EFAULT;
+                        if (IoBuffer.InputLength > sizeof(gpio_info))
+                                return -EINVAL;
                         if(copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -EFAULT;
                         uiBit  = gpio_info.uiGpioNumber;
                         uiOperation = gpio_info.uiGpioValue;
 
@@ -517,8 +472,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 break;
                 case BCM_LED_THREAD_STATE_CHANGE_REQ:
                 {
-
-                        USER_THREAD_REQ threadReq = {0};
+                        USER_THREAD_REQ threadReq = { 0 };
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"User made LED thread InActive");
 
                         if((Adapter->IdleMode == TRUE) ||
@@ -529,21 +483,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Status = -EACCES;
                                 break;
                         }
-                        Status =copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                        if(Status)
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the IOBufer from user space err:%d",Status);
-                                Status = -EFAULT;
-                                break;
-                        }
 
-                        Status= copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength);
-                        if(Status)
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the InputBuffer from user space err:%d",Status);
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        if (IoBuffer.InputLength > sizeof(threadReq))
+                                return -EINVAL;
+
+                        if (copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
+
                         //if LED thread is running(Actively or Inactively) set it state to make inactive
                         if(Adapter->LEDInfo.led_thread_running)
                         {
@@ -572,19 +521,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         if((Adapter->IdleMode == TRUE) ||
                                 (Adapter->bShutStatus ==TRUE) ||
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
-                        {
-                                Status = -EACCES;
-                                break;
-                        }
-                        if(copy_from_user((PCHAR)&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
-                                Status = -EFAULT;
-                                break;
-                        }
-                if(copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                {
-                    Status = -EFAULT;
-                    break;
-                }
+                                return -EACCES;
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+                        if (IoBuffer.InputLength > sizeof(gpio_info))
+                                return -EINVAL;
+                        if(copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
                 uiBit  = gpio_info.uiGpioNumber;
                                   //Set the gpio output register
                                 Status = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
@@ -608,25 +551,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if((Adapter->IdleMode == TRUE) ||
                                 (Adapter->bShutStatus ==TRUE) ||
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
-                                {
-                                        Status = -EINVAL;
-                                        break;
-                                }
-                                Status = copy_from_user( (PCHAR)&IoBuffer, argp, sizeof( IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the IOBufer from user space err:%d",Status);
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                        return -EINVAL;
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                        return -EFAULT;
+                                if (IoBuffer.InputLength > sizeof(gpio_multi_info))
+                                        return -EINVAL;
+                                if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                        return -EFAULT;
 
-                                Status = copy_from_user( &gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength);
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the IOBufer Contents from user space err:%d",Status);
-                                        Status = -EFAULT;
-                                        break;
-                                }
                                 if(IsReqGpioIsLedInNVM(Adapter,pgpio_multi_info[WIMAX_IDX].uiGPIOMask)== FALSE)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",pgpio_multi_info[WIMAX_IDX].uiGPIOMask,Adapter->gpioBitMap);
@@ -686,7 +618,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying Content to IOBufer for user space err:%d",Status);
-                                        Status = -EFAULT;
                                         break;
                                 }
                         }
@@ -700,25 +631,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         if((Adapter->IdleMode == TRUE) ||
                                 (Adapter->bShutStatus ==TRUE) ||
                                 (Adapter->bPreparingForLowPowerMode ==TRUE))
-                        {
-                                        Status = -EINVAL;
-                                        break;
-                        }
-                        Status = copy_from_user(&IoBuffer, argp, sizeof( IOCTL_BUFFER));
-                        if(Status)
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the IOBufer from user space err:%d",Status);
-                                Status = -EFAULT;
-                                break;
-                        }
+                                        return -EINVAL;
 
-                        Status = copy_from_user( &gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength);
-                        if(Status)
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying the IOBufer Contents from user space err:%d",Status);
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+                        if (IoBuffer.InputLength > sizeof(gpio_multi_mode))
+                                return -EINVAL;
+                        if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                return -EFAULT;
 
                         Status = rdmaltWithLock( Adapter, ( UINT) GPIO_MODE_REGISTER, ( PUINT) ucResetValue, sizeof( UINT));
                         if( STATUS_SUCCESS != Status)
@@ -769,7 +689,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         if(Status)
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Failed while copying Content to IOBufer for user space err:%d",Status);
-                                Status = -EFAULT;
                                 break;
                         }
                 }
@@ -783,24 +702,20 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 case IOCTL_IDLE_REQ:
                 {
                         PVOID pvBuffer=NULL;
+
                         /* Copy Ioctl Buffer structure */
-                        if(copy_from_user(&IoBuffer, argp,
-                                                        sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
-                        pvBuffer=kmalloc(IoBuffer.InputLength, GFP_KERNEL);
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
+                        /* FIXME: don't accept any length from user */
+                        pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);
                         if(!pvBuffer)
-                        {
                                 return -ENOMEM;
-                        }
 
-                        if(copy_from_user(pvBuffer, IoBuffer.InputBuffer,
-                                        IoBuffer.InputLength))
+                        if(copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
                         {
                                 Status = -EFAULT;
-                                bcm_kfree(pvBuffer);
+                                kfree(pvBuffer);
                                 break;
                         }
 
@@ -820,10 +735,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer);
                 cntrlEnd:
                         up(&Adapter->LowPowerModeSync);
-                        bcm_kfree(pvBuffer);
+                        kfree(pvBuffer);
                         break;
                 }
-#ifndef BCM_SHM_INTERFACE
                 case IOCTL_BCM_BUFFER_DOWNLOAD_START:
                 {
                         INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock) ;
@@ -844,7 +758,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Status = reset_card_proc(Adapter);
                                 if(Status)
                                 {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "reset_card_proc Failed!\n");
+                                        pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name);
                                         up(&Adapter->fw_download_sema);
                                         up(&Adapter->NVMRdmWrmLock);
                                         break;
@@ -862,7 +776,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 }
                 case IOCTL_BCM_BUFFER_DOWNLOAD:
                         {
-                                FIRMWARE_INFO   *psFwInfo=NULL;
+                                FIRMWARE_INFO   *psFwInfo = NULL;
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
                         do{
                                 if(!down_trylock(&Adapter->fw_download_sema))
@@ -871,29 +785,23 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         Status=-EINVAL;
                                         break;
                                 }
+
                                 /* Copy Ioctl Buffer structure */
                                 if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copy_from_user 1 failed\n");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                        return -EFAULT;
+
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Length for FW DLD is : %lx\n",
                                                                                 IoBuffer.InputLength);
-                                psFwInfo=kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
+
+                                if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO))
+                                        return -EINVAL;
+
+                                psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
                                 if(!psFwInfo)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Failed to allocate buffer!!!!\n");
-                                        Status = -ENOMEM;
-                                        break;
-                                }
-                                if(copy_from_user(psFwInfo, IoBuffer.InputBuffer,
-                                                        IoBuffer.InputLength))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy_from_user 2 failed\n");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                        return -ENOMEM;
+
+                                if(copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                        return -EFAULT;
 
                                 if(!psFwInfo->pvMappedFirmwareAddress ||
                                                 (psFwInfo->u32FirmwareLength == 0))
@@ -929,7 +837,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                           if(Status != STATUS_SUCCESS)
                                         up(&Adapter->fw_download_sema);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
-                                bcm_kfree(psFwInfo);
+                                kfree(psFwInfo);
                                 break;
                         }
                 case IOCTL_BCM_BUFFER_DOWNLOAD_STOP:
@@ -946,7 +854,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Adapter->bBinDownloaded=TRUE;
                                 Adapter->bCfgDownloaded=TRUE;
                                 atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
-                                atomic_set(&Adapter->RxRollOverCount, 0);
+
                                 Adapter->CurrNumRecvDescs=0;
                                 Adapter->downloadDDR = 0;
 
@@ -999,7 +907,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         up(&Adapter->NVMRdmWrmLock);
                         break;
                 }
-#endif
                 case IOCTL_BE_BUCKET_SIZE:
                         Status = 0;
                         if (get_user(Adapter->BEBucketSize, (unsigned long __user *)arg))
@@ -1050,22 +957,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         break;
 
                 case IOCTL_GET_PACK_INFO:
-                        if(copy_to_user(argp, &Adapter->PackInfo,
-                                sizeof(PacketInfo)*NO_OF_QUEUES))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_to_user(argp, &Adapter->PackInfo, sizeof(PacketInfo)*NO_OF_QUEUES))
+                                return -EFAULT;
                         Status = STATUS_SUCCESS;
                         break;
                 case IOCTL_BCM_SWITCH_TRANSFER_MODE:
                 {
                         UINT uiData = 0;
                         if(copy_from_user(&uiData, argp, sizeof(UINT)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -EFAULT;
+
                         if(uiData)      /* Allow All Packets */
                         {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
@@ -1084,22 +985,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 {
                         /* Copy Ioctl Buffer structure */
                         if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
-                        if(copy_to_user(IoBuffer.OutputBuffer,
-                                VER_FILEVERSION_STR, (UINT)IoBuffer.OutputLength))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -EFAULT;
+
+                        if(copy_to_user(IoBuffer.OutputBuffer, VER_FILEVERSION_STR, IoBuffer.OutputLength))
+                                return -EFAULT;
                         Status = STATUS_SUCCESS;
                         break;
                 }
                 case IOCTL_BCM_GET_CURRENT_STATUS:
                 {
-                        LINK_STATE plink_state;
+                        LINK_STATE link_state;
 
                         /* Copy Ioctl Buffer structure */
                         if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -1108,19 +1003,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Status = -EFAULT;
                                 break;
                         }
-                        if (IoBuffer.OutputLength != sizeof(plink_state)) {
+                        if (IoBuffer.OutputLength != sizeof(link_state)) {
                                 Status = -EINVAL;
                                 break;
                         }
 
-                        if (copy_from_user(&plink_state, (void __user *)arg, sizeof(plink_state))) {
-                                Status = -EFAULT;
-                                break;
-                        }
-                        plink_state.bIdleMode = (UCHAR)Adapter->IdleMode;
-                        plink_state.bShutdownMode = Adapter->bShutStatus;
-                        plink_state.ucLinkStatus = (UCHAR)Adapter->LinkStatus;
-                        if (copy_to_user(IoBuffer.OutputBuffer, &plink_state, IoBuffer.OutputLength)) {
+                        memset(&link_state, 0, sizeof(link_state));
+                        link_state.bIdleMode = Adapter->IdleMode;
+                        link_state.bShutdownMode = Adapter->bShutStatus;
+                        link_state.ucLinkStatus = Adapter->LinkStatus;
+
+                        if (copy_to_user(IoBuffer.OutputBuffer, &link_state,
+                                         min_t(size_t, sizeof(link_state), IoBuffer.OutputLength)))
+                        {
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy_to_user Failed..\n");
                                 Status = -EFAULT;
                                 break;
@@ -1131,17 +1026,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         case IOCTL_BCM_SET_MAC_TRACING:
         {
             UINT  tracing_flag;
+
             /* copy ioctl Buffer structure */
-                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                        {
-                                Status = -EFAULT;
-                                break;
-                        }
-                        if(copy_from_user(&tracing_flag, IoBuffer.InputBuffer,sizeof(UINT)))
-            {
-                                Status = -EFAULT;
-                                break;
-                        }
+            if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                    return -EFAULT;
+
+            if(copy_from_user(&tracing_flag,IoBuffer.InputBuffer,sizeof(UINT)))
+                    return -EFAULT;
+
             if (tracing_flag)
                 Adapter->pTarangs->MacTracingEnabled = TRUE;
             else
@@ -1151,72 +1043,53 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 case IOCTL_BCM_GET_DSX_INDICATION:
                 {
                         ULONG ulSFId=0;
-                        if(copy_from_user((PCHAR)&IoBuffer, argp,
-                                        sizeof(IOCTL_BUFFER)))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Invalid IO buffer!!!" );
-                                Status = -EFAULT;
-                                break;
-                        }
+                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                return -EFAULT;
+
                         if(IoBuffer.OutputLength < sizeof(stLocalSFAddIndicationAlt))
                         {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Mismatch req: %lx needed is =0x%zx!!!",
-                                        IoBuffer.OutputLength, sizeof(stLocalSFAddIndicationAlt));
+                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,
+                                                "Mismatch req: %lx needed is =0x%zx!!!",
+                                                IoBuffer.OutputLength, sizeof(stLocalSFAddIndicationAlt));
                                 return -EINVAL;
                         }
-                        if(copy_from_user(&ulSFId, IoBuffer.InputBuffer,
-                                        sizeof(ulSFId)))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Invalid SFID!!! %lu", ulSFId );
-                                Status = -EFAULT;
-                                break;
-                        }
+
+                        if(copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
+                                return -EFAULT;
+
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Get DSX Data SF ID is =%lx\n", ulSFId );
-                        get_dsx_sf_data_to_application(Adapter, ulSFId,
-                                IoBuffer.OutputBuffer);
+                        get_dsx_sf_data_to_application(Adapter, ulSFId, IoBuffer.OutputBuffer);
                         Status=STATUS_SUCCESS;
                 }
                 break;
                 case IOCTL_BCM_GET_HOST_MIBS:
                 {
-                        PCHAR temp_buff;
+                        PVOID temp_buff;
 
                         if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy_from user for IoBuff failed\n");
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -EFAULT;
 
                         if(IoBuffer.OutputLength != sizeof(S_MIBS_HOST_STATS_MIBS))
                         {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Length Check failed %lu %zd\n", IoBuffer.OutputLength,
-                                                                                        sizeof(S_MIBS_HOST_STATS_MIBS));
-                        return -EINVAL;
+                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,
+                                                "Length Check failed %lu %zd\n",
+                                                IoBuffer.OutputLength, sizeof(S_MIBS_HOST_STATS_MIBS));
+                                return -EINVAL;
                         }
 
-                        temp_buff = (PCHAR)kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
-
+                        /* FIXME: HOST_STATS are too big for kmalloc (122048)! */
+                        temp_buff = kzalloc(sizeof(S_MIBS_HOST_STATS_MIBS), GFP_KERNEL);
                         if(!temp_buff)
-                        {
                                 return STATUS_FAILURE;
-                        }
-
-                        Status = ProcessGetHostMibs(Adapter,
-                                        (PUCHAR)temp_buff, IoBuffer.OutputLength);
 
-                Status = GetDroppedAppCntrlPktMibs((PVOID)temp_buff,
-                                                                        (PPER_TARANG_DATA)filp->private_data);
+                        Status = ProcessGetHostMibs(Adapter, temp_buff);
+                        GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
 
-                        if(copy_to_user(IoBuffer.OutputBuffer,(PCHAR)temp_buff,
-                                sizeof(S_MIBS_HOST_STATS_MIBS)))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy to user failed\n");
-                                bcm_kfree(temp_buff);
-                                return -EFAULT;
-                        }
+                        if (Status != STATUS_FAILURE)
+                                if(copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS)))
+                                        Status = -EFAULT;
 
-                        bcm_kfree(temp_buff);
+                        kfree(temp_buff);
                         break;
                 }
 
@@ -1226,10 +1099,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Adapter->usIdleModePattern = ABORT_IDLE_MODE;
                                 Adapter->bWakeUpDevice = TRUE;
                                 wake_up(&Adapter->process_rx_cntrlpkt);
-                                #if 0
-                                Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
-                                InterfaceAbortIdlemode (Adapter, Adapter->usIdleModePattern);
-                                #endif
                         }
                         Status = STATUS_SUCCESS;
                         break;
@@ -1248,24 +1117,20 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         Status = -EACCES;
                                         break;
                                 }
+
                                 /* Copy Ioctl Buffer structure */
-                                if(copy_from_user((PCHAR)&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                                {
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                        return -EFAULT;
 
-                                pvBuffer=kmalloc(IoBuffer.InputLength, GFP_KERNEL);
+                                /* FIXME: restrict length */
+                                pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);
                                 if(!pvBuffer)
-                                {
                                         return -ENOMEM;
-                                        break;
-                                }
 
                                 /* Get WrmBuffer structure */
-                if(copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+                                if(copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
                                 {
-                                        bcm_kfree(pvBuffer);
+                                        kfree(pvBuffer);
                                         Status = -EFAULT;
                                         break;
                                 }
@@ -1275,7 +1140,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
                                         ((ULONG)pBulkBuffer->Register & 0x3))
                                 {
-                                        bcm_kfree(pvBuffer);
+                                        kfree(pvBuffer);
                     BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"WRM Done On invalid Address : %x Access Denied.\n",(int)pBulkBuffer->Register);
                                         Status = -EINVAL;
                                         break;
@@ -1290,7 +1155,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         (uiTempVar == EEPROM_REJECT_REG_4)) &&
                                         (cmd == IOCTL_BCM_REGISTER_WRITE))
                                 {
-                                        bcm_kfree(pvBuffer);
+                                        kfree(pvBuffer);
                     BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"EEPROM Access Denied, not in VSG Mode\n");
                                         Status = -EFAULT;
                                         break;
@@ -1306,30 +1171,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
                                 }
 
-                                bcm_kfree(pvBuffer);
+                                kfree(pvBuffer);
                                 break;
                         }
 
                 case IOCTL_BCM_GET_NVM_SIZE:
-                        {
-
                         if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                        {
-                                //IOLog("failed NVM first");
-                                Status = -EFAULT;
-                                break;
-                        }
+                                return -EFAULT;
+
                         if(Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH ) {
-                                if(copy_to_user(IoBuffer.OutputBuffer,
-                                        (unsigned char *)&Adapter->uiNVMDSDSize, (UINT)sizeof(UINT)))
-                                {
-                                                Status = -EFAULT;
-                                                return Status;
-                                }
+                                if(copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(UINT)))
+                                        return -EFAULT;
                         }
-
                         Status = STATUS_SUCCESS ;
-                        }
                         break;
 
                 case IOCTL_BCM_CAL_INIT :
@@ -1338,40 +1192,26 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 UINT uiSectorSize = 0 ;
                                 if(Adapter->eNVMType == NVM_FLASH)
                                 {
-                                        Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                        if(Status)
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Copy From User space failed. status :%d", Status);
+                                        if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                                                 return -EFAULT;
-                                        }
-                                        if (get_user(uiSectorSize, (unsigned int __user *)IoBuffer.InputBuffer))
+
+                                        if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
                                                 return -EFAULT;
 
                                         if((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE))
                                         {
-
-                                                Status = copy_to_user(IoBuffer.OutputBuffer,
-                                                                        (unsigned char *)&Adapter->uiSectorSize ,
-                                                                        (UINT)sizeof(UINT));
-                                                if(Status)
-                                                {
-                                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Coping the sector size to use space failed. status:%d",Status);
-                                                                return -EFAULT;
-                                                }
+                                                if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
+                                                                 sizeof(UINT)))
+                                                        return -EFAULT;
                                         }
                                         else
                                         {
                                                 if(IsFlash2x(Adapter))
                                                 {
-                                                        Status = copy_to_user(IoBuffer.OutputBuffer,
-                                                                        (unsigned char *)&Adapter->uiSectorSize ,
-                                                                        (UINT)sizeof(UINT));
-                                                        if(Status)
-                                                        {
-                                                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Coping the sector size to use space failed. status:%d",Status);
-                                                                        return -EFAULT;
-                                                        }
-
+                                                        if (copy_to_user(IoBuffer.OutputBuffer,
+                                                                         &Adapter->uiSectorSize ,
+                                                                         sizeof(UINT)))
+                                                            return -EFAULT;
                                                 }
                                                 else
                                                 {
@@ -1395,25 +1235,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         }
                         break;
         case IOCTL_BCM_SET_DEBUG :
+#ifdef DEBUG
             {
                 USER_BCM_DBG_STATE sUserDebugState;
 
 //                              BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "Entered the ioctl %x \n", IOCTL_BCM_SET_DEBUG );
 
                                 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n");
-                                Status = copy_from_user((PCHAR)&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy from user failed\n");
-                                        Status = -EFAULT;
-                                        break;
-                                }
-                                Status = copy_from_user(&sUserDebugState,IoBuffer.InputBuffer, sizeof(USER_BCM_DBG_STATE));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,  "Copy of IoBuffer.InputBuffer failed");
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                                         return -EFAULT;
-                                }
+
+                                if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(USER_BCM_DBG_STATE)))
+                                        return -EFAULT;
+
 
                                 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
                                 sUserDebugState.OnOff, sUserDebugState.Type);
@@ -1436,15 +1270,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 BCM_SHOW_DEBUG_BITMAP(Adapter);
 
                         }
+#endif
                         break;
                 case IOCTL_BCM_NVM_READ:
                 case IOCTL_BCM_NVM_WRITE:
                         {
-
-                                NVM_READWRITE  stNVMReadWrite = {};
+                                NVM_READWRITE  stNVMReadWrite;
                                 PUCHAR pReadData = NULL;
-                                void __user * pBuffertobeCopied = NULL;
-                                ULONG ulDSDMagicNumInUsrBuff = 0 ;
+                                ULONG ulDSDMagicNumInUsrBuff = 0;
                                 struct timeval tv0, tv1;
                                 memset(&tv0,0,sizeof(struct timeval));
                                 memset(&tv1,0,sizeof(struct timeval));
@@ -1469,21 +1302,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         /* Copy Ioctl Buffer structure */
 
                                 if(copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"copy_from_user failed\n");
-                                        Status = -EFAULT;
-                                        break;
-                                }
-                                if(IOCTL_BCM_NVM_READ == cmd)
-                                        pBuffertobeCopied = IoBuffer.OutputBuffer;
-                                else
-                                        pBuffertobeCopied = IoBuffer.InputBuffer;
+                                        return -EFAULT;
 
-                                if(copy_from_user(&stNVMReadWrite, pBuffertobeCopied,sizeof(NVM_READWRITE)))
-                                {
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                if(copy_from_user(&stNVMReadWrite,
+                                                  (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
+                                                  sizeof(NVM_READWRITE)))
+                                        return -EFAULT;
 
                                 //
                                 // Deny the access if the offset crosses the cal area limit.
@@ -1496,18 +1320,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         break;
                                 }
 
-                                pReadData =(PCHAR)kmalloc(stNVMReadWrite.uiNumBytes, GFP_KERNEL);
-
+                                pReadData = kzalloc(stNVMReadWrite.uiNumBytes, GFP_KERNEL);
                                 if(!pReadData)
                                         return -ENOMEM;
 
-                                memset(pReadData,0,stNVMReadWrite.uiNumBytes);
-
                                 if(copy_from_user(pReadData, stNVMReadWrite.pBuffer,
                                                         stNVMReadWrite.uiNumBytes))
                                 {
                                         Status = -EFAULT;
-                                        bcm_kfree(pReadData);
+                                        kfree(pReadData);
                                         break;
                                 }
 
@@ -1522,7 +1343,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         {
                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
                                                 up(&Adapter->NVMRdmWrmLock);
-                                                bcm_kfree(pReadData);
+                                                kfree(pReadData);
                                                 return -EACCES;
                                         }
 
@@ -1533,13 +1354,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
                                         if(Status != STATUS_SUCCESS)
                                                 {
-                                                        bcm_kfree(pReadData);
+                                                        kfree(pReadData);
                                                         return Status;
                                                 }
-                                        if(copy_to_user(stNVMReadWrite.pBuffer,
-                                                        pReadData, (UINT)stNVMReadWrite.uiNumBytes))
+                                        if(copy_to_user(stNVMReadWrite.pBuffer,pReadData, stNVMReadWrite.uiNumBytes))
                                                 {
-                                                        bcm_kfree(pReadData);
+                                                        kfree(pReadData);
                                                         Status = -EFAULT;
                                                 }
                                 }
@@ -1554,7 +1374,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         {
                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
                                                 up(&Adapter->NVMRdmWrmLock);
-                                                bcm_kfree(pReadData);
+                                                kfree(pReadData);
                                                 return -EACCES;
                                         }
 
@@ -1582,7 +1402,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                                         {
                                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input..");
                                                                 up(&Adapter->NVMRdmWrmLock);
-                                                                bcm_kfree(pReadData);
+                                                                kfree(pReadData);
                                                                 return Status;
                                                         }
 
@@ -1591,7 +1411,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                                         {
                                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input..");
                                                                 up(&Adapter->NVMRdmWrmLock);
-                                                                bcm_kfree(pReadData);
+                                                                kfree(pReadData);
                                                                 return Status;
                                                         }
                                                 }
@@ -1608,7 +1428,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
                                         if(Status != STATUS_SUCCESS)
                                         {
-                                                bcm_kfree(pReadData);
+                                                kfree(pReadData);
                                                 return Status;
                                         }
                                 }
@@ -1616,7 +1436,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n",(tv1.tv_sec - tv0.tv_sec)*1000 +(tv1.tv_usec - tv0.tv_usec)/1000);
 
 
-                                bcm_kfree(pReadData);
+                                kfree(pReadData);
                                 Status = STATUS_SUCCESS;
                         }
                         break;
@@ -1629,7 +1449,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 UINT BuffSize = 0;
                                 UINT ReadBytes = 0;
                                 UINT ReadOffset = 0;
-                                char __user *OutPutBuff = NULL;
+                                void __user *OutPutBuff;
 
                                 if(IsFlash2x(Adapter) != TRUE)
                                 {
@@ -1638,20 +1458,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 }
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
-                                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                                         return -EFAULT;
-                                }
 
                                 //Reading FLASH 2.x READ structure
-                                Status = copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer,sizeof(FLASH2X_READWRITE));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of Input Buffer failed");
+                                if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer,sizeof(FLASH2X_READWRITE)))
                                         return -EFAULT;
-                                }
 
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.Section :%x" ,sFlash2xRead.Section);
@@ -1687,7 +1499,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
                                         up(&Adapter->NVMRdmWrmLock);
-                                        bcm_kfree(pReadBuff);
+                                        kfree(pReadBuff);
                                         return -EACCES;
                                 }
 
@@ -1715,7 +1527,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         if(Status)
                                         {
                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Copy to use failed with status :%d", Status);
-                                                Status = -EFAULT;
                                                 break;
                                         }
                                         NOB = NOB - ReadBytes;
@@ -1727,15 +1538,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
                                 }
                                 up(&Adapter->NVMRdmWrmLock);
-                                bcm_kfree(pReadBuff);
+                                kfree(pReadBuff);
 
                          }
                          break ;
                 case IOCTL_BCM_FLASH2X_SECTION_WRITE :
                          {
                                 FLASH2X_READWRITE sFlash2xWrite = {0};
-                                PUCHAR pWriteBuff = NULL;
-                                void __user *InputAddr = NULL;
+                                PUCHAR pWriteBuff;
+                                void __user *InputAddr;
                                 UINT NOB = 0;
                                 UINT BuffSize = 0;
                                 UINT WriteOffset = 0;
@@ -1752,33 +1563,17 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
-                                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                                         return -EFAULT;
-                                }
 
                                 //Reading FLASH 2.x READ structure
-                                Status = copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Reading of output Buffer from IOCTL buffer fails");
+                                if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
                                         return -EFAULT;
-                                }
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.Section :%x" ,sFlash2xWrite.Section);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.offset :%d" ,sFlash2xWrite.offset);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.numOfBytes :%x" ,sFlash2xWrite.numOfBytes);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.bVerify :%x\n" ,sFlash2xWrite.bVerify);
-                                #if 0
-                                if((sFlash2xWrite.Section == ISO_IMAGE1) ||(sFlash2xWrite.Section == ISO_IMAGE2) ||
-                                        (sFlash2xWrite.Section == DSD0) || (sFlash2xWrite.Section == DSD1) || (sFlash2xWrite.Section == DSD2))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"ISO/DSD Image write is not allowed....  ");
-                                        return STATUS_FAILURE ;
-                                }
-                                #endif
                                 if((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) &&
                                         (sFlash2xWrite.Section != VSA2) )
                                 {
@@ -1798,12 +1593,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 else
                                         BuffSize = NOB ;
 
-                                pWriteBuff = (PCHAR)kmalloc(BuffSize, GFP_KERNEL);
+                                pWriteBuff = kmalloc(BuffSize, GFP_KERNEL);
                                 if(pWriteBuff == NULL)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Memory allocation failed for Flash 2.x Read Structure");
                                         return -ENOMEM;
-                                }
+
 
                                 //extracting the remainder of the given offset.
                                 WriteBytes = Adapter->uiSectorSize ;
@@ -1820,7 +1613,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
                                         up(&Adapter->NVMRdmWrmLock);
-                                        bcm_kfree(pWriteBuff);
+                                        kfree(pWriteBuff);
                                         return -EACCES;
                                 }
 
@@ -1831,7 +1624,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         if(Status)
                                         {
                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Copy to user failed with status :%d", Status);
-                                                Status = -EFAULT;
                                                 break ;
                                         }
                                         BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,pWriteBuff,WriteBytes);
@@ -1859,28 +1651,22 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 }       while(NOB > 0);
                                 BcmFlash2xWriteSig(Adapter,sFlash2xWrite.Section);
                                 up(&Adapter->NVMRdmWrmLock);
-                                bcm_kfree(pWriteBuff);
+                                kfree(pWriteBuff);
                          }
                          break ;
                 case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP :
                          {
 
-                                PFLASH2X_BITMAP psFlash2xBitMap = NULL ;
+                                 PFLASH2X_BITMAP psFlash2xBitMap;
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
 
-                                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                                         return -EFAULT;
-                                }
+
                                 if(IoBuffer.OutputLength != sizeof(FLASH2X_BITMAP))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Structure size mismatch Lib :0x%lx Driver :0x%zx ",IoBuffer.OutputLength, sizeof(FLASH2X_BITMAP));
-                                        break;
-                                }
+                                        return -EINVAL;
 
-                                psFlash2xBitMap = (PFLASH2X_BITMAP)kzalloc(sizeof(FLASH2X_BITMAP), GFP_KERNEL);
+                                psFlash2xBitMap = kzalloc(sizeof(FLASH2X_BITMAP), GFP_KERNEL);
                                 if(psFlash2xBitMap == NULL)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Memory is not available");
@@ -1895,20 +1681,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
                                         up(&Adapter->NVMRdmWrmLock);
-                                        bcm_kfree(psFlash2xBitMap);
+                                        kfree(psFlash2xBitMap);
                                         return -EACCES;
                                 }
 
                                 BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
                                 up(&Adapter->NVMRdmWrmLock);
-                                Status = copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copying Flash2x bitMap failed");
-                                        bcm_kfree(psFlash2xBitMap);
-                                        return -EFAULT;
-                                }
-                                bcm_kfree(psFlash2xBitMap);
+                                if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP)))
+                                        Status = -EFAULT;
+
+                                kfree(psFlash2xBitMap);
                          }
                          break ;
                 case IOCTL_BCM_SET_ACTIVE_SECTION :
@@ -1926,14 +1708,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                                        return -EFAULT;
+                                        return Status;
                                 }
 
                                 Status = copy_from_user(&eFlash2xSectionVal,IoBuffer.InputBuffer, sizeof(INT));
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
-                                        return -EFAULT;
+                                        return Status;
                                 }
 
                                 down(&Adapter->NVMRdmWrmLock);
@@ -1961,29 +1743,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 Adapter->bAllDSDWriteAllow = FALSE ;
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
 
-                                #if 0
-                                SECTION_TYPE section = 0 ;
-
-
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION Called");
-                                Status = copy_from_user((PCHAR)&IoBuffer, (PCHAR)arg, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of IOCTL BUFFER failed");
-                                        return -EFAULT;
-                                }
-                                Status = copy_from_user((PCHAR)section,(PCHAR)&IoBuffer, sizeof(INT));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of section type failed failed");
-                                        return -EFAULT;
-                                }
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Read Section :%d", section);
-                                if(section == DSD)
-                                        Adapter->ulFlashCalStart = Adapter->uiActiveDSDOffsetAtFwDld ;
-                                else
-                                        Status = STATUS_FAILURE ;
-                                #endif
                                 Status = STATUS_SUCCESS ;
                          }
                          break ;
@@ -2004,14 +1763,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
-                                        return -EFAULT;
+                                        return Status;
                                 }
 
-                                Status = copy_from_user(&sCopySectStrut,IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));
+                                Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
-                                        return -EFAULT;
+                                        return Status;
                                 }
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source SEction :%x", sCopySectStrut.SrcSection);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Destination SEction :%x", sCopySectStrut.DstSection);
@@ -2082,7 +1841,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                                        Status = -EFAULT;
                                         break;
                                 }
                                 if(Adapter->eNVMType != NVM_FLASH)
@@ -2095,35 +1853,18 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 {
 
                                         if(IoBuffer.OutputLength < sizeof(FLASH2X_CS_INFO))
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0," Passed buffer size:0x%lX is insufficient for the CS structure.. \nRequired size :0x%zx ",IoBuffer.OutputLength, sizeof(FLASH2X_CS_INFO));
-                                                Status = -EINVAL;
-                                                break;
-                                        }
+                                                return -EINVAL;
 
-                                        Status = copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(FLASH2X_CS_INFO));
-                                        if(Status)
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copying Flash2x cs info failed");
-                                                Status = -EFAULT;
-                                                break;
-                                        }
+                                        if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(FLASH2X_CS_INFO)))
+                                                return -EFAULT;
                                 }
                                 else
                                 {
                                         if(IoBuffer.OutputLength < sizeof(FLASH_CS_INFO))
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0," Passed buffer size:0x%lX is insufficient for the CS structure.. Required size :0x%zx ",IoBuffer.OutputLength, sizeof(FLASH_CS_INFO));
-                                                Status = -EINVAL;
-                                                break;
-                                        }
-                                        Status = copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(FLASH_CS_INFO));
-                                        if(Status)
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copying Flash CS info failed");
-                                                Status = -EFAULT;
-                                                break;
-                                        }
+                                                return -EINVAL;
+
+                                        if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(FLASH_CS_INFO)))
+                                                return -EFAULT;
 
                                  }
                           }
@@ -2145,13 +1886,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                                        return -EFAULT;
+                                        return Status;
                                 }
-                                Status = copy_from_user(&eFlash2xSectionVal,IoBuffer.InputBuffer, sizeof(INT));
+                                Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
-                                        return -EFAULT;
+                                        return Status;
                                 }
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Read Section :%d", eFlash2xSectionVal);
@@ -2181,13 +1922,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 case IOCTL_BCM_NVM_RAW_READ :
                          {
 
-                                NVM_READWRITE  stNVMRead = {};
+                                 NVM_READWRITE stNVMRead;
                                 INT NOB ;
                                 INT BuffSize ;
                                 INT ReadOffset = 0;
                                 UINT ReadBytes = 0 ;
-                                PUCHAR pReadBuff = NULL ;
-                                char __user *OutPutBuff = NULL ;
+                                PUCHAR pReadBuff;
+                                void __user *OutPutBuff;
 
                                 if(Adapter->eNVMType != NVM_FLASH)
                                 {
@@ -2204,10 +1945,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 }
 
                                 if(copy_from_user(&stNVMRead, IoBuffer.OutputBuffer,sizeof(NVM_READWRITE)))
-                                {
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                        return -EFAULT;
 
                                 NOB = stNVMRead.uiNumBytes;
                                 //In Raw-Read max Buff size : 64MB
@@ -2217,11 +1955,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 else
                                         BuffSize = NOB ;
 
-                                ReadOffset = stNVMRead.uiOffset ;
+                                ReadOffset = stNVMRead.uiOffset;
                                 OutPutBuff = stNVMRead.pBuffer;
 
-
-                                pReadBuff = (PCHAR)kzalloc(BuffSize , GFP_KERNEL);
+                                pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
                                 if(pReadBuff == NULL)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Memory allocation failed for Flash 2.x Read Structure");
@@ -2235,7 +1972,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                         (Adapter->bPreparingForLowPowerMode ==TRUE))
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
-                                        bcm_kfree(pReadBuff);
+                                        kfree(pReadBuff);
                                         up(&Adapter->NVMRdmWrmLock);
                                         return -EACCES;
                                 }
@@ -2256,13 +1993,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                                 break;
                                         }
 
-                                        BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,pReadBuff, ReadBytes);
+                                        BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,pReadBuff,ReadBytes);
 
                                         Status = copy_to_user(OutPutBuff, pReadBuff,ReadBytes);
                                         if(Status)
                                         {
                                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Copy to use failed with status :%d", Status);
-                                                Status = -EFAULT;
                                                 break;
                                         }
                                         NOB = NOB - ReadBytes;
@@ -2275,7 +2011,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 }
                                 Adapter->bFlashRawRead = FALSE ;
                                 up(&Adapter->NVMRdmWrmLock);
-                                bcm_kfree(pReadBuff);
+                                kfree(pReadBuff);
                                 break ;
                          }
 
@@ -2288,7 +2024,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"copy of Ioctl buffer is failed from user space");
-                                        Status = -EFAULT;
                                         break;
                                 }
 
@@ -2296,7 +2031,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 if(Status)
                                 {
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"copy of control bit mask failed from user space");
-                                        Status = -EFAULT;
                                         break;
                                 }
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\n Got user defined cntrl msg bit mask :%lx", RxCntrlMsgBitMask);
@@ -2315,71 +2049,44 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                 DevInfo.u32NVMType = Adapter->eNVMType;
                                 DevInfo.u32InterfaceType = BCM_USB;
 
-                                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                        return -EFAULT;
+
                                 if(IoBuffer.OutputLength < sizeof(DevInfo))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"User Passed buffer length is less than actural buffer size");
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"user passed buffer size :0x%lX, expected size :0x%zx",IoBuffer.OutputLength, sizeof(DevInfo));
-                                        Status = -EINVAL;
-                                        break;
-                                }
-                                Status = copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"copying Dev info structure to user space buffer failed");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                        return -EINVAL;
+
+                                if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))
+                                        return -EFAULT;
                         }
                         break ;
 
                         case IOCTL_BCM_TIME_SINCE_NET_ENTRY:
                         {
                                 ST_TIME_ELAPSED stTimeElapsedSinceNetEntry = {0};
-                                struct timeval tv = {0} ;
 
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
 
-                                Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
+                                        return -EFAULT;
+
                                 if(IoBuffer.OutputLength < sizeof(ST_TIME_ELAPSED))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"User Passed buffer length:0x%lx is less than expected buff size :0x%zX",IoBuffer.OutputLength,sizeof(ST_TIME_ELAPSED));
-                                        Status = -EINVAL;
-                                        break;
-                                }
+                                        return -EINVAL;
 
-                                //stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = Adapter->liTimeSinceLastNetEntry;
-                                do_gettimeofday(&tv);
-                                stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = tv.tv_sec - Adapter->liTimeSinceLastNetEntry;
+                                stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
 
-                                Status = copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(ST_TIME_ELAPSED));
-                                if(Status)
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"copying ST_TIME_ELAPSED structure to user space buffer failed");
-                                        Status = -EFAULT;
-                                        break;
-                                }
+                                if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(ST_TIME_ELAPSED)))
+                                        return -EFAULT;
 
                         }
                         break;
 
-                default:
-            BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "wrong input %x",cmd);
-                        BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In default ioctl %d\n", cmd);
-                         Status = STATUS_FAILURE;
+                case IOCTL_CLOSE_NOTIFICATION:
+                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_CLOSE_NOTIFICATION");
+                        break;
 
+                default:
+                        pr_info(DRV_NAME ": unknown ioctl cmd=%#x\n", cmd);
+                        Status = STATUS_FAILURE;
                         break;
         }
         return Status;
@@ -2395,59 +2102,37 @@ static struct file_operations bcm_fops = {
         .llseek = no_llseek,
 };
 
+extern struct class *bcm_class;
 
 int register_control_device_interface(PMINI_ADAPTER Adapter)
 {
+
         if(Adapter->major>0)
-        return Adapter->major;
-    Adapter->major = register_chrdev(0, "tarang", &bcm_fops);
-    if(Adapter->major < 0)
-    {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "register_chrdev:Failed to registering WiMax control char device!");
-        return Adapter->major;
-    }
-
-        bcm_class = NULL;
-        bcm_class = class_create (THIS_MODULE, "tarang");
-        if(IS_ERR (bcm_class))
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unable to create class\n");
-        unregister_chrdev(Adapter->major, "tarang");
-                Adapter->major = 0;
-                return -ENODEV;
+                return Adapter->major;
+
+        Adapter->major = register_chrdev(0, DEV_NAME, &bcm_fops);
+        if(Adapter->major < 0) {
+                pr_err(DRV_NAME ": could not created character device\n");
+                return Adapter->major;
         }
+
         Adapter->pstCreatedClassDevice = device_create (bcm_class, NULL,
-                                                                MKDEV(Adapter->major, 0),
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
-                                                                NULL    ,
-#endif
-                                                                "tarang");
+                                                        MKDEV(Adapter->major, 0), Adapter,
+                                                        DEV_NAME);
 
-        if(IS_ERR(Adapter->pstCreatedClassDevice))
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "class device did not get created : %ld", PTR_ERR(Adapter->pstCreatedClassDevice) );
+        if(IS_ERR(Adapter->pstCreatedClassDevice)) {
+                pr_err(DRV_NAME ": class device create failed\n");
+                unregister_chrdev(Adapter->major, DEV_NAME);
+                return PTR_ERR(Adapter->pstCreatedClassDevice);
         }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Got Major No: %d", Adapter->major);
-    return 0;
+                        
+        return 0;
 }
 
 void unregister_control_device_interface(PMINI_ADAPTER Adapter)
 {
-        if(Adapter->major > 0)
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "destroying class device");
+        if(Adapter->major > 0) {
                 device_destroy (bcm_class, MKDEV(Adapter->major, 0));
+                unregister_chrdev(Adapter->major, DEV_NAME);
         }
-    if(!IS_ERR(bcm_class))
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "destroying created class ");
-        class_destroy (bcm_class);
-                bcm_class = NULL;
-        }
-        if(Adapter->major > 0)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"unregistering character interface");
-        unregister_chrdev(Adapter->major, "tarang");
-        }
-
 }
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index bc2969821421..a6ce2396c791 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -1,264 +1,238 @@
 #include "headers.h"
 
-static INT bcm_notify_event(struct notifier_block *nb, ULONG event, PVOID dev)
+struct net_device *gblpnetdev;
+
+static INT bcm_open(struct net_device *dev)
 {
-        struct net_device *ndev = (struct net_device*)dev;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-        //PMINI_ADAPTER         Adapter = (PMINI_ADAPTER)ndev->priv;
-        if(strncmp(ndev->name,gblpnetdev->name,5)==0)
-        {
-                switch(event)
-                {
-                        case NETDEV_CHANGEADDR:
-                        case NETDEV_GOING_DOWN:
-                                /*ignore this */
-                                        break;
-                        case NETDEV_DOWN:
-                                break;
-
-                        case NETDEV_UP:
-                                break;
-
-                        case NETDEV_REGISTER:
-                                 /* Increment the Reference Count for "veth0" */
-                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Register RefCount: %x\n",
-                                                                        netdev_refcnt_read(ndev));
-                                 dev_hold(ndev);
-                                 break;
-
-                        case NETDEV_UNREGISTER:
-                                 /* Decrement the Reference Count for "veth0" */
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregister RefCnt: %x\n",
-                                                                        netdev_refcnt_read(ndev));
-                                dev_put(ndev);
-                                break;
-                };
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+
+        if (Adapter->fw_download_done == FALSE) {
+                pr_notice(PFX "%s: link up failed (download in progress)\n",
+                          dev->name);
+                return -EBUSY;
         }
-        return NOTIFY_DONE;
-}
 
-/* Notifier block to receive netdevice events */
-static struct notifier_block bcm_notifier_block =
-{
-        .notifier_call = bcm_notify_event,
-};
+        if (netif_msg_ifup(Adapter))
+                pr_info(PFX "%s: enabling interface\n", dev->name);
 
-struct net_device *gblpnetdev;
-/***************************************************************************************/
-/* proto-type of lower function */
-#ifdef BCM_SHM_INTERFACE
-const char *bcmVirtDeviceName="bcmeth";
-#endif
+        if (Adapter->LinkUpStatus) {
+                if (netif_msg_link(Adapter))
+                        pr_info(PFX "%s: link up\n", dev->name);
 
-static INT bcm_open(struct net_device *dev)
-{
-    PMINI_ADAPTER Adapter = NULL ; //(PMINI_ADAPTER)dev->priv;
-        Adapter = GET_BCM_ADAPTER(dev);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "======>");
-    if(Adapter->fw_download_done==FALSE)
-        return -EINVAL;
-        Adapter->if_up=1;
-        if(Adapter->LinkUpStatus == 1){
-                if(netif_queue_stopped(Adapter->dev)){
-                        netif_carrier_on(Adapter->dev);
-                        netif_start_queue(Adapter->dev);
-                }
+                netif_carrier_on(Adapter->dev);
+                netif_start_queue(Adapter->dev);
         }
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "<======");
-    return 0;
+        return 0;
 }
 
 static INT bcm_close(struct net_device *dev)
 {
-   PMINI_ADAPTER Adapter = NULL ;//gpadapter ;
-   Adapter = GET_BCM_ADAPTER(dev);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "=====>");
-        Adapter->if_up=0;
-        if(!netif_queue_stopped(dev)) {
-                netif_carrier_off(dev);
-            netif_stop_queue(dev);
-        }
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"<=====");
-    return 0;
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+
+        if (netif_msg_ifdown(Adapter))
+                pr_info(PFX "%s: disabling interface\n", dev->name);
+
+        netif_carrier_off(dev);
+        netif_stop_queue(dev);
+
+        return 0;
+}
+
+static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        return ClassifyPacket(netdev_priv(dev), skb);
 }
 
-static struct net_device_stats *bcm_get_stats(struct net_device *dev)
+/*******************************************************************
+* Function    - bcm_transmit()
+*
+* Description - This is the main transmit function for our virtual
+*               interface(eth0). It handles the ARP packets. It
+*               clones this packet and then Queue it to a suitable
+*               Queue. Then calls the transmit_packet().
+*
+* Parameter   -  skb - Pointer to the socket buffer structure
+*                dev - Pointer to the virtual net device structure
+*
+*********************************************************************/
+
+static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 {
-    PLINUX_DEP_DATA pLinuxData=NULL;
-        PMINI_ADAPTER Adapter = NULL ;// gpadapter ;
-        Adapter = GET_BCM_ADAPTER(dev);
-    pLinuxData = (PLINUX_DEP_DATA)(Adapter->pvOsDepData);
-
-    //BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Dev = %p, pLinuxData = %p", dev, pLinuxData);
-        pLinuxData->netstats.rx_packets=atomic_read(&Adapter->RxRollOverCount)*64*1024+Adapter->PrevNumRecvDescs;
-        pLinuxData->netstats.rx_bytes=atomic_read(&Adapter->GoodRxByteCount)+atomic_read(&Adapter->BadRxByteCount);
-        pLinuxData->netstats.rx_dropped=atomic_read(&Adapter->RxPacketDroppedCount);
-        pLinuxData->netstats.rx_errors=atomic_read(&Adapter->RxPacketDroppedCount);
-        pLinuxData->netstats.rx_length_errors=0;
-        pLinuxData->netstats.rx_frame_errors=0;
-        pLinuxData->netstats.rx_crc_errors=0;
-        pLinuxData->netstats.tx_bytes=atomic_read(&Adapter->GoodTxByteCount);
-        pLinuxData->netstats.tx_packets=atomic_read(&Adapter->TxTotalPacketCount);
-        pLinuxData->netstats.tx_dropped=atomic_read(&Adapter->TxDroppedPacketCount);
-
-    return &(pLinuxData->netstats);
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+        u16 qindex = skb_get_queue_mapping(skb);
+
+
+        if (Adapter->device_removed || !Adapter->LinkUpStatus)
+                goto drop;
+
+        if (Adapter->TransferMode != IP_PACKET_ONLY_MODE)
+                goto drop;
+
+        if (INVALID_QUEUE_INDEX == qindex)
+                goto drop;
+
+        if (Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >=
+            SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
+                return NETDEV_TX_BUSY;
+
+        /* Now Enqueue the packet */
+        if (netif_msg_tx_queued(Adapter))
+                pr_info(PFX "%s: enqueueing packet to queue %d\n",
+                        dev->name, qindex);
+
+        spin_lock(&Adapter->PackInfo[qindex].SFQueueLock);
+        Adapter->PackInfo[qindex].uiCurrentBytesOnHost += skb->len;
+        Adapter->PackInfo[qindex].uiCurrentPacketsOnHost++;
+
+        *((B_UINT32 *) skb->cb + SKB_CB_LATENCY_OFFSET) = jiffies;
+        ENQUEUEPACKET(Adapter->PackInfo[qindex].FirstTxQueue,
+                      Adapter->PackInfo[qindex].LastTxQueue, skb);
+        atomic_inc(&Adapter->TotalPacketCount);
+        spin_unlock(&Adapter->PackInfo[qindex].SFQueueLock);
+
+        /* FIXME - this is racy and incorrect, replace with work queue */
+        if (!atomic_read(&Adapter->TxPktAvail)) {
+                atomic_set(&Adapter->TxPktAvail, 1);
+                wake_up(&Adapter->tx_packet_wait_queue);
+        }
+        return NETDEV_TX_OK;
+
+ drop:
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
 }
+
+
+
 /**
 @ingroup init_functions
 Register other driver entry points with the kernel
 */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-static struct net_device_ops bcmNetDevOps = {
+static const struct net_device_ops bcmNetDevOps = {
     .ndo_open           = bcm_open,
     .ndo_stop           = bcm_close,
-    .ndo_get_stats      = bcm_get_stats,
     .ndo_start_xmit     = bcm_transmit,
     .ndo_change_mtu     = eth_change_mtu,
     .ndo_set_mac_address = eth_mac_addr,
     .ndo_validate_addr  = eth_validate_addr,
+    .ndo_select_queue   = bcm_select_queue,
 };
-#endif
 
-int register_networkdev(PMINI_ADAPTER Adapter)
+static struct device_type wimax_type = {
+        .name   = "wimax",
+};
+
+static int bcm_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        int result=0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-        void **temp = NULL; /* actually we're *allocating* the device in alloc_etherdev */
-#endif
-        Adapter->dev = alloc_etherdev(sizeof(PMINI_ADAPTER));
-        if(!Adapter->dev)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "ERR: No Dev");
-                return -ENOMEM;
-        }
-        gblpnetdev                                                      = Adapter->dev;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-        Adapter->dev->priv                              = Adapter;
-#else
-        temp = netdev_priv(Adapter->dev);
-        *temp = (void *)Adapter;
-#endif
-        //BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "init adapterptr: %x %x\n", (UINT)Adapter, temp);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-        Adapter->dev->netdev_ops                = &bcmNetDevOps;
-#else
-        Adapter->dev->open                              = bcm_open;
-        Adapter->dev->stop                      = bcm_close;
-        Adapter->dev->get_stats                 = bcm_get_stats;
-        Adapter->dev->hard_start_xmit           = bcm_transmit;
-        Adapter->dev->hard_header_len           = ETH_HLEN + LEADER_SIZE;
-#endif
-
-#ifndef BCM_SHM_INTERFACE
-        Adapter->dev->mtu                                       = MTU_SIZE; /* 1400 Bytes */
-        /* Read the MAC Address from EEPROM */
-        ReadMacAddressFromNVM(Adapter);
+        cmd->supported          = 0;
+        cmd->advertising        = 0;
+        cmd->speed              = SPEED_10000;
+        cmd->duplex             = DUPLEX_FULL;
+        cmd->port               = PORT_TP;
+        cmd->phy_address        = 0;
+        cmd->transceiver        = XCVR_INTERNAL;
+        cmd->autoneg            = AUTONEG_DISABLE;
+        cmd->maxtxpkt           = 0;
+        cmd->maxrxpkt           = 0;
+        return 0;
+}
 
+static void bcm_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+        PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
+        struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
 
-        /* Register the notifier block for getting netdevice events */
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Registering netdevice notifier\n");
-        result = register_netdevice_notifier(&bcm_notifier_block);
-        if(result)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "BCM Notifier Block did not get registered");
-                Adapter->bNetdeviceNotifierRegistered = FALSE;
-                return result;
-        }
-        else
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "BCM Notifier got Registered");
-                Adapter->bNetdeviceNotifierRegistered = TRUE;
-        }
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u",
+                 Adapter->uiFlashLayoutMajorVersion,
+                 Adapter->uiFlashLayoutMinorVersion);
 
-#else
-
-        Adapter->dev->mtu                       = CPE_MTU_SIZE;
-
-#if 0
-        //for CPE - harcode the virtual mac address
-        Adapter->dev->dev_addr[0] =  MII_WIMAX_MACADDRESS[0];
-        Adapter->dev->dev_addr[1] =  MII_WIMAX_MACADDRESS[1];
-        Adapter->dev->dev_addr[2] =  MII_WIMAX_MACADDRESS[2];
-        Adapter->dev->dev_addr[3] =  MII_WIMAX_MACADDRESS[3];
-        Adapter->dev->dev_addr[4] =  MII_WIMAX_MACADDRESS[4];
-        Adapter->dev->dev_addr[5] =  MII_WIMAX_MACADDRESS[5];
-#else
-        ReadMacAddressFromNVM(Adapter);
-#endif
-        strcpy(Adapter->dev->name, bcmVirtDeviceName); //Copy the device name
-
-#endif
-
-        result = register_netdev(Adapter->dev);
-        if (!result)
-        {
-                Adapter->bNetworkInterfaceRegistered = TRUE ;
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Beceem Network device name is %s!", Adapter->dev->name);
-        }
-        else
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Network device can not be registered!");
-                Adapter->bNetworkInterfaceRegistered = FALSE ;
-                return result;
-        }
+        usb_make_path(udev, info->bus_info, sizeof(info->bus_info));
+}
 
-#if 0
- Adapter->stDebugState.debug_level = DBG_LVL_CURR;
- Adapter->stDebugState.type =(UINT)0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_OTHERS] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_RX] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_TX] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xffffffff;
+static u32 bcm_get_link(struct net_device *dev)
+{
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
 
- printk("-------ps_adapter->stDebugState.type=%x\n",Adapter->stDebugState.type);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_OTHERS]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_OTHERS]);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_RX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_RX]);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_TX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_TX]);
-#endif
+        return Adapter->LinkUpStatus;
+}
 
-        return 0;
+static u32 bcm_get_msglevel (struct net_device *dev)
+{
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+
+        return Adapter->msg_enable;
 }
 
-void bcm_unregister_networkdev(PMINI_ADAPTER Adapter)
+static void bcm_set_msglevel (struct net_device *dev, u32 level)
 {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregistering the Net Dev...\n");
-        if(Adapter->dev && !IS_ERR(Adapter->dev) && Adapter->bNetworkInterfaceRegistered)
-                unregister_netdev(Adapter->dev);
-                /* Unregister the notifier block */
-        if(Adapter->bNetdeviceNotifierRegistered == TRUE)
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregistering netdevice notifier\n");
-                        unregister_netdevice_notifier(&bcm_notifier_block);
-  }
+        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
+
+        Adapter->msg_enable = level;
 }
 
-static int bcm_init(void)
+static const struct ethtool_ops bcm_ethtool_ops = {
+        .get_settings   = bcm_get_settings,
+        .get_drvinfo    = bcm_get_drvinfo,
+        .get_link       = bcm_get_link,
+        .get_msglevel   = bcm_get_msglevel,
+        .set_msglevel   = bcm_set_msglevel,
+};
+
+int register_networkdev(PMINI_ADAPTER Adapter)
 {
+        struct net_device *net = Adapter->dev;
+        PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+        struct usb_interface *udev = IntfAdapter->interface;
+        struct usb_device *xdev = IntfAdapter->udev;
+
         int result;
-        result = InterfaceInitialize();
-        if(result)
-        {
-                printk("Initialisation failed for usbbcm");
-        }
-        else
-        {
-                printk("Initialised usbbcm");
+
+        net->netdev_ops = &bcmNetDevOps;
+        net->ethtool_ops = &bcm_ethtool_ops;
+        net->mtu = MTU_SIZE;    /* 1400 Bytes */
+        net->tx_queue_len = TX_QLEN;
+        net->flags |= IFF_NOARP;
+
+        netif_carrier_off(net);
+
+        SET_NETDEV_DEVTYPE(net, &wimax_type);
+
+        /* Read the MAC Address from EEPROM */
+        result = ReadMacAddressFromNVM(Adapter);
+        if (result != STATUS_SUCCESS) {
+                dev_err(&udev->dev,
+                        PFX "Error in Reading the mac Address: %d", result);
+                return -EIO;
         }
-        return result;
-}
 
+        result = register_netdev(net);
+        if (result)
+                return result;
 
-static void bcm_exit(void)
-{
-    printk("%s %s Calling InterfaceExit\n",__FILE__, __FUNCTION__);
-        InterfaceExit();
-    printk("%s %s InterfaceExit returned\n",__FILE__, __FUNCTION__);
-}
+        gblpnetdev = Adapter->dev;
 
-module_init(bcm_init);
-module_exit(bcm_exit);
-MODULE_LICENSE ("GPL");
+        if (netif_msg_probe(Adapter))
+                dev_info(&udev->dev, PFX "%s: register usb-%s-%s %pM\n",
+                         net->name, xdev->bus->bus_name, xdev->devpath,
+                         net->dev_addr);
 
+        return 0;
+}
 
+void unregister_networkdev(PMINI_ADAPTER Adapter)
+{
+        struct net_device *net = Adapter->dev;
+        PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+        struct usb_interface *udev = IntfAdapter->interface;
+        struct usb_device *xdev = IntfAdapter->udev;
+
+        if (netif_msg_probe(Adapter))
+                dev_info(&udev->dev, PFX "%s: unregister usb-%s%s\n",
+                         net->name, xdev->bus->bus_name, xdev->devpath);
+ 
+        unregister_netdev(Adapter->dev);
+}
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 6f388a374ddc..5ac45820d564 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -15,6 +15,7 @@ typedef enum _E_CLASSIFIER_ACTION
         eDeleteClassifier
 }E_CLASSIFIER_ACTION;
 
+static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid);
 
 /************************************************************
 * Function        -     SearchSfid
@@ -28,7 +29,7 @@ typedef enum _E_CLASSIFIER_ACTION
 * Returns         - Queue index for this SFID(If matched)
                                 Else Invalid Queue Index(If Not matched)
 ************************************************************/
-__inline INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
+INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
 {
         INT     iIndex=0;
         for(iIndex=(NO_OF_QUEUES-1); iIndex>=0; iIndex--)
@@ -47,26 +48,16 @@ __inline INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
 * Returns         - Queue index for the free SFID
 *                               Else returns Invalid Index.
 ****************************************************************/
-__inline INT SearchFreeSfid(PMINI_ADAPTER Adapter)
+static INT SearchFreeSfid(PMINI_ADAPTER Adapter)
 {
         UINT    uiIndex=0;
+
         for(uiIndex=0; uiIndex < (NO_OF_QUEUES-1); uiIndex++)
                 if(Adapter->PackInfo[uiIndex].ulSFID==0)
                         return uiIndex;
         return NO_OF_QUEUES+1;
 }
 
-__inline int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid)
-{
-         int iIndex=0;
-        for(iIndex=(NO_OF_QUEUES-1);iIndex>=0;iIndex--)
-                if(Adapter->PackInfo[iIndex].usVCID_Value == usVcid)
-                        return iIndex;
-        return NO_OF_QUEUES+1;
-
-}
-
-
 /*
 Function:                               SearchClsid
 Description:                    This routinue would search Classifier  having specified ClassifierID as input parameter
@@ -76,7 +67,7 @@ Input parameters:		PMINI_ADAPTER Adapter - Adapter Context
 Return:                                 int :Classifier table index of matching entry
 */
 
-__inline int SearchClsid(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16  uiClassifierID)
+static int SearchClsid(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16  uiClassifierID)
 {
         unsigned int uiClassifierIndex = 0;
         for(uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++)
@@ -94,7 +85,7 @@ __inline int SearchClsid(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16  uiClassifi
 This routinue would search Free available Classifier entry in classifier table.
 @return free Classifier Entry index in classifier table for specified SF
 */
-static __inline int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/
+static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/
                                                 )
 {
         unsigned int uiClassifierIndex = 0;
@@ -106,7 +97,7 @@ static __inline int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/
         return MAX_CLASSIFIERS+1;
 }
 
-VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
+static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
 {
         //deleting all the packet held in the SF
         flush_queue(Adapter,uiSearchRuleIndex);
@@ -985,7 +976,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
         if(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication)
         {
-                bcm_kfree(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication);
+                kfree(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication);
                 Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = NULL;
         }
         Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = pstAddIndication;
@@ -1061,12 +1052,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X",
                 pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate   : 0x%X",
-                pstAddIndication->sfAuthorizedSet.u32MinimumTolerableTrafficRate);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32RequesttransmissionPolicy     : 0x%X",
-                pstAddIndication->sfAuthorizedSet.u32RequesttransmissionPolicy);
-#endif
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength    : 0x%X",
                 pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam          : 0x%X",
@@ -1114,13 +1099,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 pstAddIndication->sfAuthorizedSet.u8PagingPreference);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16UnsolicitedPollingInterval            : 0x%X",
                 pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignmentLength        : 0x%X",
-                pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignmentLength);
-        for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignment : 0x%X",
-                        pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "sfAuthorizedSet.u8HARQChannelMapping %x  %x %x ",
                                 *(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
@@ -1158,11 +1136,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u8ProtocolLength                             :0x%X ",
-                        psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
 
                 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol : 0x%02X ",
@@ -1278,14 +1251,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                         pstAddIndication->sfAdmittedSet.u8QosParamSet);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority                        : 0x%02X",
                         pstAddIndication->sfAdmittedSet.u8TrafficPriority);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MaxSustainedTrafficRate   : 0x%02X",
-                        ntohl(pstAddIndication->sfAdmittedSet.u32MaxSustainedTrafficRate));
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate       : 0x%X",
-                pstAddIndication->sfAdmittedSet.u32MinimumTolerableTrafficRate);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32RequesttransmissionPolicy : 0x%X",
-                pstAddIndication->sfAdmittedSet.u32RequesttransmissionPolicy);
-#endif
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst                       : 0x%X",
                         pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate        : 0x%X",
@@ -1339,13 +1304,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 pstAddIndication->sfAdmittedSet.u16TimeBase);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8PagingPreference               : 0x%X",
                 pstAddIndication->sfAdmittedSet.u8PagingPreference);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignmentLength        : 0x%X",
-                pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignmentLength);
-        for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignment : 0x%X",
-        pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
 
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficIndicationPreference    : 0x%02X",
@@ -1378,11 +1336,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolLength                 :0x%02X ",
-                        psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
                 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol: 0x%02X ",
                         psfCSType->cCPacketClassificationRule.u8Protocol);
@@ -1497,20 +1450,10 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 pstAddIndication->sfActiveSet.u8QosParamSet);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority                        : 0x%02X",
                 pstAddIndication->sfActiveSet.u8TrafficPriority);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MaxSustainedTrafficRate   : 0x%02X",
-                ntohl(pstAddIndication->sfActiveSet.u32MaxSustainedTrafficRate));
-#endif
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst                       : 0x%X",
                 pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate        : 0x%X",
                 pstAddIndication->sfActiveSet.u32MinReservedTrafficRate);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate       : 0x%X",
-                pstAddIndication->sfActiveSet.u32MinimumTolerableTrafficRate);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32RequesttransmissionPolicy : 0x%X",
-                pstAddIndication->sfActiveSet.u32RequesttransmissionPolicy);
-#endif
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParamLength   : 0x%02X",
                 pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParam         : 0x%02X",
@@ -1558,13 +1501,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 pstAddIndication->sfActiveSet.u16TimeBase);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8PagingPreference              : 0x%X",
                 pstAddIndication->sfActiveSet.u8PagingPreference);
-#if 0
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " MBSZoneIdentifierassignmentLength       : 0x%X",
-                pstAddIndication->sfActiveSet.MBSZoneIdentifierassignmentLength);
-        for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " MBSZoneIdentifierassignment : 0x%X",
-                pstAddIndication->sfActiveSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
 
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8TrafficIndicationPreference   : 0x%X",
@@ -1597,11 +1533,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                         psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " u8ProtocolLength                            :0x%X ",
-                        psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
                 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8Protocol      : 0x%X ",
                         psfCSType->cCPacketClassificationRule.u8Protocol);
@@ -1706,12 +1637,8 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
                 return 0;
         }
         ulAddrSFParamSet = ntohl(ulAddrSFParamSet);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " RestoreSFParam: Total Words of DSX Message To Read: 0x%zx  From Target At : 0x%lx ",
-                                nBytesToRead/sizeof(ULONG),ulAddrSFParamSet);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "sizeof(stServiceFlowParamSI) = %zx", sizeof(stServiceFlowParamSI));
 
         //Read out the SF Param Set At the indicated Location
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "nBytesToRead = %x", nBytesToRead);
         if(rdm(Adapter, ulAddrSFParamSet, (PUCHAR)pucDestBuffer, nBytesToRead) < 0)
                 return STATUS_FAILURE;
 
@@ -1719,23 +1646,20 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
 }
 
 
-static __inline ULONG StoreSFParam(PMINI_ADAPTER Adapter,PUCHAR pucSrcBuffer,ULONG  ulAddrSFParamSet)
+static ULONG StoreSFParam(PMINI_ADAPTER Adapter,PUCHAR pucSrcBuffer,ULONG  ulAddrSFParamSet)
 {
     UINT        nBytesToWrite = sizeof(stServiceFlowParamSI);
-        UINT    uiRetVal =0;
+        int ret = 0;
 
         if(ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
         {
                 return 0;
         }
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " StoreSFParam: Total Words of DSX Message To Write: 0x%zX  To Target At : 0x%lX ",(nBytesToWrite/sizeof(ULONG)),ulAddrSFParamSet);
 
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "WRM  with %x bytes",nBytesToWrite);
-
-        uiRetVal = wrm(Adapter,ulAddrSFParamSet,(PUCHAR)pucSrcBuffer, nBytesToWrite);
-        if(uiRetVal < 0) {
+        ret = wrm(Adapter, ulAddrSFParamSet, (u8 *)pucSrcBuffer, nBytesToWrite);
+        if (ret < 0) {
                 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "%s:%d WRM failed",__FUNCTION__, __LINE__);
-                return uiRetVal;
+                return ret;
         }
         return 1;
 }
@@ -1778,7 +1702,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
         }
         // For DSA_REQ, only upto "psfAuthorizedSet" parameter should be accessed by driver!
 
-        pstAddIndication=(stLocalSFAddIndication *)kmalloc(sizeof(*pstAddIndication), GFP_KERNEL);
+        pstAddIndication=kmalloc(sizeof(*pstAddIndication), GFP_KERNEL);
         if(NULL==pstAddIndication)
                 return 0;
 
@@ -1844,7 +1768,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
 
         (*puBufferLength) = sizeof(stLocalSFAddIndication);
         *(stLocalSFAddIndication *)pvBuffer = *pstAddIndication;
-        bcm_kfree(pstAddIndication);
+        kfree(pstAddIndication);
         return 1;
 }
 
@@ -1931,7 +1855,7 @@ static inline stLocalSFAddIndicationAlt
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============================================================");
         return pstAddIndicationDest;
 failed_restore_sf_param:
-        bcm_kfree(pstAddIndicationDest);
+        kfree(pstAddIndicationDest);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "<=====" );
         return NULL;
 }
@@ -1988,7 +1912,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
         return 1;
 }
 
-ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid)
+static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid)
 {
         ULONG  ulTargetDSXBufferAddress;
         ULONG  ulTargetDsxBufferIndexToUse,ulMaxTry;
@@ -2049,7 +1973,7 @@ INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter)
 {
         if(Adapter->caDsxReqResp)
         {
-                bcm_kfree(Adapter->caDsxReqResp);
+                kfree(Adapter->caDsxReqResp);
         }
         return 0;
 
@@ -2102,7 +2026,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 
                         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " VCID = %x", ntohs(pstAddIndication->u16VCID));
                         CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
-                        bcm_kfree(pstAddIndication);
+                        kfree(pstAddIndication);
                 }
                 break;
                 case DSA_RSP:
@@ -2118,7 +2042,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                 case DSA_ACK:
                 {
                         UINT uiSearchRuleIndex=0;
-                        struct timeval tv = {0};
+
                         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "VCID:0x%X",
                                 ntohs(pstAddIndication->u16VCID));
             uiSearchRuleIndex=SearchFreeSfid(Adapter);
@@ -2169,7 +2093,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                                         Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
                     Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
                                         Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
-                                        bcm_kfree(pstAddIndication);
+                                        kfree(pstAddIndication);
                                 }
 
                                 else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0))
@@ -2200,14 +2124,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                                                         if(!Adapter->LinkUpStatus)
                                                         {
                                                                 netif_carrier_on(Adapter->dev);
-                                                        netif_start_queue(Adapter->dev);
+                                                                netif_start_queue(Adapter->dev);
                                                                 Adapter->LinkUpStatus = 1;
-                                                                do_gettimeofday(&tv);
-
+                                                                if (netif_msg_link(Adapter))
+                                                                        pr_info(PFX "%s: link up\n", Adapter->dev->name);
                                                                 atomic_set(&Adapter->TxPktAvail, 1);
                                                                 wake_up(&Adapter->tx_packet_wait_queue);
-                                                                Adapter->liTimeSinceLastNetEntry = tv.tv_sec;
-                                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============Tx Service Flow Created!");
+                                                                Adapter->liTimeSinceLastNetEntry = get_seconds();
                                                         }
                                                 }
                                         }
@@ -2218,13 +2141,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                                         Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
                     Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
                                         Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
-                                        bcm_kfree(pstAddIndication);
+                                        kfree(pstAddIndication);
                                 }
                         }
                         else
                         {
                                 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSA ACK did not get valid SFID");
-                                bcm_kfree(pstAddIndication);
+                                kfree(pstAddIndication);
                                 return FALSE;
                         }
                 }
@@ -2239,7 +2162,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                         ((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
 
                         CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
-                        bcm_kfree(pstAddIndication);
+                        kfree(pstAddIndication);
                 }
                 break;
                 case DSC_RSP:
@@ -2312,13 +2235,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                                 else if(pstChangeIndication->u8CC == 6)
                                 {
                                         deleteSFBySfid(Adapter,uiSearchRuleIndex);
-                                        bcm_kfree(pstAddIndication);
+                                        kfree(pstAddIndication);
                                 }
                         }
                         else
                         {
                                 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSC ACK did not get valid SFID");
-                                bcm_kfree(pstAddIndication);
+                                kfree(pstAddIndication);
                                 return FALSE;
                         }
                 }
@@ -2355,7 +2278,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD ACK Rcd, let App handle it\n");
                         break;
         default:
-                bcm_kfree(pstAddIndication);
+                kfree(pstAddIndication);
                 return FALSE ;
         }
         return TRUE;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 847782c3765b..8f689769b4ba 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -150,8 +150,6 @@ typedef struct stLocalSFChangeIndicationAlt{
 
 ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *puBufferLength);
 
-ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid);
-
 INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);
 
 INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);
@@ -159,7 +157,6 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter);
 
 BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer);
 
-VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex);
 
 #pragma pack (pop)
 
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 8907e211d483..1c7db81a1ee8 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 
 #define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00
@@ -188,17 +187,6 @@ static DDR_SET_NODE asDPLL_266MHZ[] = {
                                         {0x0f000840,0x0FFF1B00},
                                         {0x0f000870,0x00000002}
                                                                           };
-#if 0
-static DDR_SET_NODE asDPLL_800MHZ[] = {
-                                                                                {0x0f000810,0x00000F95},
-                                                                                {0x0f000810,0x00000F95},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000820,0x03F1365B},
-                                        {0x0f000840,0x0FFF0000},
-                                        {0x0f000880,0x000003DD},
-                                        {0x0f000860,0x00000000}
-                                                                          };
-#endif
 
 #define T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 11  //index for 0x0F007000
 static DDR_SET_NODE asT3B_DDRSetting133MHz[] = {//      # DPLL Clock Setting
@@ -788,7 +776,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
 {
         PDDR_SETTING psDDRSetting=NULL;
         ULONG RegCount=0;
-        ULONG value = 0;
+        UINT value = 0;
         UINT  uiResetValue = 0;
         UINT uiClockSetting = 0;
         int retval = STATUS_SUCCESS;
@@ -982,7 +970,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
                 {
                         value = psDDRSetting->ulRegValue;
                 }
-                retval = wrmalt(Adapter, psDDRSetting->ulRegAddress, (PUINT)&value, sizeof(value));
+                retval = wrmalt(Adapter, psDDRSetting->ulRegAddress, &value, sizeof(value));
                 if(STATUS_SUCCESS != retval) {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__);
                         break;
@@ -1298,5 +1286,4 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
         return retval;
 }
 
-#endif
 
diff --git a/drivers/staging/bcm/Debug.c b/drivers/staging/bcm/Debug.c
deleted file mode 100644
index 2703f304756d..000000000000
--- a/drivers/staging/bcm/Debug.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "headers.h"
-
-static UINT current_debug_level=BCM_SCREAM;
-
-int bcm_print_buffer( UINT debug_level, const char *function_name,
-                                  char *file_name, int line_number, unsigned char *buffer, int bufferlen, enum _BASE_TYPE base)
-{
-        static const char * const buff_dump_base[] = {
-                "DEC", "HEX", "OCT", "BIN"
-        };
-        if(debug_level>=current_debug_level)
-        {
-                int i=0;
-                printk("\n%s:%s:%d:Buffer dump of size 0x%x in the %s:\n", file_name, function_name, line_number, bufferlen, buff_dump_base[1]);
-                for(;i<bufferlen;i++)
-                {
-                        if(i && !(i%16) )
-                                printk("\n");
-                        switch(base)
-                        {
-                                case BCM_BASE_TYPE_DEC:
-                                        printk("%03d ", buffer[i]);
-                                        break;
-                                case BCM_BASE_TYPE_OCT:
-                                        printk("%0x03o ", buffer[i]);
-                                        break;
-                                case BCM_BASE_TYPE_BIN:
-                                        printk("%02x ", buffer[i]);
-                                        break;
-                                case BCM_BASE_TYPE_HEX:
-                                default:
-                                        printk("%02X ", buffer[i]);
-                                        break;
-                        }
-                }
-                printk("\n");
-        }
-        return 0;
-}
-
-
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index 3d788b59ab57..3138729cf34f 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -9,34 +9,6 @@
 #include <linux/string.h>
 #define NONE 0xFFFF
 
-typedef enum _BASE_TYPE
-{
-        BCM_BASE_TYPE_DEC,
-        BCM_BASE_TYPE_OCT,
-        BCM_BASE_TYPE_BIN,
-        BCM_BASE_TYPE_HEX,
-        BCM_BASE_TYPE_NONE,
-} BASE_TYPE, *PBASE_TYPE;
-
-int bcm_print_buffer( UINT debug_level, const char *function_name,
-                                  char *file_name, int line_number, unsigned char *buffer, int bufferlen, BASE_TYPE base);
-
-#ifdef BCM_SHM_INTERFACE
-#define CPE_VIRTUAL_ERROR_CODE_BASE_ADDR                (0xBFC02E00 + 0x4C)
-// ERROR codes for debugging
-extern unsigned char u32ErrorCounter ;
-#define ERROR_DEVICE_REMOVED  0x1
-#define ERROR_LEADER_LENGTH_ZERO  0x2
-#define ERROR_LEADER_LENGTH_CORRUPTED  0x3
-#define ERROR_NO_SKBUFF  0x4
-
-#define ERROR_DL_MODULE 0xaa000000
-extern void  CPE_ERROR_LOG(unsigned int module,unsigned int code);
-
-#endif
-
-
-
 
 //--------------------------------------------------------------------------------
 
@@ -242,44 +214,34 @@ typedef struct _S_BCM_DEBUG_STATE {
 
 //--- Only for direct printk's; "hidden" to API.
 #define DBG_TYPE_PRINTK         3
-#define PRINTKS_ON                      1       // "hidden" from API, set to 0 to turn off all printk's
-
-#define BCM_DEBUG_PRINT(Adapter, Type, SubType, dbg_level, string, args...) do { \
-        if ((DBG_TYPE_PRINTK == Type) && (PRINTKS_ON)) {        \
-                printk ("%s:" string, __FUNCTION__, ##args);    \
-                printk("\n");   \
-        } else if (!Adapter)                    \
-                ;                                                       \
-        else {                                                  \
-                if (((dbg_level & DBG_LVL_BITMASK) <= Adapter->stDebugState.debug_level) &&     \
-                   ((Type & Adapter->stDebugState.type) && (SubType & Adapter->stDebugState.subtype[Type]))) { \
-                                if (dbg_level & DBG_NO_FUNC_PRINT)              \
-                                        printk (string, ##args);                                                \
-                                else    \
-                                        {                                                                                               \
-                                        printk ("%s:" string, __FUNCTION__, ##args);    \
-                                        printk("\n"); \
-                                        } \
-                }       \
-                }       \
-} while (0)
 
-#define BCM_DEBUG_PRINT_BUFFER(Adapter, Type, SubType, dbg_level,  buffer, bufferlen) do { \
-                if ((DBG_TYPE_PRINTK == Type) && (PRINTKS_ON)) {        \
-                        bcm_print_buffer( dbg_level, __FUNCTION__, __FILE__, __LINE__, buffer, bufferlen, BCM_BASE_TYPE_HEX);   \
-                } else if (!Adapter)                    \
-                        ;                                                       \
-                else {                                                  \
-                        if (((dbg_level & DBG_LVL_BITMASK) <= Adapter->stDebugState.debug_level)  && \
-                           ((Type & Adapter->stDebugState.type) && (SubType & Adapter->stDebugState.subtype[Type]))) { \
-                                        if (dbg_level & DBG_NO_FUNC_PRINT)              \
-                                                bcm_print_buffer( dbg_level, NULL, NULL, __LINE__, buffer, bufferlen, BCM_BASE_TYPE_HEX);                                               \
-                                        else                                                                                            \
-                                                bcm_print_buffer( dbg_level, __FUNCTION__, __FILE__, __LINE__, buffer, bufferlen, BCM_BASE_TYPE_HEX);   \
-                        }       \
-                }       \
+#define BCM_DEBUG_PRINT(Adapter, Type, SubType, dbg_level, string, args...) \
+        do {                                                            \
+                if (DBG_TYPE_PRINTK == Type)                            \
+                        pr_info("%s:" string, __func__, ##args);        \
+                else if (Adapter &&                                     \
+                         (dbg_level & DBG_LVL_BITMASK) <= Adapter->stDebugState.debug_level && \
+                         (Type & Adapter->stDebugState.type) &&         \
+                         (SubType & Adapter->stDebugState.subtype[Type])) { \
+                        if (dbg_level & DBG_NO_FUNC_PRINT)              \
+                                printk(KERN_DEBUG string, ##args);      \
+                        else                                            \
+                                printk(KERN_DEBUG "%s:" string, __func__, ##args);      \
+                }                                                       \
         } while (0)
 
+#define BCM_DEBUG_PRINT_BUFFER(Adapter, Type, SubType, dbg_level,  buffer, bufferlen) do { \
+        if (DBG_TYPE_PRINTK == Type ||                                  \
+            (Adapter &&                                                 \
+             (dbg_level & DBG_LVL_BITMASK) <= Adapter->stDebugState.debug_level  && \
+             (Type & Adapter->stDebugState.type) &&                     \
+             (SubType & Adapter->stDebugState.subtype[Type]))) {        \
+                printk(KERN_DEBUG "%s:\n", __func__);                   \
+                print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET,     \
+                               16, 1, buffer, bufferlen, false);        \
+        }                                                               \
+} while(0)
+
 
 #define BCM_SHOW_DEBUG_BITMAP(Adapter)  do { \
         int i;                                                                  \
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 7b2ec28a4bc1..2b1e9e17e11c 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -11,8 +11,7 @@ When a control packet is received, analyze the
 Enqueue the control packet for Application.
 @return None
 */
-VOID handle_rx_control_packet(PMINI_ADAPTER Adapter,    /**<Pointer to the Adapter structure*/
-                                                                struct sk_buff *skb)                            /**<Pointer to the socket buffer*/
+static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 {
         PPER_TARANG_DATA        pTarang = NULL;
         BOOLEAN HighPriorityMessage = FALSE;
@@ -20,8 +19,10 @@ VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, 	/**<Pointer to the Adapter
         CHAR cntrl_msg_mask_bit = 0;
         BOOLEAN drop_pkt_flag = TRUE ;
         USHORT usStatus = *(PUSHORT)(skb->data);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "=====>");
-        /* Get the Leader field */
+
+        if (netif_msg_pktdata(Adapter))
+                print_hex_dump(KERN_DEBUG, PFX "rx control: ", DUMP_PREFIX_NONE,
+                               16, 1, skb->data, skb->len, 0);
 
         switch(usStatus)
         {
@@ -134,7 +135,7 @@ VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, 	/**<Pointer to the Adapter
     }
         up(&Adapter->RxAppControlQueuelock);
     wake_up(&Adapter->process_read_wait_queue);
-    bcm_kfree_skb(skb);
+    dev_kfree_skb(skb);
         BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");
 }
 
@@ -185,33 +186,7 @@ int control_packet_handler  (PMINI_ADAPTER Adapter  /**< pointer to adapter obje
                         {
                                 DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail);
 //                              Adapter->RxControlHead=ctrl_packet->next;
-                                ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.rx_packets++;
-                                ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.rx_bytes+=
-                                ((PLEADER)ctrl_packet->data)->PLength;
-                        }
-                        #if 0  //Idle mode debug profiling...
-                        if(*(PUSHORT)ctrl_packet->data == IDLE_MODE_STATUS)
-                        {
-                                puiBuffer = (PUINT)(ctrl_packet->data +sizeof(USHORT));
-                                if((ntohl(*puiBuffer) == GO_TO_IDLE_MODE_PAYLOAD))
-                                {
-                                        memset(&tv, 0, sizeof(tv));
-                                        do_gettimeofday(&tv);
-                                        if((ntohl(*(puiBuffer+1)) == 0))
-                                        {
-                                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "IdleMode Wake-up Msg from f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                                        }
-                                        else
-                                        {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "IdleMode req Msg from f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                                        }
-                                }
-                                else if((ntohl(*puiBuffer) == IDLE_MODE_SF_UPDATE_MSG))
-                                {
-                                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "GOT IDLE_MODE_SF_UPDATE MSG at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                                }
                         }
-                        #endif
 
                         spin_unlock_irqrestore (&Adapter->control_queue_lock, flags);
                         handle_rx_control_packet(Adapter, ctrl_packet);
@@ -234,7 +209,7 @@ INT flushAllAppQ(void)
                 {
                         PacketToDrop=pTarang->RxAppControlHead;
                         DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail);
-                        bcm_kfree_skb(PacketToDrop);
+                        dev_kfree_skb(PacketToDrop);
                 }
                 pTarang->AppCtrlQueueLen = 0;
                 //dropped contrl packet statistics also should be reset.
diff --git a/drivers/staging/bcm/HostMibs.h b/drivers/staging/bcm/HostMibs.h
deleted file mode 100644
index 28a578311378..000000000000
--- a/drivers/staging/bcm/HostMibs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _HOST_MIBS_H
-#define _HOST_MIBS_H
-
-INT ProcessGetHostMibs(PMINI_ADAPTER Adapter,
-                                                  PVOID ioBuffer,
-                                                  ULONG inputBufferLength);
-#endif
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 5ec3b896c6a7..91b6fbe33c91 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -1,5 +1,9 @@
 #include "headers.h"
 
+static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header);
+static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header);
+static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);
+
 static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader,BOOLEAN *bParseDone,USHORT *pusPayloadLength)
 {
         UCHAR *pucRetHeaderPtr = NULL;
@@ -257,7 +261,7 @@ USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 }
 
 
-BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header)
+static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header)
 {
         UINT uiLoopIndex=0;
         UINT  uiIpv6AddIndex=0;
@@ -310,7 +314,7 @@ BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pst
         return FALSE;
 }
 
-BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header)
+static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header)
 {
         UINT uiLoopIndex=0;
         UINT  uiIpv6AddIndex=0;
@@ -376,7 +380,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
 
 }
 
-VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
+static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
 {
         UCHAR ucVersion;
         UCHAR  ucPrio ;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index b93f7902e283..a0db5a1de763 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -101,15 +101,12 @@ typedef enum _E_IPADDR_CONTEXT
 
 
 //Function Prototypes
-BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header);
-BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Header *pstIpv6Header);
 
 USHORT  IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */
                                         PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
                                         S_CLASSIFIER_RULE *pstClassifierRule );
 
 VOID DumpIpv6Address(ULONG *puIpv6Address);
-VOID DumpIpv6Header(IPV6Header *pstIpv6Header);
 
 extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);
 extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 60c0f29f3eef..df64acb06126 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -1,20 +1,18 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 int InterfaceFileDownload( PVOID arg,
                         struct file *flp,
                         unsigned int on_chip_loc)
 {
-    char            *buff=NULL;
    // unsigned int    reg=0;
     mm_segment_t    oldfs={0};
     int             errno=0, len=0 /*,is_config_file = 0*/;
     loff_t          pos=0;
         PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
         //PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;
+    char            *buff=kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
 
-    buff=(PCHAR)kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
     if(!buff)
     {
         return -ENOMEM;
@@ -49,7 +47,7 @@ int InterfaceFileDownload( PVOID arg,
         on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB;
         }/* End of for(;;)*/
 
-        bcm_kfree(buff);
+        kfree(buff);
     return errno;
 }
 
@@ -57,7 +55,7 @@ int InterfaceFileReadbackFromChip( PVOID arg,
                         struct file *flp,
                         unsigned int on_chip_loc)
 {
-    char            *buff=NULL, *buff_readback=NULL;
+    char            *buff, *buff_readback;
     unsigned int    reg=0;
     mm_segment_t    oldfs={0};
     int             errno=0, len=0, is_config_file = 0;
@@ -66,12 +64,12 @@ int InterfaceFileReadbackFromChip( PVOID arg,
         INT                             Status = STATUS_SUCCESS;
         PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
 
-    buff=(PCHAR)kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
-    buff_readback=(PCHAR)kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);
+    buff=kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
+    buff_readback=kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);
     if(!buff || !buff_readback)
     {
-        bcm_kfree(buff);
-        bcm_kfree(buff_readback);
+        kfree(buff);
+        kfree(buff_readback);
 
         return -ENOMEM;
     }
@@ -138,8 +136,8 @@ int InterfaceFileReadbackFromChip( PVOID arg,
         on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB;
     }/* End of while(1)*/
 exit:
-    bcm_kfree(buff);
-    bcm_kfree(buff_readback);
+    kfree(buff);
+    kfree(buff_readback);
         return Status;
 }
 
@@ -165,7 +163,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter,
                         psFwInfo->pvMappedFirmwareAddress, psFwInfo->u32FirmwareLength);
         if(retval)
         {
-                bcm_kfree (Adapter->pstargetparams);
+                kfree(Adapter->pstargetparams);
                 Adapter->pstargetparams = NULL;
                 return -EFAULT;
         }
@@ -231,41 +229,6 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter,
 
         return retval;
 }
-#if 0
-static int bcm_download_buffer(PMINI_ADAPTER Adapter,
-        unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
-        unsigned long u32StartingAddress)
-{
-    char            *buff=NULL;
-    unsigned int    len = 0;
-        int                     retval = STATUS_SUCCESS;
-        buff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
-
-        len = u32FirmwareLength;
-
-        while(u32FirmwareLength)
-        {
-                len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
-                if(STATUS_SUCCESS != (retval = copy_from_user(buff,
-                                (unsigned char *)mappedbuffer, len)))
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
-                        break;
-                }
-                retval = wrm (Adapter, u32StartingAddress, buff, len);
-                if(retval)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "wrm failed\n");
-                        break;
-                }
-                u32StartingAddress      += len;
-                u32FirmwareLength       -= len;
-                mappedbuffer            +=len;
-        }
-        bcm_kfree(buff);
-        return retval;
-}
-#endif
 static int bcm_compare_buff_contents(unsigned char *readbackbuff,
         unsigned char *buff,unsigned int len)
 {
@@ -297,58 +260,6 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff,
         }
         return retval;
 }
-#if 0
-static int bcm_buffer_readback(PMINI_ADAPTER Adapter,
-        unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
-        unsigned long u32StartingAddress)
-{
-        unsigned char *buff = NULL;
-        unsigned char *readbackbuff = NULL;
-        unsigned int  len = u32FirmwareLength;
-        int retval = STATUS_SUCCESS;
-
-    buff=(unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
-        if(NULL == buff)
-                return -ENOMEM;
-        readbackbuff =  (unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB,
-                                        GFP_KERNEL);
-        if(NULL == readbackbuff)
-        {
-                bcm_kfree(buff);
-                return -ENOMEM;
-        }
-        while (u32FirmwareLength && !retval)
-        {
-                len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
-
-                /* read from the appl buff and then read from the target, compare */
-                if(STATUS_SUCCESS != (retval = copy_from_user(buff,
-                                (unsigned char *)mappedbuffer, len)))
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
-                        break;
-                }
-                retval = rdm (Adapter, u32StartingAddress, readbackbuff, len);
-                if(retval)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed\n");
-                        break;
-                }
-
-                if (STATUS_SUCCESS !=
-                        (retval = bcm_compare_buff_contents (readbackbuff, buff, len)))
-                {
-                        break;
-                }
-                u32StartingAddress      += len;
-                u32FirmwareLength       -= len;
-                mappedbuffer            +=len;
-        }/* end of while (u32FirmwareLength && !retval) */
-        bcm_kfree(buff);
-        bcm_kfree(readbackbuff);
-        return retval;
-}
-#endif
 int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
 {
         int retval = STATUS_SUCCESS;
@@ -375,7 +286,7 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
         else
         {
 
-                buff = (PUCHAR)kzalloc(psFwInfo->u32FirmwareLength,GFP_KERNEL);
+                buff = kzalloc(psFwInfo->u32FirmwareLength,GFP_KERNEL);
                 if(buff==NULL)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"Failed in allocation memory");
@@ -389,23 +300,6 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
                         goto error ;
                 }
 
-                #if 0
-                retval = bcm_download_buffer(Adapter,
-                                (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
-                                psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
-                if(retval != STATUS_SUCCESS)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "User space buffer download fails....");
-                }
-                retval = bcm_buffer_readback (Adapter,
-                                (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
-                                psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
-
-                if(retval != STATUS_SUCCESS)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "read back verifier failed ....");
-                }
-                #endif
                 retval = buffDnldVerify(Adapter,
                                         buff,
                                         psFwInfo->u32FirmwareLength,
@@ -417,7 +311,7 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
                 }
         }
 error:
-        bcm_kfree(buff);
+        kfree(buff);
         return retval;
 }
 
@@ -450,11 +344,10 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter,
                         PUCHAR mappedbuffer, UINT u32FirmwareLength,
                         ULONG u32StartingAddress)
 {
-        PUCHAR readbackbuff = NULL;
         UINT len = u32FirmwareLength;
         INT retval = STATUS_SUCCESS;
+        PUCHAR readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB,GFP_KERNEL);
 
-        readbackbuff = (PUCHAR)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB,GFP_KERNEL);
         if(NULL == readbackbuff)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "MEMORY ALLOCATION FAILED");
@@ -480,7 +373,7 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter,
                 u32FirmwareLength       -= len;
                 mappedbuffer            +=len;
         }/* end of while (u32FirmwareLength && !retval) */
-        bcm_kfree(readbackbuff);
+        kfree(readbackbuff);
         return retval;
 }
 
@@ -506,5 +399,4 @@ error:
         return status;
 }
 
-#endif
 
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 0750382733ff..bf5c0ad86610 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -98,14 +98,6 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
                         Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
 
                         wake_up(&Adapter->lowpower_mode_wait_queue);
-                #if 0
-                        if(Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY)
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"LED Thread is Running. Hence Setting the LED Event as IDLEMODE_EXIT");
-                                Adapter->DriverState = IDLEMODE_EXIT;
-                                wake_up(&Adapter->LEDInfo.notify_led_event);
-                        }
-                #endif
 
                 }
                 else
@@ -154,17 +146,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
         return status;
 }
 
-
-VOID InterfaceWriteIdleModeWakePattern(PMINI_ADAPTER Adapter)
-{
-/*      BeceemWriteMemoryUshort(Adapter, Host2CPU_Mailbox_Low, 0x1d1e);
-        BeceemWriteMemoryUshort(Adapter, Host2CPU_Mailbox_Low, 0x1d1e);
-        BeceemWriteMemoryUshort(Adapter, Host2CPU_Mailbox_Upp, 0xd0ea);
-        BeceemWriteMemoryUshort(Adapter, Host2CPU_Mailbox_Upp, 0xd0ea);*/
-        return;
-}
-
-int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
+static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 {
         int     status = STATUS_SUCCESS;
         unsigned int value;
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index 1bc723d2d72c..859a2ffba6b7 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -7,8 +7,6 @@ INT InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int *puiBuffer);
 
 VOID InterfaceWriteIdleModeWakePattern(PMINI_ADAPTER Adapter);
 
-INT InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern);
-
 INT InterfaceWakeUp(PMINI_ADAPTER Adapter);
 
 VOID InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter);
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index e97ad99b1bb4..d78d5ef1f298 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -1,54 +1,63 @@
 #include "headers.h"
 
 static struct usb_device_id InterfaceUsbtable[] = {
-    { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3) },
+        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3) },
         { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3B) },
         { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) },
-        { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) },
+        { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SM250) },
+        { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) },
         { USB_DEVICE(BCM_USB_VENDOR_ID_FOXCONN, BCM_USB_PRODUCT_ID_1901) },
-    {}
+        { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_TU25) },
+        { }
 };
+MODULE_DEVICE_TABLE(usb, InterfaceUsbtable);
 
-VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int debug = -1;
+module_param(debug, uint, 0600);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+static const u32 default_msg =
+        NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK
+        | NETIF_MSG_TIMER | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR
+        | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN;
+
+static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter);
+
+static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
-        INT i = 0;
-        // Wake up the wait_queue...
-        if(psIntfAdapter->psAdapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY)
-        {
+        int i = 0;
+
+        /* Wake up the wait_queue... */
+        if (psIntfAdapter->psAdapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
                 psIntfAdapter->psAdapter->DriverState = DRIVER_HALT;
                 wake_up(&psIntfAdapter->psAdapter->LEDInfo.notify_led_event);
         }
         reset_card_proc(psIntfAdapter->psAdapter);
 
-        //worst case time taken by the RDM/WRM will be 5 sec. will check after every 100 ms
-        //to accertain the device is not being accessed. After this No RDM/WRM should be made.
-        while(psIntfAdapter->psAdapter->DeviceAccess)
-        {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Device is being Accessed \n");
+        /*
+         * worst case time taken by the RDM/WRM will be 5 sec. will check after every 100 ms
+         * to accertain the device is not being accessed. After this No RDM/WRM should be made.
+         */
+        while (psIntfAdapter->psAdapter->DeviceAccess) {
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                        "Device is being accessed.\n");
                 msleep(100);
         }
         /* Free interrupt URB */
-        //psIntfAdapter->psAdapter->device_removed = TRUE;
-        if(psIntfAdapter->psInterruptUrb)
-        {
-                usb_free_urb(psIntfAdapter->psInterruptUrb);
-        }
+        /* psIntfAdapter->psAdapter->device_removed = TRUE; */
+        usb_free_urb(psIntfAdapter->psInterruptUrb);
 
         /* Free transmit URBs */
-        for(i = 0; i < MAXIMUM_USB_TCB; i++)
-        {
-                if(psIntfAdapter->asUsbTcb[i].urb  != NULL)
-                {
+        for (i = 0; i < MAXIMUM_USB_TCB; i++) {
+                if (psIntfAdapter->asUsbTcb[i].urb  != NULL) {
                         usb_free_urb(psIntfAdapter->asUsbTcb[i].urb);
                         psIntfAdapter->asUsbTcb[i].urb = NULL;
                 }
         }
         /* Free receive URB and buffers */
-        for(i = 0; i < MAXIMUM_USB_RCB; i++)
-        {
-                if (psIntfAdapter->asUsbRcb[i].urb != NULL)
-                {
-                        bcm_kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer);
+        for (i = 0; i < MAXIMUM_USB_RCB; i++) {
+                if (psIntfAdapter->asUsbRcb[i].urb != NULL) {
+                        kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer);
                         usb_free_urb(psIntfAdapter->asUsbRcb[i].urb);
                         psIntfAdapter->asUsbRcb[i].urb = NULL;
                 }
@@ -56,151 +65,109 @@ VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
         AdapterFree(psIntfAdapter->psAdapter);
 }
 
-
-
-static int usbbcm_open(struct inode *inode, struct file *file)
-{
-        return 0;
-}
-
-static int usbbcm_release(struct inode *inode, struct file *file)
-{
-        return 0;
-}
-
-static ssize_t usbbcm_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
-{
-        return 0;
-}
-
-static ssize_t usbbcm_write(struct file *file, const char __user *user_buffer, size_t count, loff_t *ppos)
+static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
 {
-        return 0;
-}
+        unsigned long ulReg = 0;
+        int ret;
 
-
-VOID ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
-{
-        ULONG ulReg = 0;
-
-// Program EP2 MAX_PKT_SIZE
+        /* Program EP2 MAX_PKT_SIZE */
         ulReg = ntohl(EP2_MPS_REG);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x128,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x128, 4, TRUE);
         ulReg = ntohl(EP2_MPS);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x12C,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x12C, 4, TRUE);
 
         ulReg = ntohl(EP2_CFG_REG);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x132,4,TRUE);
-        if(((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE)
-        {
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x132, 4, TRUE);
+        if (((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter))->bHighSpeedDevice == TRUE) {
                 ulReg = ntohl(EP2_CFG_INT);
-                BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x136,4,TRUE);
-        }
-        else
-        {
-// USE BULK EP as TX in FS mode.
+                BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x136, 4, TRUE);
+        } else {
+                /* USE BULK EP as TX in FS mode. */
                 ulReg = ntohl(EP2_CFG_BULK);
-                BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x136,4,TRUE);
+                BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x136, 4, TRUE);
         }
 
-
-// Program EP4 MAX_PKT_SIZE.
+        /* Program EP4 MAX_PKT_SIZE. */
         ulReg = ntohl(EP4_MPS_REG);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x13C,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x13C, 4, TRUE);
         ulReg = ntohl(EP4_MPS);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x140,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x140, 4, TRUE);
 
-//      Program TX EP as interrupt (Alternate Setting)
-        if( rdmalt(Adapter,0x0F0110F8, (PUINT)&ulReg,4))
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reading of Tx EP is failing");
-                return ;
+        /* Program TX EP as interrupt(Alternate Setting) */
+        ret = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));
+        if (ret) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                        "reading of Tx EP failed\n");
+                return;
         }
         ulReg |= 0x6;
 
         ulReg = ntohl(ulReg);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1CC,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1CC, 4, TRUE);
 
         ulReg = ntohl(EP4_CFG_REG);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1C8,4,TRUE);
-// Program ISOCHRONOUS EP size to zero.
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1C8, 4, TRUE);
+        /* Program ISOCHRONOUS EP size to zero. */
         ulReg = ntohl(ISO_MPS_REG);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1D2,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1D2, 4, TRUE);
         ulReg = ntohl(ISO_MPS);
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1D6,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1D6, 4, TRUE);
 
-// Update EEPROM Version.
-// Read 4 bytes from 508 and modify 511 and 510.
-//
-        ReadBeceemEEPROM(Adapter,0x1FC,(PUINT)&ulReg);
+        /*
+         * Update EEPROM Version.
+         * Read 4 bytes from 508 and modify 511 and 510.
+         */
+        ReadBeceemEEPROM(Adapter, 0x1FC, (PUINT)&ulReg);
         ulReg &= 0x0101FFFF;
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1FC,4,TRUE);
-//
-//Update length field if required. Also make the string NULL terminated.
-//
-        ReadBeceemEEPROM(Adapter,0xA8,(PUINT)&ulReg);
-        if((ulReg&0x00FF0000)>>16 > 0x30)
-        {
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1FC, 4, TRUE);
+
+        /* Update length field if required. Also make the string NULL terminated. */
+
+        ReadBeceemEEPROM(Adapter, 0xA8, (PUINT)&ulReg);
+        if ((ulReg&0x00FF0000)>>16 > 0x30) {
                 ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);
-                BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0xA8,4,TRUE);
+                BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0xA8, 4, TRUE);
         }
-        ReadBeceemEEPROM(Adapter,0x148,(PUINT)&ulReg);
-        if((ulReg&0x00FF0000)>>16 > 0x30)
-        {
+        ReadBeceemEEPROM(Adapter, 0x148, (PUINT)&ulReg);
+        if ((ulReg&0x00FF0000)>>16 > 0x30) {
                 ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);
-                BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x148,4,TRUE);
+                BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x148, 4, TRUE);
         }
         ulReg = 0;
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x122,4,TRUE);
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x122, 4, TRUE);
         ulReg = 0;
-        BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&ulReg,0x1C2,4,TRUE);
-
+        BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1C2, 4, TRUE);
 }
 
-static struct file_operations usbbcm_fops = {
-    .open    =  usbbcm_open,
-    .release =  usbbcm_release,
-    .read    =  usbbcm_read,
-    .write   =  usbbcm_write,
-    .owner   =  THIS_MODULE,
-        .llseek = no_llseek,
-};
-
-static struct usb_class_driver usbbcm_class = {
-    .name =             "usbbcm",
-    .fops =             &usbbcm_fops,
-    .minor_base =   BCM_USB_MINOR_BASE,
-};
-
 static int
 usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
-        int retval =0 ;
-        PMINI_ADAPTER psAdapter = NULL;
-        PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
-        struct usb_device      *udev = NULL;
-
-//      BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Usbbcm probe!!");
-        if((intf == NULL) || (id == NULL))
-        {
-        //      BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "intf or id is NULL");
-                return -EINVAL;
-        }
+        struct usb_device *udev = interface_to_usbdev(intf);
+        int retval;
+        PMINI_ADAPTER psAdapter;
+        PS_INTERFACE_ADAPTER psIntfAdapter;
+        struct net_device *ndev;
 
-        /* Allocate Adapter structure */
-        if((psAdapter = kzalloc(sizeof(MINI_ADAPTER), GFP_KERNEL)) == NULL)
-        {
-                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0, "Out of memory");
+        /* Reserve one extra queue for the bit-bucket */
+        ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES+1);
+        if (ndev == NULL) {
+                dev_err(&udev->dev, DRV_NAME ": no memory for device\n");
                 return -ENOMEM;
         }
 
-    /* Init default driver debug state */
+        SET_NETDEV_DEV(ndev, &intf->dev);
 
-    psAdapter->stDebugState.debug_level = DBG_LVL_CURR;
+        psAdapter = netdev_priv(ndev);
+        psAdapter->dev = ndev;
+        psAdapter->msg_enable = netif_msg_init(debug, default_msg);
+
+        /* Init default driver debug state */
+
+        psAdapter->stDebugState.debug_level = DBG_LVL_CURR;
         psAdapter->stDebugState.type = DBG_TYPE_INITEXIT;
-        memset (psAdapter->stDebugState.subtype, 0, sizeof (psAdapter->stDebugState.subtype));
 
-    /* Technically, one can start using BCM_DEBUG_PRINT after this point.
+        /*
+         * Technically, one can start using BCM_DEBUG_PRINT after this point.
          * However, realize that by default the Type/Subtype bitmaps are all zero now;
          * so no prints will actually appear until the TestApp turns on debug paths via
          * the ioctl(); so practically speaking, in early init, no logging happens.
@@ -211,160 +178,128 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
          * Further, we turn this OFF once init_module() completes.
          */
 
-    psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xff;
+        psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xff;
         BCM_SHOW_DEBUG_BITMAP(psAdapter);
 
         retval = InitAdapter(psAdapter);
-        if(retval)
-        {
-                BCM_DEBUG_PRINT (psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InitAdapter Failed\n");
+        if (retval) {
+                dev_err(&udev->dev, DRV_NAME ": InitAdapter Failed\n");
                 AdapterFree(psAdapter);
                 return retval;
         }
 
         /* Allocate interface adapter structure */
-        if((psAdapter->pvInterfaceAdapter =
-                kmalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL)) == NULL)
-        {
-                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0, "Out of memory");
-                AdapterFree (psAdapter);
+        psIntfAdapter = kzalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL);
+        if (psIntfAdapter == NULL) {
+                dev_err(&udev->dev, DRV_NAME ": no memory for Interface adapter\n");
+                AdapterFree(psAdapter);
                 return -ENOMEM;
         }
-        memset(psAdapter->pvInterfaceAdapter, 0, sizeof(S_INTERFACE_ADAPTER));
 
-        psIntfAdapter = InterfaceAdapterGet(psAdapter);
+        psAdapter->pvInterfaceAdapter = psIntfAdapter;
         psIntfAdapter->psAdapter = psAdapter;
 
         /* Store usb interface in Interface Adapter */
         psIntfAdapter->interface = intf;
         usb_set_intfdata(intf, psIntfAdapter);
 
-        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);
+        BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                "psIntfAdapter 0x%p\n", psIntfAdapter);
         retval = InterfaceAdapterInit(psIntfAdapter);
-        if(retval)
-        {
+        if (retval) {
                 /* If the Firmware/Cfg File is not present
-                 * then return success, let the application
-                 * download the files.
-                 */
-                if(-ENOENT == retval){
-                        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "File Not Found, Use App to Download\n");
+                 * then return success, let the application
+                 * download the files.
+                 */
+                if (-ENOENT == retval) {
+                        BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                "File Not Found.  Use app to download.\n");
                         return STATUS_SUCCESS;
                 }
-                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapterInit Failed \n");
+                BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                        "InterfaceAdapterInit failed.\n");
                 usb_set_intfdata(intf, NULL);
-                udev = interface_to_usbdev (intf);
+                udev = interface_to_usbdev(intf);
                 usb_put_dev(udev);
-                if(psAdapter->bUsbClassDriverRegistered == TRUE)
-                                usb_deregister_dev (intf, &usbbcm_class);
                 InterfaceAdapterFree(psIntfAdapter);
-                return retval ;
+                return retval;
         }
-        if(psAdapter->chip_id > T3)
-        {
-                uint32_t uiNackZeroLengthInt=4;
-                if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt)))
-                {
-                        return -EIO;;
-                }
+        if (psAdapter->chip_id > T3) {
+                uint32_t uiNackZeroLengthInt = 4;
+
+                retval = wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt));
+                if (retval)
+                        return retval;
         }
 
-        udev = interface_to_usbdev (intf);
         /* Check whether the USB-Device Supports remote Wake-Up */
-        if(USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes)
-        {
+        if (USB_CONFIG_ATT_WAKEUP & udev->actconfig->desc.bmAttributes) {
                 /* If Suspend then only support dynamic suspend */
-                if(psAdapter->bDoSuspend)
-                {
+                if (psAdapter->bDoSuspend) {
 #ifdef CONFIG_PM
                         pm_runtime_set_autosuspend_delay(&udev->dev, 0);
                         intf->needs_remote_wakeup = 1;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                        udev->autosuspend_disabled = 0;
-#else
                         usb_enable_autosuspend(udev);
-#endif
-                        device_init_wakeup(&intf->dev,1);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-                        usb_autopm_disable(intf);
-#endif
+                        device_init_wakeup(&intf->dev, 1);
                         INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
-                        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Enabling USB Auto-Suspend\n");
+                        BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                "Enabling USB Auto-Suspend\n");
 #endif
-                }
-                else
-                {
+                } else {
                         intf->needs_remote_wakeup = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-                        udev->autosuspend_disabled = 1;
-#else
                         usb_disable_autosuspend(udev);
-#endif
                 }
         }
 
-    psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0x0;
-    return retval;
+        psAdapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0x0;
+        return retval;
 }
 
-static void usbbcm_disconnect (struct usb_interface *intf)
+static void usbbcm_disconnect(struct usb_interface *intf)
 {
-        PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
-        PMINI_ADAPTER psAdapter = NULL;
-        struct usb_device       *udev = NULL;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Usb disconnected");
-        if(intf == NULL)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "intf pointer is NULL");
-                return;
-        }
-        psIntfAdapter = usb_get_intfdata(intf);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);
-        if(psIntfAdapter == NULL)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapter pointer is NULL");
+        PS_INTERFACE_ADAPTER psIntfAdapter = usb_get_intfdata(intf);
+        PMINI_ADAPTER psAdapter;
+        struct usb_device  *udev = interface_to_usbdev(intf);
+
+        if (psIntfAdapter == NULL)
                 return;
-        }
+
         psAdapter = psIntfAdapter->psAdapter;
-        if(psAdapter->bDoSuspend)
+        netif_device_detach(psAdapter->dev);
+
+        if (psAdapter->bDoSuspend)
                 intf->needs_remote_wakeup = 0;
 
         psAdapter->device_removed = TRUE ;
         usb_set_intfdata(intf, NULL);
         InterfaceAdapterFree(psIntfAdapter);
-        udev = interface_to_usbdev (intf);
         usb_put_dev(udev);
-        usb_deregister_dev (intf, &usbbcm_class);
 }
 
-
-static __inline int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
         int i = 0;
-        for(i = 0; i < MAXIMUM_USB_TCB; i++)
-        {
-                if((psIntfAdapter->asUsbTcb[i].urb =
-                                usb_alloc_urb(0, GFP_KERNEL)) == NULL)
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Tx urb for index %d", i);
+
+        for (i = 0; i < MAXIMUM_USB_TCB; i++) {
+                if ((psIntfAdapter->asUsbTcb[i].urb =
+                                usb_alloc_urb(0, GFP_KERNEL)) == NULL) {
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                                "Can't allocate Tx urb for index %d\n", i);
                         return -ENOMEM;
                 }
         }
 
-        for(i = 0; i < MAXIMUM_USB_RCB; i++)
-        {
+        for (i = 0; i < MAXIMUM_USB_RCB; i++) {
                 if ((psIntfAdapter->asUsbRcb[i].urb =
-                                usb_alloc_urb(0, GFP_KERNEL)) == NULL)
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Rx urb for index %d", i);
+                                usb_alloc_urb(0, GFP_KERNEL)) == NULL) {
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                                "Can't allocate Rx urb for index %d\n", i);
                         return -ENOMEM;
                 }
-                if((psIntfAdapter->asUsbRcb[i].urb->transfer_buffer =
-                        kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL)) == NULL)
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cant allocate Rx buffer for index %d", i);
+                if ((psIntfAdapter->asUsbRcb[i].urb->transfer_buffer =
+                        kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL)) == NULL) {
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                                "Can't allocate Rx buffer for index %d\n", i);
                         return -ENOMEM;
                 }
                 psIntfAdapter->asUsbRcb[i].urb->transfer_buffer_length = MAX_DATA_BUFFER_SIZE;
@@ -372,77 +307,41 @@ static __inline int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter)
         return 0;
 }
 
-
-
 static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
-        INT value = 0;
+        int value = 0;
         UINT status = STATUS_SUCCESS;
 
         status = InitCardAndDownloadFirmware(psIntfAdapter->psAdapter);
-        if(status != STATUS_SUCCESS)
-        {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "InitCardAndDownloadFirmware failed.\n");
+        if (status != STATUS_SUCCESS) {
+                pr_err(DRV_NAME "InitCardAndDownloadFirmware failed.\n");
                 return status;
         }
-        if(TRUE == psIntfAdapter->psAdapter->fw_download_done)
-        {
-
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Sending first interrupt URB down......");
-                if(StartInterruptUrb(psIntfAdapter))
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Cannot send interrupt in URB");
+        if (TRUE == psIntfAdapter->psAdapter->fw_download_done) {
+                if (StartInterruptUrb(psIntfAdapter)) {
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                        "Cannot send interrupt in URB\n");
                 }
-                //now register the cntrl interface.
-                //after downloading the f/w waiting for 5 sec to get the mailbox interrupt.
 
+                /*
+                 * now register the cntrl interface.
+                 * after downloading the f/w waiting for 5 sec to get the mailbox interrupt.
+                 */
                 psIntfAdapter->psAdapter->waiting_to_fw_download_done = FALSE;
                 value = wait_event_timeout(psIntfAdapter->psAdapter->ioctl_fw_dnld_wait_queue,
                                         psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ);
 
-                if(value == 0)
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Mailbox Interrupt has not reached to Driver..");
-                }
-                else
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Got the mailbox interrupt ...Registering control interface...\n ");
-                }
-                if(register_control_device_interface(psIntfAdapter->psAdapter) < 0)
-                {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Register Control Device failed...");
+                if (value == 0)
+                        pr_err(DRV_NAME ": Timeout waiting for mailbox interrupt.\n");
+
+                if (register_control_device_interface(psIntfAdapter->psAdapter) < 0) {
+                        pr_err(DRV_NAME ": Register Control Device failed.\n");
                         return -EIO;
                 }
         }
         return 0;
 }
 
-#if 0
-static void     print_usb_interface_desc(struct usb_interface_descriptor *usb_intf_desc)
-{
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** INTERFACE DESCRIPTOR *********************");
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength: %x", usb_intf_desc->bLength);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType: %x", usb_intf_desc->bDescriptorType);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceNumber: %x", usb_intf_desc->bInterfaceNumber);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bAlternateSetting: %x", usb_intf_desc->bAlternateSetting);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bNumEndpoints: %x", usb_intf_desc->bNumEndpoints);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceClass: %x", usb_intf_desc->bInterfaceClass);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceSubClass: %x", usb_intf_desc->bInterfaceSubClass);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceProtocol: %x", usb_intf_desc->bInterfaceProtocol);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "iInterface :%x\n",usb_intf_desc->iInterface);
-}
-static void     print_usb_endpoint_descriptor(struct usb_endpoint_descriptor *usb_ep_desc)
-{
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** ENDPOINT DESCRIPTOR *********************");
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength  :%x ", usb_ep_desc->bLength);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType  :%x ", usb_ep_desc->bDescriptorType);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bEndpointAddress  :%x ", usb_ep_desc->bEndpointAddress);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bmAttributes  :%x ", usb_ep_desc->bmAttributes);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "wMaxPacketSize  :%x ",usb_ep_desc->wMaxPacketSize);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterval  :%x ",usb_ep_desc->bInterval);
-}
-
-#endif
 
 static inline int bcm_usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
 {
@@ -518,124 +417,111 @@ static inline int bcm_usb_endpoint_is_isoc_out(const struct usb_endpoint_descrip
         return (bcm_usb_endpoint_xfer_isoc(epd) && bcm_usb_endpoint_dir_out(epd));
 }
 
-INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
+static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
         size_t buffer_size;
-        ULONG value;
-        INT retval = 0;
-        INT usedIntOutForBulkTransfer = 0 ;
+        unsigned long value;
+        int retval = 0;
+        int usedIntOutForBulkTransfer = 0 ;
         BOOLEAN bBcm16 = FALSE;
         UINT uiData = 0;
 
         /* Store the usb dev into interface adapter */
-        psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(
-                                                                psIntfAdapter->interface));
-
-        if((psIntfAdapter->udev->speed == USB_SPEED_HIGH))
-        {
-                psIntfAdapter->bHighSpeedDevice = TRUE ;
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO HIGH_SPEED ");
-        }
-        else
-        {
-                psIntfAdapter->bHighSpeedDevice = FALSE ;
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO FULL_SPEED ");
-        }
+        psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(psIntfAdapter->interface));
 
+        psIntfAdapter->bHighSpeedDevice = (psIntfAdapter->udev->speed == USB_SPEED_HIGH);
         psIntfAdapter->psAdapter->interface_rdm = BcmRDM;
         psIntfAdapter->psAdapter->interface_wrm = BcmWRM;
 
-        if(rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG, (PUINT)&(psIntfAdapter->psAdapter->chip_id), sizeof(UINT)) < 0)
-        {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");
-                return STATUS_FAILURE;
-        }
-    if(0xbece3200==(psIntfAdapter->psAdapter->chip_id&~(0xF0)))
-        {
-                psIntfAdapter->psAdapter->chip_id=(psIntfAdapter->psAdapter->chip_id&~(0xF0));
+        retval = rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG,
+                        (u32 *)&(psIntfAdapter->psAdapter->chip_id), sizeof(u32));
+        if (retval) {
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");
+                return retval;
         }
 
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "First RDM Chip ID 0x%lx\n", psIntfAdapter->psAdapter->chip_id);
+        if (0xbece3200 == (psIntfAdapter->psAdapter->chip_id & ~(0xF0)))
+                psIntfAdapter->psAdapter->chip_id &= ~0xF0;
 
-    iface_desc = psIntfAdapter->interface->cur_altsetting;
-        //print_usb_interface_desc(&(iface_desc->desc));
+        dev_info(&psIntfAdapter->udev->dev, "RDM Chip ID 0x%lx\n",
+                 psIntfAdapter->psAdapter->chip_id);
 
-        if(psIntfAdapter->psAdapter->chip_id == T3B)
-        {
+        iface_desc = psIntfAdapter->interface->cur_altsetting;
 
-                //
-                //T3B device will have EEPROM,check if EEPROM is proper and BCM16 can be done or not.
-                //
-                BeceemEEPROMBulkRead(psIntfAdapter->psAdapter,&uiData,0x0,4);
-                if(uiData == BECM)
-                {
+        if (psIntfAdapter->psAdapter->chip_id == T3B) {
+                /* T3B device will have EEPROM, check if EEPROM is proper and BCM16 can be done or not. */
+                BeceemEEPROMBulkRead(psIntfAdapter->psAdapter, &uiData, 0x0, 4);
+                if (uiData == BECM)
                         bBcm16 = TRUE;
-                }
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Number of Altsetting aviailable for This Modem 0x%x\n", psIntfAdapter->interface->num_altsetting);
-                if(bBcm16 == TRUE)
-                {
-                        //selecting alternate setting one as a default setting for High Speed  modem.
-                        if(psIntfAdapter->bHighSpeedDevice)
-                                retval= usb_set_interface(psIntfAdapter->udev,DEFAULT_SETTING_0,ALTERNATE_SETTING_1);
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "BCM16 is Applicable on this dongle");
-                        if(retval || (psIntfAdapter->bHighSpeedDevice == FALSE))
-                        {
+
+                dev_info(&psIntfAdapter->udev->dev, "number of alternate setting %d\n",
+                         psIntfAdapter->interface->num_altsetting);
+
+                if (bBcm16 == TRUE) {
+                        /* selecting alternate setting one as a default setting for High Speed  modem. */
+                        if (psIntfAdapter->bHighSpeedDevice)
+                                retval= usb_set_interface(psIntfAdapter->udev, DEFAULT_SETTING_0, ALTERNATE_SETTING_1);
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                "BCM16 is applicable on this dongle\n");
+                        if (retval || (psIntfAdapter->bHighSpeedDevice == FALSE)) {
                                 usedIntOutForBulkTransfer = EP2 ;
                                 endpoint = &iface_desc->endpoint[EP2].desc;
-                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Interface altsetting  got failed or Moemd is configured to FS.hence will work on default setting 0 \n");
+                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                         "Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n");
                                 /*
-                                If Modem is high speed device EP2 should be INT OUT End point
-                                If Mode is FS then EP2 should be bulk end point
-                                */
-                                if(((psIntfAdapter->bHighSpeedDevice ==TRUE ) && (bcm_usb_endpoint_is_int_out(endpoint)== FALSE))
-                                        ||((psIntfAdapter->bHighSpeedDevice == FALSE)&& (bcm_usb_endpoint_is_bulk_out(endpoint)== FALSE)))
-                                {
-                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Configuring the EEPROM ");
-                                        //change the EP2, EP4 to INT OUT end point
+                                 * If Modem is high speed device EP2 should be INT OUT End point
+                                 * If Mode is FS then EP2 should be bulk end point
+                                 */
+                                if (((psIntfAdapter->bHighSpeedDevice == TRUE) && (bcm_usb_endpoint_is_int_out(endpoint) == FALSE))
+                                        || ((psIntfAdapter->bHighSpeedDevice == FALSE) && (bcm_usb_endpoint_is_bulk_out(endpoint) == FALSE))) {
+                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                "Configuring the EEPROM\n");
+                                        /* change the EP2, EP4 to INT OUT end point */
                                         ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
 
                                         /*
-                                        It resets the device and if any thing gets changed in USB descriptor it will show fail and
-                                        re-enumerate the device
-                                        */
+                                         * It resets the device and if any thing gets changed
+                                         *  in USB descriptor it will show fail and re-enumerate
+                                         * the device
+                                         */
                                         retval = usb_reset_device(psIntfAdapter->udev);
-                                        if(retval)
-                                        {
-                                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reset got failed. hence Re-enumerating the device \n");
+                                        if (retval) {
+                                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                        "reset failed.  Re-enumerating the device.\n");
                                                 return retval ;
                                         }
 
                                 }
-                                if((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint))
-                                {
-                                        // Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail.
+                                if ((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint)) {
+                                        /* Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail. */
                                         UINT _uiData = ntohl(EP2_CFG_INT);
-                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Reverting Bulk to INT as it is FS MODE");
-                                        BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter,(PUCHAR)&_uiData,0x136,4,TRUE);
+                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, 
+                                                "Reverting Bulk to INT as it is in Full Speed mode.\n");
+                                        BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter, (PUCHAR)&_uiData, 0x136, 4, TRUE);
                                 }
-                        }
-                        else
-                        {
+                        } else {
                                 usedIntOutForBulkTransfer = EP4 ;
                                 endpoint = &iface_desc->endpoint[EP4].desc;
-                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Choosing AltSetting as a default setting");
-                                if( bcm_usb_endpoint_is_int_out(endpoint) == FALSE)
-                                {
-                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, " Dongle does not have BCM16 Fix");
-                                        //change the EP2, EP4 to INT OUT end point and use EP4 in altsetting
+                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                        "Choosing AltSetting as a default setting.\n");
+                                if (bcm_usb_endpoint_is_int_out(endpoint) == FALSE) {
+                                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                "Dongle does not have BCM16 Fix.\n");
+                                        /* change the EP2, EP4 to INT OUT end point and use EP4 in altsetting */
                                         ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
 
                                         /*
-                                        It resets the device and if any thing gets changed in USB descriptor it will show fail and
-                                        re-enumerate the device
-                                        */
+                                         * It resets the device and if any thing gets changed in
+                                         *  USB descriptor it will show fail and re-enumerate the
+                                         * device
+                                         */
                                         retval = usb_reset_device(psIntfAdapter->udev);
-                                        if(retval)
-                                        {
-                                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "reset got failed. hence Re-enumerating the device \n");
-                                                return retval ;
+                                        if (retval) {
+                                                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                                        "reset failed.  Re-enumerating the device.\n");
+                                                return retval;
                                         }
 
                                 }
@@ -644,99 +530,67 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
         }
 
         iface_desc = psIntfAdapter->interface->cur_altsetting;
-        //print_usb_interface_desc(&(iface_desc->desc));
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Current number of endpoints :%x \n", iface_desc->desc.bNumEndpoints);
-    for (value = 0; value < iface_desc->desc.bNumEndpoints; ++value)
-        {
-        endpoint = &iface_desc->endpoint[value].desc;
-                //print_usb_endpoint_descriptor(endpoint);
-
-        if (!psIntfAdapter->sBulkIn.bulk_in_endpointAddr && bcm_usb_endpoint_is_bulk_in(endpoint))
-        {
-            buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-            psIntfAdapter->sBulkIn.bulk_in_size = buffer_size;
-            psIntfAdapter->sBulkIn.bulk_in_endpointAddr =
-                                                                endpoint->bEndpointAddress;
-                psIntfAdapter->sBulkIn.bulk_in_pipe =
+
+        for (value = 0; value < iface_desc->desc.bNumEndpoints; ++value) {
+                endpoint = &iface_desc->endpoint[value].desc;
+
+                if (!psIntfAdapter->sBulkIn.bulk_in_endpointAddr && bcm_usb_endpoint_is_bulk_in(endpoint)) {
+                        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                        psIntfAdapter->sBulkIn.bulk_in_size = buffer_size;
+                        psIntfAdapter->sBulkIn.bulk_in_endpointAddr = endpoint->bEndpointAddress;
+                        psIntfAdapter->sBulkIn.bulk_in_pipe =
                                         usb_rcvbulkpipe(psIntfAdapter->udev,
                                                                 psIntfAdapter->sBulkIn.bulk_in_endpointAddr);
-        }
-
-        if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr && bcm_usb_endpoint_is_bulk_out(endpoint))
-        {
+                }
 
-                        psIntfAdapter->sBulkOut.bulk_out_endpointAddr =
-                                                                                endpoint->bEndpointAddress;
-                psIntfAdapter->sBulkOut.bulk_out_pipe =
-                        usb_sndbulkpipe(psIntfAdapter->udev,
+                if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr && bcm_usb_endpoint_is_bulk_out(endpoint)) {
+                        psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
+                        psIntfAdapter->sBulkOut.bulk_out_pipe =
+                                usb_sndbulkpipe(psIntfAdapter->udev,
                                         psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
-        }
-
-        if (!psIntfAdapter->sIntrIn.int_in_endpointAddr && bcm_usb_endpoint_is_int_in(endpoint))
-        {
-            buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-            psIntfAdapter->sIntrIn.int_in_size = buffer_size;
-            psIntfAdapter->sIntrIn.int_in_endpointAddr =
-                                                                endpoint->bEndpointAddress;
-            psIntfAdapter->sIntrIn.int_in_interval = endpoint->bInterval;
-            psIntfAdapter->sIntrIn.int_in_buffer =
+                }
+
+                if (!psIntfAdapter->sIntrIn.int_in_endpointAddr && bcm_usb_endpoint_is_int_in(endpoint)) {
+                        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                        psIntfAdapter->sIntrIn.int_in_size = buffer_size;
+                        psIntfAdapter->sIntrIn.int_in_endpointAddr = endpoint->bEndpointAddress;
+                        psIntfAdapter->sIntrIn.int_in_interval = endpoint->bInterval;
+                        psIntfAdapter->sIntrIn.int_in_buffer =
                                                 kmalloc(buffer_size, GFP_KERNEL);
-            if (!psIntfAdapter->sIntrIn.int_in_buffer) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_in_buffer");
-                return -EINVAL;
-            }
-                        //psIntfAdapter->sIntrIn.int_in_pipe =
-        }
-
-        if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint))
-        {
-
-                        if( !psIntfAdapter->sBulkOut.bulk_out_endpointAddr &&
-                                (psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer))
-                        {
-                                //use first intout end point as a bulk out end point
-                buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-                psIntfAdapter->sBulkOut.bulk_out_size = buffer_size;
-                                //printk("\nINT OUT Endpoing buffer size :%x endpoint :%x\n", buffer_size, value +1);
-                                psIntfAdapter->sBulkOut.bulk_out_endpointAddr =
-                                                                                endpoint->bEndpointAddress;
-                        psIntfAdapter->sBulkOut.bulk_out_pipe =
-                                usb_sndintpipe(psIntfAdapter->udev,
-                                        psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
-                        psIntfAdapter->sBulkOut.int_out_interval = endpoint->bInterval;
+                        if (!psIntfAdapter->sIntrIn.int_in_buffer) {
+                                dev_err(&psIntfAdapter->udev->dev,
+                                        "could not allocate interrupt_in_buffer\n");
+                                return -EINVAL;
+                        }
+                }
 
+                if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint)) {
+                        if (!psIntfAdapter->sBulkOut.bulk_out_endpointAddr &&
+                                (psIntfAdapter->psAdapter->chip_id == T3B) && (value == usedIntOutForBulkTransfer)) {
+                                /* use first intout end point as a bulk out end point */
+                                buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                                psIntfAdapter->sBulkOut.bulk_out_size = buffer_size;
+                                psIntfAdapter->sBulkOut.bulk_out_endpointAddr = endpoint->bEndpointAddress;
+                                psIntfAdapter->sBulkOut.bulk_out_pipe = usb_sndintpipe(psIntfAdapter->udev,
+                                                                        psIntfAdapter->sBulkOut.bulk_out_endpointAddr);
+                                psIntfAdapter->sBulkOut.int_out_interval = endpoint->bInterval;
+                        } else if (value == EP6) {
+                                buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                                psIntfAdapter->sIntrOut.int_out_size = buffer_size;
+                                psIntfAdapter->sIntrOut.int_out_endpointAddr = endpoint->bEndpointAddress;
+                                psIntfAdapter->sIntrOut.int_out_interval = endpoint->bInterval;
+                                psIntfAdapter->sIntrOut.int_out_buffer= kmalloc(buffer_size, GFP_KERNEL);
+                                if (!psIntfAdapter->sIntrOut.int_out_buffer) {
+                                        dev_err(&psIntfAdapter->udev->dev,
+                                                "could not allocate interrupt_out_buffer\n");
+                                        return -EINVAL;
+                                }
                         }
-                        else if(value == EP6)
-                        {
-                    buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-                    psIntfAdapter->sIntrOut.int_out_size = buffer_size;
-                    psIntfAdapter->sIntrOut.int_out_endpointAddr =
-                                                                                endpoint->bEndpointAddress;
-                    psIntfAdapter->sIntrOut.int_out_interval = endpoint->bInterval;
-                    psIntfAdapter->sIntrOut.int_out_buffer= kmalloc(buffer_size,
-                                                                                                                GFP_KERNEL);
-                        if (!psIntfAdapter->sIntrOut.int_out_buffer)
-                                        {
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_out_buffer");
-                        return -EINVAL;
-            }
-        }
-    }
-        }
-    usb_set_intfdata(psIntfAdapter->interface, psIntfAdapter);
-    retval = usb_register_dev(psIntfAdapter->interface, &usbbcm_class);
-        if(retval)
-        {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "usb register dev failed = %d", retval);
-                psIntfAdapter->psAdapter->bUsbClassDriverRegistered = FALSE;
-                return retval;
-        }
-        else
-        {
-                psIntfAdapter->psAdapter->bUsbClassDriverRegistered = TRUE;
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "usb dev registered");
+                }
         }
 
+        usb_set_intfdata(psIntfAdapter->interface, psIntfAdapter);
+
         psIntfAdapter->psAdapter->bcm_file_download = InterfaceFileDownload;
         psIntfAdapter->psAdapter->bcm_file_readback_from_chip =
                                 InterfaceFileReadbackFromChip;
@@ -744,67 +598,51 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 
         retval = CreateInterruptUrb(psIntfAdapter);
 
-        if(retval)
-        {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cannot create interrupt urb");
+        if (retval) {
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,
+                        "Cannot create interrupt urb\n");
                 return retval;
         }
 
         retval = AllocUsbCb(psIntfAdapter);
-        if(retval)
-        {
+        if (retval)
                 return retval;
-        }
-
 
-        retval = device_run(psIntfAdapter);
-        if(retval)
-        {
-                return retval;
-        }
-
-
-        return 0;
+        return device_run(psIntfAdapter);
 }
 
-static int InterfaceSuspend (struct usb_interface *intf, pm_message_t message)
+static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message)
 {
         PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "=================================\n");
-        //Bcm_kill_all_URBs(psIntfAdapter);
+
         psIntfAdapter->bSuspended = TRUE;
 
-        if(TRUE == psIntfAdapter->bPreparingForBusSuspend)
-        {
+        if (TRUE == psIntfAdapter->bPreparingForBusSuspend) {
                 psIntfAdapter->bPreparingForBusSuspend = FALSE;
 
-                if(psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE)
-                {
+                if (psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE) {
                         psIntfAdapter->psAdapter->IdleMode = TRUE ;
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Host Entered in PMU Idle Mode..");
-                }
-                else
-                {
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                "Host Entered in PMU Idle Mode.\n");
+                } else {
                         psIntfAdapter->psAdapter->bShutStatus = TRUE;
-                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Host Entered in PMU Shutdown Mode..");
+                        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+                                "Host Entered in PMU Shutdown Mode.\n");
                 }
         }
         psIntfAdapter->psAdapter->bPreparingForLowPowerMode = FALSE;
 
-        //Signaling the control pkt path
+        /* Signaling the control pkt path */
         wake_up(&psIntfAdapter->psAdapter->lowpower_mode_wait_queue);
 
         return 0;
 }
 
-static int InterfaceResume (struct usb_interface *intf)
+static int InterfaceResume(struct usb_interface *intf)
 {
-    PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
-        printk("=================================\n");
+        PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);
         mdelay(100);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
-        intf->pm_usage_cnt =1 ;
-#endif
+
         psIntfAdapter->bSuspended = FALSE;
 
         StartInterruptUrb(psIntfAdapter);
@@ -812,57 +650,41 @@ static int InterfaceResume (struct usb_interface *intf)
         return 0;
 }
 
-static int InterfacePreReset(struct usb_interface *intf)
-{
-    printk("====================>");
-        return STATUS_SUCCESS;
-}
-
-static int InterfacePostReset(struct usb_interface *intf)
-{
-    printk("Do Post chip reset setting here if it is required");
-        return STATUS_SUCCESS;
-}
 static struct usb_driver usbbcm_driver = {
-    .name = "usbbcm",
-    .probe = usbbcm_device_probe,
-    .disconnect = usbbcm_disconnect,
-    .suspend = InterfaceSuspend,
-    .resume = InterfaceResume,
-        .pre_reset=InterfacePreReset,
-        .post_reset=InterfacePostReset,
-    .id_table = InterfaceUsbtable,
-    .supports_autosuspend = 1,
+        .name = "usbbcm",
+        .probe = usbbcm_device_probe,
+        .disconnect = usbbcm_disconnect,
+        .suspend = InterfaceSuspend,
+        .resume = InterfaceResume,
+        .id_table = InterfaceUsbtable,
+        .supports_autosuspend = 1,
 };
 
+struct class *bcm_class;
 
-/*
-Function:                               InterfaceInitialize
-
-Description:                    This is the hardware specific initialization Function.
-                                                Registering the driver with NDIS , other device specific NDIS
-                                                and hardware initializations are done here.
-
-Input parameters:               IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+static __init int bcm_init(void)
+{
+        printk(KERN_INFO "%s: %s, %s\n", DRV_NAME, DRV_DESCRIPTION, DRV_VERSION);
+        printk(KERN_INFO "%s\n", DRV_COPYRIGHT);
 
+        bcm_class = class_create(THIS_MODULE, DRV_NAME);
+        if (IS_ERR(bcm_class)) {
+                printk(KERN_ERR DRV_NAME ": could not create class\n");
+                return PTR_ERR(bcm_class);
+        }
 
-Return:                                 BCM_STATUS_SUCCESS - If Initialization of the
-                                                HW Interface was successful.
-                                                Other           - If an error occured.
-*/
-INT InterfaceInitialize(void)
-{
-//      BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Registering Usb driver!!");
         return usb_register(&usbbcm_driver);
 }
 
-INT InterfaceExit(void)
+static __exit void bcm_exit(void)
 {
-        //PMINI_ADAPTER psAdapter = NULL;
-        int status = 0;
-
-        //BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Deregistering Usb driver!!");
         usb_deregister(&usbbcm_driver);
-        return status;
+        class_destroy(bcm_class);
 }
-MODULE_LICENSE ("GPL");
+
+module_init(bcm_init);
+module_exit(bcm_exit);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h
index e7a96e5c5c50..058315a64c05 100644
--- a/drivers/staging/bcm/InterfaceInit.h
+++ b/drivers/staging/bcm/InterfaceInit.h
@@ -8,9 +8,11 @@
 #define BCM_USB_PRODUCT_ID_T3   0x0300
 #define BCM_USB_PRODUCT_ID_T3B  0x0210
 #define BCM_USB_PRODUCT_ID_T3L  0x0220
+#define BCM_USB_PRODUCT_ID_SM250        0xbccd
 #define BCM_USB_PRODUCT_ID_SYM  0x15E
 #define BCM_USB_PRODUCT_ID_1901 0xe017
 #define BCM_USB_PRODUCT_ID_226  0x0132
+#define BCM_USB_PRODUCT_ID_ZTE_TU25 0x0007
 
 #define BCM_USB_MINOR_BASE              192
 
@@ -19,33 +21,7 @@ INT InterfaceInitialize(void);
 
 INT InterfaceExit(void);
 
-#ifndef BCM_SHM_INTERFACE
-INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter);
-
 INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter);
 
-VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter);
-
-#else
-INT InterfaceAdapterInit(PMINI_ADAPTER Adapter);
-#endif
-
-
-#if 0
-
-ULONG InterfaceClaimAdapter(PMINI_ADAPTER Adapter);
-
-VOID InterfaceDDRControllerInit(PMINI_ADAPTER Adapter);
-
-ULONG InterfaceReset(PMINI_ADAPTER Adapter);
-
-ULONG InterfaceRegisterResources(PMINI_ADAPTER Adapter);
-
-VOID InterfaceUnRegisterResources(PMINI_ADAPTER Adapter);
-
-ULONG InterfaceFirmwareDownload(PMINI_ADAPTER Adapter);
-
-#endif
-
 #endif
 
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index f928fe4d564d..220ff922bdcf 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
@@ -8,6 +7,10 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
         PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context;
         PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter ;
 
+        if (netif_msg_intr(Adapter))
+                pr_info(PFX "%s: interrupt status %d\n",
+                        Adapter->dev->name, status);
+
         if(Adapter->device_removed == TRUE)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Device has Got Removed.");
@@ -87,7 +90,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint  has got halted/stalled...need to clear this");
                                 Adapter->bEndPointHalted = TRUE ;
                                 wake_up(&Adapter->tx_packet_wait_queue);
-                                urb->status = STATUS_SUCCESS ;;
+                                urb->status = STATUS_SUCCESS ;
                                 return;
                 }
             /* software-driven interface shutdown */
@@ -164,40 +167,3 @@ INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
         return status;
 }
 
-/*
-Function:                               InterfaceEnableInterrupt
-
-Description:                    This is the hardware specific Function for configuring
-                                                and enabling the interrupts on the device.
-
-Input parameters:               IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
-
-
-Return:                         BCM_STATUS_SUCCESS - If configuring the interrupts was successful.
-                                                Other           - If an error occured.
-*/
-
-void InterfaceEnableInterrupt(PMINI_ADAPTER Adapter)
-{
-
-}
-
-/*
-Function:                               InterfaceDisableInterrupt
-
-Description:                    This is the hardware specific Function for disabling the interrupts on the device.
-
-Input parameters:               IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
-
-
-Return:                         BCM_STATUS_SUCCESS - If disabling the interrupts was successful.
-                                                Other           - If an error occured.
-*/
-
-void InterfaceDisableInterrupt(PMINI_ADAPTER Adapter)
-{
-
-}
-
-#endif
-
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 8fc893b37fe4..a51185b522cf 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -1,17 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
-
-PS_INTERFACE_ADAPTER
-InterfaceAdapterGet(PMINI_ADAPTER psAdapter)
-{
-        if(psAdapter == NULL)
-        {
-                return NULL;
-        }
-        return (PS_INTERFACE_ADAPTER)(psAdapter->pvInterfaceAdapter);
-}
-
 INT
 InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
             UINT addr,
@@ -102,7 +90,7 @@ InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
         if((psIntfAdapter->psAdapter->StopAllXaction == TRUE) && (psIntfAdapter->psAdapter->chip_id >= T3LPB))
         {
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL,"Currently Xaction is not allowed on the bus...");
-                return EACCES;
+                return -EACCES;
         }
 
         if(psIntfAdapter->bSuspended ==TRUE || psIntfAdapter->bPreparingForBusSuspend == TRUE)
@@ -236,9 +224,7 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
         }
 
         /* Cancel All submitted TX URB's */
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cancelling All Submitted TX Urbs \n");
-
-    for(i = 0; i < MAXIMUM_USB_TCB; i++)
+        for(i = 0; i < MAXIMUM_USB_TCB; i++)
         {
                 tempUrb = psIntfAdapter->asUsbTcb[i].urb;
                 if(tempUrb)
@@ -248,9 +234,6 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
                 }
         }
 
-
-    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cancelling All submitted Rx Urbs \n");
-
         for(i = 0; i < MAXIMUM_USB_RCB; i++)
         {
                 tempUrb = psIntfAdapter->asUsbRcb[i].urb;
@@ -261,16 +244,11 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
                 }
         }
 
-
         atomic_set(&psIntfAdapter->uNumTcbUsed, 0);
         atomic_set(&psIntfAdapter->uCurrTcb, 0);
 
         atomic_set(&psIntfAdapter->uNumRcbUsed, 0);
         atomic_set(&psIntfAdapter->uCurrRcb, 0);
-
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "TCB: used- %d cur-%d\n", atomic_read(&psIntfAdapter->uNumTcbUsed), atomic_read(&psIntfAdapter->uCurrTcb));
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "RCB: used- %d cur-%d\n", atomic_read(&psIntfAdapter->uNumRcbUsed), atomic_read(&psIntfAdapter->uCurrRcb));
-
 }
 
 VOID putUsbSuspend(struct work_struct *work)
@@ -282,9 +260,6 @@ VOID putUsbSuspend(struct work_struct *work)
 
         if(psIntfAdapter->bSuspended == FALSE)
                 usb_autopm_put_interface(intf);
-        else
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Interface Resumed Completely\n");
 
 }
 
-#endif
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 74c81d45cff4..6c9e39bf9889 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -1,9 +1,6 @@
 #ifndef __INTERFACE_MISC_H
 #define __INTERFACE_MISC_H
 
-PS_INTERFACE_ADAPTER
-InterfaceAdapterGet(PMINI_ADAPTER psAdapter);
-
 INT
 InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                         UINT addr,
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 6fee9684f2ef..533f8ebe0f84 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -1,5 +1,15 @@
 #include "headers.h"
-extern int SearchVcid(PMINI_ADAPTER , unsigned short);
+
+static int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid)
+{
+        int iIndex=0;
+
+        for(iIndex=(NO_OF_QUEUES-1);iIndex>=0;iIndex--)
+                if(Adapter->PackInfo[iIndex].usVCID_Value == usVcid)
+                        return iIndex;
+        return NO_OF_QUEUES+1;
+
+}
 
 
 static PUSB_RCB
@@ -38,13 +48,9 @@ static void read_bulk_callback(struct urb *urb)
         PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;
         PLEADER pLeader = urb->transfer_buffer;
 
-
-        #if 0
-        int *puiBuffer = NULL;
-        struct timeval tv;
-        memset(&tv, 0, sizeof(tv));
-        do_gettimeofday(&tv);
-        #endif
+        if (unlikely(netif_msg_rx_status(Adapter)))
+                pr_info(PFX "%s: rx urb status %d length %d\n",
+                        Adapter->dev->name, urb->status, urb->actual_length);
 
         if((Adapter->device_removed == TRUE)  ||
                 (TRUE == Adapter->bEndPointHalted) ||
@@ -89,10 +95,10 @@ static void read_bulk_callback(struct urb *urb)
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX", pLeader->Status,pLeader->PLength,pLeader->Vcid);
         if(MAX_CNTL_PKT_SIZE < pLeader->PLength)
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Corrupted leader length...%d\n",
-                                        pLeader->PLength);
-                atomic_inc(&Adapter->RxPacketDroppedCount);
-                atomic_add(pLeader->PLength, &Adapter->BadRxByteCount);
+                if (netif_msg_rx_err(Adapter))
+                        pr_info(PFX "%s: corrupted leader length...%d\n",
+                                Adapter->dev->name, pLeader->PLength);
+                ++Adapter->dev->stats.rx_dropped;
                 atomic_dec(&psIntfAdapter->uNumRcbUsed);
                 return;
         }
@@ -145,10 +151,9 @@ static void read_bulk_callback(struct urb *urb)
                 skb_put (skb, pLeader->PLength + ETH_HLEN);
                 Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength;
                 Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength;
-                atomic_add(pLeader->PLength, &Adapter->GoodRxByteCount);
         BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt of len :0x%X", pLeader->PLength);
 
-                if(Adapter->if_up)
+                if(netif_running(Adapter->dev))
                 {
                         /* Moving ahead by ETH_HLEN to the data ptr as received from FW */
                         skb_pull(skb, ETH_HLEN);
@@ -173,9 +178,12 @@ static void read_bulk_callback(struct urb *urb)
                 else
                 {
                     BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB...");
-                        bcm_kfree_skb(skb);
+                        dev_kfree_skb(skb);
                 }
-                atomic_inc(&Adapter->GoodRxPktCount);
+
+                ++Adapter->dev->stats.rx_packets;
+                Adapter->dev->stats.rx_bytes += pLeader->PLength;
+
                 for(uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++)
                 {
                         if((pLeader->PLength <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1))
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index 771f7b34d2ec..a842de9de6b5 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -1,50 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
-
-/*
-Function:                               InterfaceTxDataPacket
-
-Description:                    This is the hardware specific Function for Transmitting
-                                                data packet to the device.
-
-Input parameters:               IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
-                                                PVOID Packet                            -  Packet Containing the data to be transmitted
-                                                USHORT usVcid                      - VCID on which data packet is to be sent
-
-
-Return:                         BCM_STATUS_SUCCESS - If Tx was successful.
-                                                Other           - If an error occured.
-*/
-
-ULONG InterfaceTxDataPacket(PMINI_ADAPTER Adapter,PVOID Packet,USHORT usVcid)
-{
-        ULONG   Status = 0;
-        return Status;
-}
-
-/*
-Function:                               InterfaceTxControlPacket
-
-Description:                    This is the hardware specific Function for Transmitting
-                                                control packet to the device.
-
-Input parameters:               IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
-                                                PVOID pvBuffer                     - Buffer containg control packet
-                                                UINT uiBufferLength                - Buffer Length
-
-Return:                         BCM_STATUS_SUCCESS - If control packet transmit was successful.
-                                                Other           - If an error occured.
-*/
-
-ULONG InterfaceTxControlPacket(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT uiBufferLength)
-{
-        ULONG   Status = 0;
-
-
-
-        return Status;
-}
 /*this is transmit call-back(BULK OUT)*/
 static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
@@ -54,10 +9,10 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
         PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;
         BOOLEAN bpowerDownMsg = FALSE ;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-#if 0
-        struct timeval tv;
-        UINT time_ms = 0;
-#endif
+
+    if (unlikely(netif_msg_tx_done(Adapter)))
+            pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, urb->status);
+
         if(urb->status != STATUS_SUCCESS)
         {
                 if(urb->status == -EPIPE)
@@ -78,11 +33,6 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
         if(TRUE == psAdapter->bPreparingForLowPowerMode)
         {
-                #if 0
-                do_gettimeofday(&tv);
-                time_ms = tv.tv_sec *1000 + tv.tv_usec/1000;
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, " %s Idle Mode ACK_Sent got from device at time :0x%x", __FUNCTION__, time_ms);
-                #endif
 
                 if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
                         (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
@@ -152,17 +102,12 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
         }
 
 err_exit :
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-        usb_buffer_free(urb->dev, urb->transfer_buffer_length,
-                        urb->transfer_buffer, urb->transfer_dma);
-#else
         usb_free_coherent(urb->dev, urb->transfer_buffer_length,
                         urb->transfer_buffer, urb->transfer_dma);
-#endif
 }
 
 
-static __inline PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
+static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
 {
         PUSB_TCB pTcb = NULL;
         UINT index = 0;
@@ -183,20 +128,14 @@ static __inline PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
         return pTcb;
 }
 
-static __inline int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID data, int len)
+static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID data, int len)
 {
 
         struct urb *urb = pTcb->urb;
         int retval = 0;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-        urb->transfer_buffer = usb_buffer_alloc(psIntfAdapter->udev, len,
-                                                GFP_ATOMIC, &urb->transfer_dma);
-#else
         urb->transfer_buffer = usb_alloc_coherent(psIntfAdapter->udev, len,
                                                 GFP_ATOMIC, &urb->transfer_dma);
-#endif
-
         if (!urb->transfer_buffer)
         {
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Error allocating memory\n");
@@ -255,5 +194,4 @@ int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
         return TransmitTcb(psIntfAdapter, pTcb, data, len);
 }
 
-#endif
 
diff --git a/drivers/staging/bcm/InterfaceTx.h b/drivers/staging/bcm/InterfaceTx.h
index 053f631e2042..273147577c17 100644
--- a/drivers/staging/bcm/InterfaceTx.h
+++ b/drivers/staging/bcm/InterfaceTx.h
@@ -3,11 +3,5 @@
 
 INT InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len);
 
-
-ULONG InterfaceTxDataPacket(PMINI_ADAPTER Adapter,PVOID Packet,USHORT usVcid);
-
-ULONG InterfaceTxControlPacket(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT uiBufferLength);
-
-
 #endif
 
diff --git a/drivers/staging/bcm/Interfacemain.h b/drivers/staging/bcm/Interfacemain.h
deleted file mode 100644
index e0db563c5e0f..000000000000
--- a/drivers/staging/bcm/Interfacemain.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _MAIN_
-#define _MAIN_
-#if 0
-typedef struct _MINI_ADAPTER
-{
-        S_INTERFACE_ADAPTER stInterfaceAdapter;
-}MINI_ADAPTER,*PMINI_ADAPTER;
-
-#endif
-#endif
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index cae382313ce9..f4cf41c0e46b 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -75,14 +75,14 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 * Returns     - The number of bytes allowed for transmission.
 *
 ***********************************************************************/
-static __inline ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
+static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>");
         /* Validate the parameters */
         if(NULL == Adapter || (psSF < Adapter->PackInfo &&
                 (uintptr_t)psSF > (uintptr_t) &Adapter->PackInfo[HiPriority]))
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %ld\n", Adapter, (psSF-Adapter->PackInfo));
+                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %zd\n", Adapter, (psSF-Adapter->PackInfo));
                 return 0;
         }
 
@@ -94,51 +94,27 @@ static __inline ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
                 }
                 else
                 {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Not enough tokens in queue %ld Available %u\n",
+                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Not enough tokens in queue %zd Available %u\n",
                                 psSF-Adapter->PackInfo, psSF->uiCurrentTokenCount);
                         psSF->uiPendedLast = 1;
                 }
         }
         else
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Queue %ld not valid\n", psSF-Adapter->PackInfo);
+                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Queue %zd not valid\n", psSF-Adapter->PackInfo);
         }
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow <===");
         return 0;
 }
 
-static __inline void RemovePacketFromQueue(PacketInfo *pPackInfo , struct sk_buff *Packet)
-{
-        struct sk_buff *psQueueCurrent=NULL, *psLastQueueNode=NULL;
-        psQueueCurrent = pPackInfo->FirstTxQueue;
-        while(psQueueCurrent)
-        {
-                if(Packet == psQueueCurrent)
-                {
-                        if(psQueueCurrent == pPackInfo->FirstTxQueue)
-                        {
-                                pPackInfo->FirstTxQueue=psQueueCurrent->next;
-                                if(psQueueCurrent==pPackInfo->LastTxQueue)
-                                        pPackInfo->LastTxQueue=NULL;
-                        }
-                        else
-                        {
-                                psLastQueueNode->next=psQueueCurrent->next;
-                        }
-                        break;
-                }
-                psLastQueueNode = psQueueCurrent;
-                psQueueCurrent=psQueueCurrent->next;
-        }
-}
 /**
 @ingroup tx_functions
 This function despatches packet from the specified queue.
 @return Zero(success) or Negative value(failure)
 */
-static __inline INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
-                                                                PacketInfo *psSF,               /**<Queue identifier*/
-                                                                struct sk_buff*  Packet)        /**<Pointer to the packet to be sent*/
+static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
+                               PacketInfo *psSF,                /**<Queue identifier*/
+                               struct sk_buff*  Packet) /**<Pointer to the packet to be sent*/
 {
         INT     Status=STATUS_FAILURE;
         UINT uiIndex =0,PktLen = 0;
@@ -180,8 +156,7 @@ static __inline INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapte
 * Returns     - None.
 *
 ****************************************************************************/
-static __inline VOID CheckAndSendPacketFromIndex
-(PMINI_ADAPTER Adapter, PacketInfo *psSF)
+static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
         struct sk_buff  *QueuePacket=NULL;
         char                    *pControlPacket = NULL;
@@ -189,7 +164,7 @@ static __inline VOID CheckAndSendPacketFromIndex
         int                             iPacketLen=0;
 
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "%ld ====>", (psSF-Adapter->PackInfo));
+        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "%zd ====>", (psSF-Adapter->PackInfo));
         if((psSF != &Adapter->PackInfo[HiPriority]) && Adapter->LinkUpStatus && atomic_read(&psSF->uiPerSFTxResourceCount))//Get data packet
         {
                 if(!psSF->ucDirection )
@@ -197,10 +172,8 @@ static __inline VOID CheckAndSendPacketFromIndex
 
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "UpdateTokenCount ");
                 if(Adapter->IdleMode || Adapter->bPreparingForLowPowerMode)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Device is in Idle Mode..Hence blocking Data Packets..\n");
-                        return;
-                }
+                        return; /* in idle mode */
+
                 // Check for Free Descriptors
                 if(atomic_read(&Adapter->CurrNumFreeTxDesc) <= MINIMUM_PENDING_DESCRIPTORS)
                 {
@@ -208,9 +181,6 @@ static __inline VOID CheckAndSendPacketFromIndex
                         return ;
                 }
 
-#if 0
-                PruneQueue(Adapter,(psSF-Adapter->PackInfo));
-#endif
                 spin_lock_bh(&psSF->SFQueueLock);
                 QueuePacket=psSF->FirstTxQueue;
 
@@ -240,7 +210,7 @@ static __inline VOID CheckAndSendPacketFromIndex
                         }
                         else
                         {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %ld\n", psSF-Adapter->PackInfo);
+                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo);
                                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n",
                                         psSF->uiCurrentTokenCount, iPacketLen);
                                 //this part indicates that becuase of non-availability of the tokens
@@ -290,17 +260,6 @@ static __inline VOID CheckAndSendPacketFromIndex
                         }
                 }
         }
-
-        if(Status != STATUS_SUCCESS)    //Tx of data packet to device Failed
-        {
-                if(Adapter->bcm_jiffies == 0)
-                        Adapter->bcm_jiffies = jiffies;
-        }
-        else
-        {
-                Adapter->bcm_jiffies = 0;
-        }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "<=====");
 }
 
 
@@ -387,12 +346,7 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
                 if(exit_flag == TRUE )
                     break ;
         }/* end of inner while loop */
-        if(Adapter->bcm_jiffies == 0 &&
-                atomic_read(&Adapter->TotalPacketCount) != 0 &&
-                uiPrevTotalCount == atomic_read(&Adapter->TotalPacketCount))
-        {
-                Adapter->bcm_jiffies = jiffies;
-        }
+
         update_per_cid_rx  (Adapter);
         Adapter->txtransmit_running = 0;
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "<======");
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 0241234605f1..feb351578c8b 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -4,10 +4,6 @@
 #ifndef __MACROS_H__
 #define __MACROS_H__
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define kthread_run(threadfn,data,datafmt)(struct task_struct *)kernel_thread(threadfn,data,0)
-#endif
-
 #define TX_TIMER_PERIOD 10      //10 msec
 #define MAX_CLASSIFIERS 100
 //#define MAX_CLASSIFIERS_PER_SF  20
@@ -17,10 +13,9 @@
 #define MAX_DATA_PKTS           200
 #define MAX_ETH_SIZE            1536
 #define MAX_CNTL_PKT_SIZE 2048
-/* TIMER RELATED */
-#define JIFFIES_2_QUADPART()    (ULONG)(jiffies * 10000) // jiffies(1msec) to Quadpart(100nsec)
 
 #define MTU_SIZE 1400
+#define TX_QLEN  5
 
 #define MAC_ADDR_REGISTER 0xbf60d000
 
@@ -266,7 +261,7 @@ typedef enum _E_PHS_DSC_ACTION
 
 #define FIRMWARE_BEGIN_ADDR 0xBFC00000
 
-#define INVALID_QUEUE_INDEX (USHORT)-1
+#define INVALID_QUEUE_INDEX NO_OF_QUEUES
 
 #define INVALID_PID (pid_t)-1
 #define DDR_80_MHZ      0
@@ -300,12 +295,7 @@ typedef enum _E_PHS_DSC_ACTION
 
 /* Idle Mode Related Registers */
 #define DEBUG_INTERRUPT_GENERATOR_REGISTOR 0x0F00007C
-#ifdef BCM_SHM_INTERFACE
-#define SW_ABORT_IDLEMODE_LOC           0xbfc02f9c
-#define CPE_VIRTUAL_MAILBOX_REG     0xBFC02E58
-#else
 #define SW_ABORT_IDLEMODE_LOC           0x0FF01FFC
-#endif
 
 #define SW_ABORT_IDLEMODE_PATTERN       0xd0ea1d1e
 #define DEVICE_INT_OUT_EP_REG0          0x0F011870
@@ -355,12 +345,7 @@ typedef enum ePMU_MODES
         HYBRID_MODE_6   = 2
 }PMU_MODE;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-#define MAX_RDM_WRM_RETIRES 16
-#else
 #define MAX_RDM_WRM_RETIRES 1
-#endif
-
 
 enum eAbortPattern {
         ABORT_SHUTDOWN_MODE = 1,
@@ -369,27 +354,6 @@ enum eAbortPattern {
         ABORT_IDLE_SYNCDOWN = 3
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-        #define GET_BCM_ADAPTER(net_dev)  ({\
-    PMINI_ADAPTER __Adapter = NULL;     \
-    if (net_dev)    {   \
-         __Adapter = (PMINI_ADAPTER)(net_dev->priv); \
-    } \
-    else    {   \
-         __Adapter = NULL;  \
-    }__Adapter;} )
-#else
-        #define GET_BCM_ADAPTER(net_dev) ({\
-    PMINI_ADAPTER __Adapter = NULL;     \
-    if (net_dev)    {   \
-         __Adapter = (PMINI_ADAPTER)(*((unsigned long *)netdev_priv(net_dev)));  \
-    } \
-    else    {   \
-         __Adapter = NULL;  \
-    }__Adapter;})
-
-
-#endif
 
 /* Offsets used by driver in skb cb variable */
 #define SKB_CB_CLASSIFICATION_OFFSET    0
diff --git a/drivers/staging/bcm/Makefile b/drivers/staging/bcm/Makefile
index c3ae25af670a..652b7f87737c 100644
--- a/drivers/staging/bcm/Makefile
+++ b/drivers/staging/bcm/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_BCM_WIMAX) +=	bcm_wimax.o
 
 bcm_wimax-y :=  InterfaceDld.o InterfaceIdleMode.o InterfaceInit.o InterfaceRx.o \
                 InterfaceIsr.o InterfaceMisc.o InterfaceTx.o \
-                Arp.o CmHost.o Debug.o IPv6Protocol.o Qos.o Transmit.o\
+                CmHost.o IPv6Protocol.o Qos.o Transmit.o\
                 Bcmnet.o DDRInit.o HandleControlPacket.o\
                 LeakyBucket.o Misc.o sort.o Bcmchar.o hostmibs.o PHSModule.o\
-                Osal_Misc.o led_control.o nvm.o vendorspecificextn.o
+                led_control.o nvm.o vendorspecificextn.o
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 22550f745917..f585aae9cf8b 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1,5 +1,12 @@
 #include "headers.h"
 
+static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path,
+                        unsigned int loc);
+static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
+static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter,PUCHAR pucBuffer);
+static int bcm_parse_target_params(PMINI_ADAPTER Adapter);
+static void beceem_protocol_reset (PMINI_ADAPTER Adapter);
+
 static VOID default_wimax_protocol_initialize(PMINI_ADAPTER Adapter)
 {
 
@@ -60,21 +67,11 @@ InitAdapter(PMINI_ADAPTER psAdapter)
     //init_waitqueue_head(&psAdapter->device_wake_queue);
     psAdapter->fw_download_done=FALSE;
 
-    psAdapter->pvOsDepData = (PLINUX_DEP_DATA) kmalloc(sizeof(LINUX_DEP_DATA),
-                 GFP_KERNEL);
-
-    if(psAdapter->pvOsDepData == NULL)
-        {
-        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Linux Specific Data allocation failed");
-        return -ENOMEM;
-    }
-    memset(psAdapter->pvOsDepData, 0, sizeof(LINUX_DEP_DATA));
 
         default_wimax_protocol_initialize(psAdapter);
         for (i=0;i<MAX_CNTRL_PKTS;i++)
         {
-                psAdapter->txctlpacket[i] = (char *)kmalloc(MAX_CNTL_PKT_SIZE,
-                                                                                                GFP_KERNEL);
+                psAdapter->txctlpacket[i] = kmalloc(MAX_CNTL_PKT_SIZE, GFP_KERNEL);
                 if(!psAdapter->txctlpacket[i])
                 {
                         BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No More Cntl pkts got, max got is %d", i);
@@ -117,7 +114,7 @@ InitAdapter(PMINI_ADAPTER psAdapter)
 
 VOID AdapterFree(PMINI_ADAPTER Adapter)
 {
-        INT count = 0;
+        int count;
 
         beceem_protocol_reset(Adapter);
 
@@ -125,72 +122,66 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
 
         if(Adapter->control_packet_handler && !IS_ERR(Adapter->control_packet_handler))
                 kthread_stop (Adapter->control_packet_handler);
+
         if(Adapter->transmit_packet_thread && !IS_ERR(Adapter->transmit_packet_thread))
-        kthread_stop (Adapter->transmit_packet_thread);
-    wake_up(&Adapter->process_read_wait_queue);
+                kthread_stop (Adapter->transmit_packet_thread);
+
+        wake_up(&Adapter->process_read_wait_queue);
+
         if(Adapter->LEDInfo.led_thread_running & (BCM_LED_THREAD_RUNNING_ACTIVELY | BCM_LED_THREAD_RUNNING_INACTIVELY))
                 kthread_stop (Adapter->LEDInfo.led_cntrl_threadid);
-        bcm_unregister_networkdev(Adapter);
+
+        unregister_networkdev(Adapter);
+
+        /* FIXME: use proper wait_event and refcounting */
         while(atomic_read(&Adapter->ApplicationRunning))
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Waiting for Application to close.. %d\n",atomic_read(&Adapter->ApplicationRunning));
                 msleep(100);
         }
         unregister_control_device_interface(Adapter);
-        if(Adapter->dev && !IS_ERR(Adapter->dev))
-                free_netdev(Adapter->dev);
-        if(Adapter->pstargetparams != NULL)
-        {
-                bcm_kfree(Adapter->pstargetparams);
-        }
+
+        kfree(Adapter->pstargetparams);
+
         for (count =0;count < MAX_CNTRL_PKTS;count++)
-        {
-                if(Adapter->txctlpacket[count])
-                        bcm_kfree(Adapter->txctlpacket[count]);
-        }
+                kfree(Adapter->txctlpacket[count]);
+
         FreeAdapterDsxBuffer(Adapter);
-        if(Adapter->pvOsDepData)
-                bcm_kfree (Adapter->pvOsDepData);
-        if(Adapter->pvInterfaceAdapter)
-                bcm_kfree(Adapter->pvInterfaceAdapter);
+
+        kfree(Adapter->pvInterfaceAdapter);
 
         //Free the PHS Interface
         PhsCleanup(&Adapter->stBCMPhsContext);
 
-#ifndef BCM_SHM_INTERFACE
         BcmDeAllocFlashCSStructure(Adapter);
-#endif
 
-        bcm_kfree (Adapter);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "<========\n");
+        free_netdev(Adapter->dev);
 }
 
-
-int create_worker_threads(PMINI_ADAPTER psAdapter)
+static int create_worker_threads(PMINI_ADAPTER psAdapter)
 {
-        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Init Threads...");
         // Rx Control Packets Processing
         psAdapter->control_packet_handler = kthread_run((int (*)(void *))
-                        control_packet_handler, psAdapter, "CtrlPktHdlr");
+                                                        control_packet_handler, psAdapter, "%s-rx", DRV_NAME);
         if(IS_ERR(psAdapter->control_packet_handler))
         {
-                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success\n");
+                pr_notice(DRV_NAME ": could not create control thread\n");
                 return PTR_ERR(psAdapter->control_packet_handler);
         }
+
         // Tx Thread
         psAdapter->transmit_packet_thread = kthread_run((int (*)(void *))
-                tx_pkt_handler, psAdapter, "TxPktThread");
+                                                        tx_pkt_handler, psAdapter, "%s-tx", DRV_NAME);
         if(IS_ERR (psAdapter->transmit_packet_thread))
         {
-                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success");
+                pr_notice(DRV_NAME ": could not creat transmit thread\n");
                 kthread_stop(psAdapter->control_packet_handler);
                 return PTR_ERR(psAdapter->transmit_packet_thread);
         }
         return 0;
 }
 
-
-static inline struct file *open_firmware_file(PMINI_ADAPTER Adapter, char *path)
+static struct file *open_firmware_file(PMINI_ADAPTER Adapter, const char *path)
 {
     struct file             *flp=NULL;
     mm_segment_t        oldfs;
@@ -200,26 +191,20 @@ static inline struct file *open_firmware_file(PMINI_ADAPTER Adapter, char *path)
     set_fs(oldfs);
     if(IS_ERR(flp))
     {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Unable To Open File %s, err  %lx",
-                                path, PTR_ERR(flp));
-                flp = NULL;
-    }
-    else
-    {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Got file descriptor pointer of %s!",
-                        path);
+            pr_err(DRV_NAME "Unable To Open File %s, err %ld",
+                   path, PTR_ERR(flp));
+            flp = NULL;
     }
-        if(Adapter->device_removed)
-        {
-                flp = NULL;
-        }
+
+    if(Adapter->device_removed)
+            flp = NULL;
 
     return flp;
 }
 
 
-int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */
-                        char *path,     /**< path to image file */
+static int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */
+                        const char *path,     /**< path to image file */
                         unsigned int loc    /**< Download Address on the chip*/
                         )
 {
@@ -248,9 +233,7 @@ int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */
         goto exit_download;
     }
     oldfs=get_fs();set_fs(get_ds());
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     vfs_llseek(flp, 0, 0);
-#endif
     set_fs(oldfs);
     if(Adapter->bcm_file_readback_from_chip(Adapter->pvInterfaceAdapter,
                                                                                 flp, loc))
@@ -265,29 +248,8 @@ exit_download:
         if(flp && !(IS_ERR(flp)))
         filp_close(flp, current->files);
     set_fs(oldfs);
-    do_gettimeofday(&tv);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "file download done at %lx", ((tv.tv_sec * 1000) +
-                            (tv.tv_usec/1000)));
-    return errorno;
-}
-
 
-void bcm_kfree_skb(struct sk_buff *skb)
-{
-        if(skb)
-    {
-        kfree_skb(skb);
-    }
-        skb = NULL ;
-}
-
-VOID bcm_kfree(VOID *ptr)
-{
-        if(ptr)
-        {
-                kfree(ptr);
-        }
-        ptr = NULL ;
+    return errorno;
 }
 
 /**
@@ -395,13 +357,6 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
                         /*Setting bIdleMode_tx_from_host to TRUE to indicate LED control thread to represent
                           the wake up from idlemode is from host*/
                         //Adapter->LEDInfo.bIdleMode_tx_from_host = TRUE;
-#if 0
-                        if(STATUS_SUCCESS != InterfaceIdleModeWakeup(Adapter))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Idle Mode Wake up Failed\n");
-                                return STATUS_FAILURE;
-                        }
-#endif
                         Adapter->bWakeUpDevice = TRUE;
                         wake_up(&Adapter->process_rx_cntrlpkt);
 
@@ -489,9 +444,6 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
                 atomic_inc(&Adapter->index_wr_txcntrlpkt);
                 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, TX_CONTROL,DBG_LVL_ALL, "Calling transmit_packets");
                 atomic_set(&Adapter->TxPktAvail, 1);
-#ifdef BCM_SHM_INTERFACE
-                virtual_mail_box_interrupt();
-#endif
                 wake_up(&Adapter->tx_packet_wait_queue);
         }
         else
@@ -530,18 +482,6 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter,
 #endif
 
 
-void SendLinkDown(PMINI_ADAPTER Adapter)
-{
-        LINK_REQUEST    stLinkDownRequest;
-        memset(&stLinkDownRequest, 0, sizeof(LINK_REQUEST));
-        stLinkDownRequest.Leader.Status=LINK_UP_CONTROL_REQ;
-        stLinkDownRequest.Leader.PLength=sizeof(ULONG);//minimum 4 bytes
-        stLinkDownRequest.szData[0]=LINK_DOWN_REQ_PAYLOAD;
-        Adapter->bLinkDownRequested = TRUE;
-
-        CopyBufferToControlPacket(Adapter,&stLinkDownRequest);
-}
-
 /******************************************************************
 * Function    - LinkMessage()
 *
@@ -552,7 +492,7 @@ void SendLinkDown(PMINI_ADAPTER Adapter)
 *
 * Returns     - None.
 *******************************************************************/
-__inline VOID LinkMessage(PMINI_ADAPTER Adapter)
+VOID LinkMessage(PMINI_ADAPTER Adapter)
 {
         PLINK_REQUEST   pstLinkRequest=NULL;
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
@@ -594,7 +534,7 @@ __inline VOID LinkMessage(PMINI_ADAPTER Adapter)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Calling CopyBufferToControlPacket");
                 CopyBufferToControlPacket(Adapter, pstLinkRequest);
-                bcm_kfree(pstLinkRequest);
+                kfree(pstLinkRequest);
         }
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "LinkMessage <=====");
         return;
@@ -614,8 +554,8 @@ __inline VOID LinkMessage(PMINI_ADAPTER Adapter)
 VOID StatisticsResponse(PMINI_ADAPTER Adapter,PVOID pvBuffer)
 {
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s====>",__FUNCTION__);
-        Adapter->StatisticsPointer = ntohl(*(PULONG)pvBuffer);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Stats at %lx", Adapter->StatisticsPointer);
+        Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer);
+        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Stats at %x", (UINT)Adapter->StatisticsPointer);
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s <====",__FUNCTION__);
         return;
 }
@@ -764,7 +704,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 
                         /* Wake the LED Thread with IDLEMODE_ENTER State */
                         Adapter->DriverState = LOWPOWER_MODE_ENTER;
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies);;
+                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies);
                         wake_up(&Adapter->LEDInfo.notify_led_event);
 
                         /* Wait for 1 SEC for LED to OFF */
@@ -787,12 +727,10 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
                         down(&Adapter->rdmwrmsync);
                         Adapter->bPreparingForLowPowerMode = TRUE;
                         up(&Adapter->rdmwrmsync);
-#ifndef BCM_SHM_INTERFACE
                         //Killing all URBS.
                         if(Adapter->bDoSuspend == TRUE)
                                 Bcm_kill_all_URBs((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
 
-#endif
                 }
                 else
                 {
@@ -811,9 +749,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"fail to send the Idle mode Request \n");
                 Adapter->bPreparingForLowPowerMode = FALSE;
-#ifndef BCM_SHM_INTERFACE
                 StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
-#endif
         }
         do_gettimeofday(&tv);
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "IdleMode Msg submitter to Q :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
@@ -980,12 +916,10 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 
 }
 
-
-__inline int reset_card_proc(PMINI_ADAPTER ps_adapter)
+int reset_card_proc(PMINI_ADAPTER ps_adapter)
 {
         int retval = STATUS_SUCCESS;
 
-#ifndef BCM_SHM_INTERFACE
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
         PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
         unsigned int value = 0, uiResetValue = 0;
@@ -1006,11 +940,9 @@ __inline int reset_card_proc(PMINI_ADAPTER ps_adapter)
                 wrmalt(ps_adapter, SYS_CFG, &value, sizeof(value));
         }
 
-#ifndef BCM_SHM_INTERFACE
         //killing all submitted URBs.
         psIntfAdapter->psAdapter->StopAllXaction = TRUE ;
         Bcm_kill_all_URBs(psIntfAdapter);
-#endif
         /* Reset the UMA-B Device */
         if(ps_adapter->chip_id >= T3LPB)
         {
@@ -1111,11 +1043,10 @@ __inline int reset_card_proc(PMINI_ADAPTER ps_adapter)
 
 err_exit :
         psIntfAdapter->psAdapter->StopAllXaction = FALSE ;
-#endif
         return retval;
 }
 
-__inline int run_card_proc(PMINI_ADAPTER ps_adapter )
+int run_card_proc(PMINI_ADAPTER ps_adapter )
 {
         unsigned int value=0;
         {
@@ -1146,21 +1077,17 @@ __inline int run_card_proc(PMINI_ADAPTER ps_adapter )
 int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
 {
 
-        UINT status = STATUS_SUCCESS;
+        int status;
         UINT value = 0;
-#ifdef BCM_SHM_INTERFACE
-        unsigned char *pConfigFileAddr = (unsigned char *)CPE_MACXVI_CFG_ADDR;
-#endif
         /*
          * Create the threads first and then download the
          * Firm/DDR Settings..
          */
 
-        if((status = create_worker_threads(ps_adapter))<0)
-        {
-                BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Cannot create thread");
+        status = create_worker_threads(ps_adapter);
+        if (status<0)
                 return status;
-        }
+
         /*
          * For Downloading the Firm, parse the cfg file first.
          */
@@ -1169,7 +1096,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
                 return status;
         }
 
-#ifndef BCM_SHM_INTERFACE
         if(ps_adapter->chip_id >= T3LPB)
         {
                 rdmalt(ps_adapter, SYS_CFG, &value, sizeof (value));
@@ -1187,7 +1113,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
         status = ddr_init(ps_adapter);
         if(status)
         {
-                BCM_DEBUG_PRINT (ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "ddr_init Failed\n");
+                pr_err(DRV_NAME "ddr_init Failed\n");
                 return status;
         }
 
@@ -1201,7 +1127,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
                 BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Error downloading CFG file");
                 goto OUT;
         }
-        BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "CFG file downloaded");
 
         if(register_networkdev(ps_adapter))
         {
@@ -1266,12 +1191,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
                         goto OUT;
                 }
         }
-#if 0
-        else if(psAdapter->eNVMType == NVM_EEPROM)
-        {
-                PropagateCalParamsFromEEPROMToMemory();
-        }
-#endif
 
         /* Download Firmare */
         if ((status = BcmFileDownload( ps_adapter, BIN_FILE, FIRMWARE_BEGIN_ADDR)))
@@ -1280,7 +1199,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
                 goto OUT;
         }
 
-        BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "BIN file downloaded");
         status = run_card_proc(ps_adapter);
         if(status)
         {
@@ -1299,68 +1217,19 @@ OUT:
                 wake_up(&ps_adapter->LEDInfo.notify_led_event);
         }
 
-#else
-
-        ps_adapter->bDDRInitDone = TRUE;
-        //Initializing the NVM.
-        BcmInitNVM(ps_adapter);
-
-        //Propagating the cal param from Flash to DDR
-        value = 0;
-        wrmalt(ps_adapter, EEPROM_CAL_DATA_INTERNAL_LOC - 4, &value, sizeof(value));
-        wrmalt(ps_adapter, EEPROM_CAL_DATA_INTERNAL_LOC - 8, &value, sizeof(value));
-
-        if(ps_adapter->eNVMType == NVM_FLASH)
-        {
-                status = PropagateCalParamsFromFlashToMemory(ps_adapter);
-                if(status)
-                {
-                        printk("\nPropogation of Cal param from flash to DDR failed ..\n" );
-                }
-        }
-
-        //Copy config file param to DDR.
-        memcpy(pConfigFileAddr,ps_adapter->pstargetparams, sizeof(STARGETPARAMS));
-
-        if(register_networkdev(ps_adapter))
-        {
-                BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Register Netdevice failed. Cleanup needs to be performed.");
-                return -EIO;
-        }
-
-
-        status = InitLedSettings (ps_adapter);
-        if(status)
-        {
-                BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_PRINTK, 0, 0,"INIT LED FAILED\n");
-                return status;
-        }
-
-
-        if(register_control_device_interface(ps_adapter) < 0)
-        {
-                BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Register Control Device failed. Cleanup needs to be performed.");
-                return -EIO;
-        }
-
-        ps_adapter->fw_download_done = TRUE;
-#endif
         return status;
 }
 
 
-int bcm_parse_target_params(PMINI_ADAPTER Adapter)
+static int bcm_parse_target_params(PMINI_ADAPTER Adapter)
 {
-#ifdef BCM_SHM_INTERFACE
-        extern void read_cfg_file(PMINI_ADAPTER Adapter);
-#endif
         struct file             *flp=NULL;
         mm_segment_t    oldfs={0};
-        char *buff = NULL;
+        char *buff;
         int len = 0;
         loff_t  pos = 0;
 
-        buff=(PCHAR)kmalloc(BUFFER_1K, GFP_KERNEL);
+        buff=kmalloc(BUFFER_1K, GFP_KERNEL);
         if(!buff)
         {
                 return -ENOMEM;
@@ -1368,14 +1237,14 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
         if((Adapter->pstargetparams =
                 kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL)) == NULL)
         {
-                bcm_kfree(buff);
+                kfree(buff);
                 return -ENOMEM;
         }
         flp=open_firmware_file(Adapter, CFG_FILE);
         if(!flp) {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "NOT ABLE TO OPEN THE %s FILE \n", CFG_FILE);
-                bcm_kfree(buff);
-                bcm_kfree(Adapter->pstargetparams);
+                kfree(buff);
+                kfree(Adapter->pstargetparams);
                 Adapter->pstargetparams = NULL;
                 return -ENOENT;
         }
@@ -1386,8 +1255,8 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
         if(len != sizeof(STARGETPARAMS))
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"Mismatch in Target Param Structure!\n");
-                bcm_kfree(buff);
-                bcm_kfree(Adapter->pstargetparams);
+                kfree(buff);
+                kfree(Adapter->pstargetparams);
                 Adapter->pstargetparams = NULL;
                 filp_close(flp, current->files);
                 return -ENOENT;
@@ -1399,37 +1268,34 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
          * Values in Adapter->pstargetparams are in network byte order
          */
         memcpy(Adapter->pstargetparams, buff, sizeof(STARGETPARAMS));
-        bcm_kfree (buff);
+        kfree (buff);
         beceem_parse_target_struct(Adapter);
-#ifdef BCM_SHM_INTERFACE
-        read_cfg_file(Adapter);
-
-#endif
         return STATUS_SUCCESS;
 }
 
 void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
 {
-        UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0;;
+        UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0;
 
         if(ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE)
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "AutoSyncup is Disabled\n");
+                pr_info(DRV_NAME ": AutoSyncup is Disabled\n");
                 Adapter->AutoSyncup = FALSE;
         }
         else
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "AutoSyncup is Enabled\n");
+                pr_info(DRV_NAME ": AutoSyncup is Enabled\n");
                 Adapter->AutoSyncup     = TRUE;
         }
+
         if(ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_LINKUP_ENABLE)
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Enabling autolink up");
+                pr_info(DRV_NAME ": Enabling autolink up");
                 Adapter->AutoLinkUp = TRUE;
         }
         else
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Disabling autolink up");
+                pr_info(DRV_NAME ": Disabling autolink up");
                 Adapter->AutoLinkUp = FALSE;
         }
         // Setting the DDR Setting..
@@ -1438,59 +1304,54 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
         Adapter->ulPowerSaveMode =
                         (ntohl(Adapter->pstargetparams->HostDrvrConfig6)>>12)&0x0F;
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "DDR Setting: %x\n", Adapter->DDRSetting);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT,DBG_LVL_ALL, "Power Save Mode: %lx\n",
-                                                        Adapter->ulPowerSaveMode);
+        pr_info(DRV_NAME ": DDR Setting: %x\n", Adapter->DDRSetting);
+        pr_info(DRV_NAME ": Power Save Mode: %lx\n", Adapter->ulPowerSaveMode);
         if(ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_FIRM_DOWNLOAD)
     {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Enabling Auto Firmware Download\n");
+        pr_info(DRV_NAME ": Enabling Auto Firmware Download\n");
         Adapter->AutoFirmDld = TRUE;
     }
     else
     {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Disabling Auto Firmware Download\n");
+        pr_info(DRV_NAME ": Disabling Auto Firmware Download\n");
         Adapter->AutoFirmDld = FALSE;
     }
         uiHostDrvrCfg6 = ntohl(Adapter->pstargetparams->HostDrvrConfig6);
         Adapter->bMipsConfig = (uiHostDrvrCfg6>>20)&0x01;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"MIPSConfig   : 0x%X\n",Adapter->bMipsConfig);
+        pr_info(DRV_NAME ": MIPSConfig   : 0x%X\n",Adapter->bMipsConfig);
         //used for backward compatibility.
         Adapter->bDPLLConfig = (uiHostDrvrCfg6>>19)&0x01;
 
         Adapter->PmuMode= (uiHostDrvrCfg6 >> 24 ) & 0x03;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "PMU MODE: %x", Adapter->PmuMode);
+        pr_info(DRV_NAME ": PMU MODE: %x", Adapter->PmuMode);
 
     if((uiHostDrvrCfg6 >> HOST_BUS_SUSPEND_BIT ) & (0x01))
     {
         Adapter->bDoSuspend = TRUE;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Making DoSuspend TRUE as per configFile");
+        pr_info(DRV_NAME ": Making DoSuspend TRUE as per configFile");
     }
 
         uiEEPROMFlag = ntohl(Adapter->pstargetparams->m_u32EEPROMFlag);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "uiEEPROMFlag  : 0x%X\n",uiEEPROMFlag);
+        pr_info(DRV_NAME ": uiEEPROMFlag  : 0x%X\n",uiEEPROMFlag);
         Adapter->eNVMType = (NVM_TYPE)((uiEEPROMFlag>>4)&0x3);
 
-
         Adapter->bStatusWrite = (uiEEPROMFlag>>6)&0x1;
-        //printk(("bStatusWrite   : 0x%X\n", Adapter->bStatusWrite));
 
         Adapter->uiSectorSizeInCFG = 1024*(0xFFFF & ntohl(Adapter->pstargetparams->HostDrvrConfig4));
-        //printk(("uiSectorSize   : 0x%X\n", Adapter->uiSectorSizeInCFG));
 
         Adapter->bSectorSizeOverride =(bool) ((ntohl(Adapter->pstargetparams->HostDrvrConfig4))>>16)&0x1;
-        //printk(MP_INIT,("bSectorSizeOverride   : 0x%X\n",Adapter->bSectorSizeOverride));
 
         if(ntohl(Adapter->pstargetparams->m_u32PowerSavingModeOptions) &0x01)
                 Adapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE;
-        //autocorrection part
+
         if(Adapter->ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)
                 doPowerAutoCorrection(Adapter);
 
 }
 
-VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
+static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
 {
-        UINT reporting_mode = 0;
+        UINT reporting_mode;
 
         reporting_mode = ntohl(psAdapter->pstargetparams->m_u32PowerSavingModeOptions) &0x02 ;
         psAdapter->bIsAutoCorrectEnabled = !((char)(psAdapter->ulPowerSaveMode >> 3) & 0x1);
@@ -1504,20 +1365,9 @@ VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
         if (psAdapter->bIsAutoCorrectEnabled && (psAdapter->chip_id >= T3LPB))
         {
                 //If reporting mode is enable, switch PMU to PMC
-                #if 0
-                if(reporting_mode == FALSE)
-                {
-                        psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN;
-                        psAdapter->bDoSuspend = TRUE;
-                        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"PMU selected ....");
-
-                }
-                else
-                #endif
                 {
                         psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_CLOCK_GATING;
                         psAdapter->bDoSuspend =FALSE;
-                        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"PMC selected..");
 
                 }
 
@@ -1540,12 +1390,10 @@ VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
 #if 0
 static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
 {
-        unsigned char *pucmacaddr = NULL;
-        int status = 0, i=0;
-        unsigned int temp =0;
+        int status = 0, i = 0;
+        unsigned int temp = 0;
+        unsigned char *pucmacaddr = kmalloc(MAC_ADDRESS_SIZE, GFP_KERNEL);
 
-
-        pucmacaddr = (unsigned char *)kmalloc(MAC_ADDRESS_SIZE, GFP_KERNEL);
         if(!pucmacaddr)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "No Buffers to Read the EEPROM Address\n");
@@ -1558,7 +1406,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
         if(status != STATUS_SUCCESS)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "wrm Failed..\n");
-                bcm_kfree(pucmacaddr);
+                kfree(pucmacaddr);
                 pucmacaddr = NULL;
                 goto OUT;
         }
@@ -1568,7 +1416,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
                 if(status != STATUS_SUCCESS)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n");
-                        bcm_kfree(pucmacaddr);
+                        kfree(pucmacaddr);
                         pucmacaddr = NULL;
                         goto OUT;
                 }
@@ -1580,43 +1428,6 @@ OUT:
 }
 #endif
 
-#if 0
-INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter)
-{
-        unsigned char *puMacAddr = NULL;
-        int i =0;
-
-        puMacAddr = ReadMacAddrEEPROM(Adapter,0x200);
-        if(!puMacAddr)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Couldn't retrieve the Mac Address\n");
-                return STATUS_FAILURE;
-        }
-        else
-        {
-                if((puMacAddr[0] == 0x0  && puMacAddr[1] == 0x0  &&
-                        puMacAddr[2] == 0x0  && puMacAddr[3] == 0x0  &&
-                        puMacAddr[4] == 0x0  && puMacAddr[5] == 0x0) ||
-                   (puMacAddr[0] == 0xFF && puMacAddr[1] == 0xFF &&
-                        puMacAddr[2] == 0xFF && puMacAddr[3] == 0xFF &&
-                        puMacAddr[4] == 0xFF && puMacAddr[5] == 0xFF))
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Invalid Mac Address\n");
-                        bcm_kfree(puMacAddr);
-                        return STATUS_FAILURE;
-                }
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "The Mac Address received is: \n");
-                memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
-        for(i=0;i<MAC_ADDRESS_SIZE;i++)
-        {
-            BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%02x ", Adapter->dev->dev_addr[i]);
-        }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"\n");
-                bcm_kfree(puMacAddr);
-        }
-        return STATUS_SUCCESS;
-}
-#endif
 
 static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
 {
@@ -1640,81 +1451,21 @@ int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
 {
         INT uiRetVal =0;
 
-#ifndef BCM_SHM_INTERFACE
         uiRetVal = Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
                         uiAddress, pucBuff, sSize);
 
         if(uiRetVal < 0)
                 return uiRetVal;
 
-#else
-        int indx;
-        uiRetVal = STATUS_SUCCESS;
-        if(uiAddress & 0x10000000) {
-                        // DDR Memory Access
-                uiAddress |= CACHE_ADDRESS_MASK;
-                memcpy(pucBuff,(unsigned char *)uiAddress ,sSize);
-        }
-        else {
-                // Register, SPRAM, Flash
-                uiAddress |= UNCACHE_ADDRESS_MASK;
-    if ((uiAddress & FLASH_ADDR_MASK) == (FLASH_CONTIGIOUS_START_ADDR_BCS350 & FLASH_ADDR_MASK))
-        {
-                #if defined(FLASH_DIRECT_ACCESS)
-                memcpy(pucBuff,(unsigned char *)uiAddress ,sSize);
-                #else
-                        printk("\nInvalid GSPI ACCESS :Addr :%#X", uiAddress);
-                        uiRetVal = STATUS_FAILURE;
-                #endif
-        }
-    else if(((unsigned int )uiAddress & 0x3) ||
-                        ((unsigned int )pucBuff & 0x3) ||
-                        ((unsigned int )sSize & 0x3)) {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"rdmalt :unalligned register access uiAddress =  %x,pucBuff = %x  size = %x\n",(unsigned int )uiAddress,(unsigned int )pucBuff,(unsigned int )sSize);
-                         uiRetVal = STATUS_FAILURE;
-                }
-                else {
-                        for (indx=0;indx<sSize;indx+=4){
-                                *(PUINT)(pucBuff + indx) = *(PUINT)(uiAddress + indx);
-                        }
-                }
-        }
-#endif
         return uiRetVal;
 }
 int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
 {
         int iRetVal;
 
-#ifndef BCM_SHM_INTERFACE
         iRetVal = Adapter->interface_wrm(Adapter->pvInterfaceAdapter,
                         uiAddress, pucBuff, sSize);
 
-#else
-        int indx;
-        if(uiAddress & 0x10000000) {
-                // DDR Memory Access
-                uiAddress |= CACHE_ADDRESS_MASK;
-                memcpy((unsigned char *)(uiAddress),pucBuff,sSize);
-        }
-        else {
-                // Register, SPRAM, Flash
-                uiAddress |= UNCACHE_ADDRESS_MASK;
-
-                if(((unsigned int )uiAddress & 0x3) ||
-                        ((unsigned int )pucBuff & 0x3) ||
-                        ((unsigned int )sSize & 0x3)) {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"wrmalt: unalligned register access uiAddress =  %x,pucBuff = %x  size = %x\n",(unsigned int )uiAddress,(unsigned int )pucBuff,(unsigned int )sSize);
-                         iRetVal = STATUS_FAILURE;
-                }
-                else {
-                        for (indx=0;indx<sSize;indx+=4) {
-                                *(PUINT)(uiAddress + indx) = *(PUINT)(pucBuff + indx);
-                        }
-                }
-        }
-        iRetVal = STATUS_SUCCESS;
-#endif
 
         return iRetVal;
 }
@@ -1735,26 +1486,7 @@ int rdmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
         return uiRetVal;
 }
 
-int rdmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
-{
-
-        INT status = STATUS_SUCCESS ;
-        down(&Adapter->rdmwrmsync);
-
-        if((Adapter->IdleMode == TRUE) ||
-                (Adapter->bShutStatus ==TRUE) ||
-                (Adapter->bPreparingForLowPowerMode ==TRUE))
-        {
-                status = -EACCES;
-                goto exit;
-        }
 
-        status = rdm(Adapter, uiAddress, pucBuff, sSize);
-
-exit:
-        up(&Adapter->rdmwrmsync);
-        return status ;
-}
 int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
 {
         INT status = STATUS_SUCCESS ;
@@ -1921,10 +1653,8 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
                         Adapter->bPreparingForLowPowerMode = TRUE;
                         up(&Adapter->rdmwrmsync);
                         //Killing all URBS.
-#ifndef BCM_SHM_INTERFACE
                         if(Adapter->bDoSuspend == TRUE)
                                 Bcm_kill_all_URBs((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
-#endif
                 }
                 else
                 {
@@ -1943,14 +1673,12 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL,"fail to send the Idle mode Request \n");
                 Adapter->bPreparingForLowPowerMode = FALSE;
 
-#ifndef BCM_SHM_INTERFACE
                 StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
-#endif
         }
 }
 
 
-void HandleShutDownModeRequest(PMINI_ADAPTER Adapter,PUCHAR pucBuffer)
+static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter,PUCHAR pucBuffer)
 {
         B_UINT32 uiResetValue = 0;
 
@@ -2077,11 +1805,7 @@ void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter)
         if(!atomic_read (&Adapter->uiMBupdate))
                 return;
 
-#ifdef BCM_SHM_INTERFACE
-        if(rdmalt(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS)<0)
-#else
         if(rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS)<0)
-#endif
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm failed\n");
                 return;
@@ -2107,9 +1831,7 @@ void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter)
 void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex)
 {
         struct sk_buff*                         PacketToDrop=NULL;
-        struct net_device_stats*                netstats=NULL;
-
-        netstats = &((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats;
+        struct net_device_stats*                netstats = &Adapter->dev->stats;
 
         spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
 
@@ -2130,25 +1852,23 @@ void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex)
                         Adapter->PackInfo[iQIndex].uiDroppedCountBytes += PacketToDrop->len;
                         Adapter->PackInfo[iQIndex].uiDroppedCountPackets++;
 
-                        bcm_kfree_skb(PacketToDrop);
+                        dev_kfree_skb(PacketToDrop);
                         atomic_dec(&Adapter->TotalPacketCount);
-                        atomic_inc(&Adapter->TxDroppedPacketCount);
-
                 }
         }
         spin_unlock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
 
 }
 
-void beceem_protocol_reset (PMINI_ADAPTER Adapter)
+static void beceem_protocol_reset (PMINI_ADAPTER Adapter)
 {
-        int i =0;
+        int i;
 
-        if(NULL != Adapter->dev)
-        {
-                netif_carrier_off(Adapter->dev);
-                netif_stop_queue(Adapter->dev);
-        }
+        if (netif_msg_link(Adapter))
+                pr_notice(PFX "%s: protocol reset\n", Adapter->dev->name);
+
+        netif_carrier_off(Adapter->dev);
+        netif_stop_queue(Adapter->dev);
 
         Adapter->IdleMode = FALSE;
         Adapter->LinkUpStatus = FALSE;
@@ -2166,78 +1886,18 @@ void beceem_protocol_reset (PMINI_ADAPTER Adapter)
                 Adapter->TimerActive = FALSE;
 
         memset(Adapter->astFragmentedPktClassifierTable, 0,
-                        sizeof(S_FRAGMENTED_PACKET_INFO) *
-                        MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES);
+               sizeof(S_FRAGMENTED_PACKET_INFO) * MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES);
 
         for(i = 0;i<HiPriority;i++)
         {
                 //resetting only the first size (S_MIBS_SERVICEFLOW_TABLE) for the SF.
                 // It is same between MIBs and SF.
-                memset((PVOID)&Adapter->PackInfo[i],0,sizeof(S_MIBS_SERVICEFLOW_TABLE));
+                memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable,
+                       0, sizeof(S_MIBS_EXTSERVICEFLOW_PARAMETERS));
         }
 }
 
 
 
-#ifdef BCM_SHM_INTERFACE
-
-
-#define GET_GTB_DIFF(start, end)  \
-( (start) < (end) )? ( (end) - (start) ) : ( ~0x0 - ( (start) - (end)) +1 )
-
-void usdelay ( unsigned int a) {
-        unsigned int start= *(unsigned int *)0xaf8051b4;
-        unsigned int end  = start+1;
-        unsigned int diff = 0;
-
-        while(1) {
-                end = *(unsigned int *)0xaf8051b4;
-                diff = (GET_GTB_DIFF(start,end))/80;
-                if (diff >= a)
-                        break;
-        }
-}
-void read_cfg_file(PMINI_ADAPTER Adapter) {
-
-
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Config File Version = 0x%x \n",Adapter->pstargetparams->m_u32CfgVersion );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Center Frequency =  0x%x \n",Adapter->pstargetparams->m_u32CenterFrequency );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Band A Scan = 0x%x \n",Adapter->pstargetparams->m_u32BandAScan );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Band B Scan = 0x%x \n",Adapter->pstargetparams->m_u32BandBScan );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Band C Scan = 0x%x \n",Adapter->pstargetparams->m_u32BandCScan );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"ERTPS Options = 0x%x \n",Adapter->pstargetparams->m_u32ErtpsOptions );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"PHS Enable = 0x%x \n",Adapter->pstargetparams->m_u32PHSEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Handoff Enable = 0x%x \n",Adapter->pstargetparams->m_u32HoEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HO Reserved1 = 0x%x \n",Adapter->pstargetparams->m_u32HoReserved1 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HO Reserved2 = 0x%x \n",Adapter->pstargetparams->m_u32HoReserved2 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"MIMO Enable = 0x%x \n",Adapter->pstargetparams->m_u32MimoEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"PKMv2 Enable = 0x%x \n",Adapter->pstargetparams->m_u32SecurityEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Powersaving Modes Enable = 0x%x \n",Adapter->pstargetparams->m_u32PowerSavingModesEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Power Saving Mode Options = 0x%x \n",Adapter->pstargetparams->m_u32PowerSavingModeOptions );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"ARQ Enable = 0x%x \n",Adapter->pstargetparams->m_u32ArqEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Harq Enable = 0x%x \n",Adapter->pstargetparams->m_u32HarqEnable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"EEPROM Flag = 0x%x \n",Adapter->pstargetparams->m_u32EEPROMFlag );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Customize = 0x%x \n",Adapter->pstargetparams->m_u32Customize );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Bandwidth = 0x%x \n",Adapter->pstargetparams->m_u32ConfigBW );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"ShutDown Timer Value = 0x%x \n",Adapter->pstargetparams->m_u32ShutDownInitThresholdTimer );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"RadioParameter = 0x%x \n",Adapter->pstargetparams->m_u32RadioParameter );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"PhyParameter1 = 0x%x \n",Adapter->pstargetparams->m_u32PhyParameter1 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"PhyParameter2 = 0x%x \n",Adapter->pstargetparams->m_u32PhyParameter2 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"PhyParameter3 = 0x%x \n",Adapter->pstargetparams->m_u32PhyParameter3 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"m_u32TestOptions = 0x%x \n",Adapter->pstargetparams->m_u32TestOptions );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"MaxMACDataperDLFrame = 0x%x \n",Adapter->pstargetparams->m_u32MaxMACDataperDLFrame );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"MaxMACDataperULFrame = 0x%x \n",Adapter->pstargetparams->m_u32MaxMACDataperULFrame );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Corr2MacFlags = 0x%x \n",Adapter->pstargetparams->m_u32Corr2MacFlags );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig1 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig1 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig2 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig2 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig3 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig3 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig4 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig4 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig5 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig5 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"HostDrvrConfig6 = 0x%x \n",Adapter->pstargetparams->HostDrvrConfig6 );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Segmented PUSC Enable = 0x%x \n",Adapter->pstargetparams->m_u32SegmentedPUSCenable );
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BamcEnable = 0x%x \n",Adapter->pstargetparams->m_u32BandAMCEnable );
-}
-
-#endif
 
 
diff --git a/drivers/staging/bcm/Osal_Misc.c b/drivers/staging/bcm/Osal_Misc.c
deleted file mode 100644
index feefd20a5291..000000000000
--- a/drivers/staging/bcm/Osal_Misc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-        /*++
-
-        Copyright (c) Beceem Communications Inc.
-
-        Module Name:
-                WIN_Misc.c
-
-        Abstract:
-                Implements the Miscelanneous OS Construts
-                        Linked Lists
-                        Dispatcher Objects(Events,Semaphores,Spin Locks and the like)
-                        Files
-
-        Revision History:
-                Who         When        What
-                --------    --------    ----------------------------------------------
-                Name            Date            Created/reviewed/modified
-                Rajeev          24/1/08         Created
-        Notes:
-
-        --*/
-#include "headers.h"
-
-bool OsalMemCompare(void *dest, void *src, UINT len)
-{
-        return (memcmp(src, dest, len));
-}
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 8a38cf43e795..d1ca1912a74b 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -1,10 +1,54 @@
 #include "headers.h"
 
+static UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid,B_UINT16  uiClsId,S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
+
+static UINT CreateClassiferToPHSRuleMapping(B_UINT16 uiVcid,B_UINT16  uiClsId,S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
+
+static UINT CreateClassifierPHSRule(B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,B_UINT8 u8AssociatedPHSI);
+
+static UINT UpdateClassifierPHSRule(B_UINT16  uiClsId,S_CLASSIFIER_ENTRY *pstClassifierEntry,S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
+
+static BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
+
+static BOOLEAN DerefPhsRule(B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable,S_PHS_RULE *pstPhsRule);
+
+static UINT GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiClsid,E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
+
+static UINT GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiPHSI,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,S_PHS_RULE **ppstPhsRule);
+
+static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
+
+static int phs_compress(S_PHS_RULE   *phs_members,unsigned char *in_buf,
+                                                unsigned char *out_buf,unsigned int *header_size,UINT *new_header_size );
+
+
+static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buffer,
+                                                                unsigned char *phsf,unsigned char *phsm,unsigned int phss,unsigned int phsv,UINT *new_header_size );
+
+static int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,\
+                                                  S_PHS_RULE   *phs_rules,UINT *header_size);
+
+
+static ULONG PhsCompress(void* pvContext,
+                                  B_UINT16 uiVcid,
+                                  B_UINT16 uiClsId,
+                                  void *pvInputBuffer,
+                                  void *pvOutputBuffer,
+                                  UINT *pOldHeaderSize,
+                                  UINT *pNewHeaderSize );
+
+static ULONG PhsDeCompress(void* pvContext,
+                                  B_UINT16 uiVcid,
+                                  void *pvInputBuffer,
+                                  void *pvOutputBuffer,
+                                  UINT *pInHeaderSize,
+                                  UINT *pOutHeaderSize);
+
+
+
 #define IN
 #define OUT
 
-void DumpDataPacketHeader(PUCHAR pPkt);
-
 /*
 Function:                               PHSTransmit
 
@@ -81,8 +125,6 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
         {
 
 
-                //DumpDataPacketHeader(pucPHSPktHdrInBuf);
-
                 // Step 2 Supress Header using PHS and fill into intermediate ucaPHSPktHdrOutBuf.
         // Suppress only if IP Header and PHS Enabled For the Service Flow
                 if(((usPacketType == ETHERNET_FRAMETYPE_IPV4) ||
@@ -120,15 +162,15 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
                                                 if(newPacket == NULL)
                                                         return STATUS_FAILURE;
 
-                                                bcm_kfree_skb(Packet);
+                                                dev_kfree_skb(Packet);
                                                 *pPacket = Packet = newPacket;
                                                 pucPHSPktHdrInBuf = Packet->data  + BytesToRemove;
                                         }
 
                                         numBytesCompressed = unPhsOldHdrSize - (unPHSNewPktHeaderLen+PHSI_LEN);
 
-                                        OsalMemMove(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN);
-                                        OsalMemMove(Packet->data + numBytesCompressed, Packet->data, BytesToRemove);
+                                        memcpy(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN);
+                                        memcpy(Packet->data + numBytesCompressed, Packet->data, BytesToRemove);
                                         skb_pull(Packet, numBytesCompressed);
 
                                         return STATUS_SUCCESS;
@@ -223,23 +265,12 @@ int PHSRecieve(PMINI_ADAPTER Adapter,
                         }
                 }
 
-                OsalMemMove(packet->data, Adapter->ucaPHSPktRestoreBuf, nStandardPktHdrLen);
+                memcpy(packet->data, Adapter->ucaPHSPktRestoreBuf, nStandardPktHdrLen);
         }
 
         return STATUS_SUCCESS;
 }
 
-void DumpDataPacketHeader(PUCHAR pPkt)
-{
-        struct iphdr *iphd = (struct iphdr*)pPkt;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"Phs Send/Recieve : IP Packet Hdr \n");
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"TOS : %x \n",iphd->tos);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"Src  IP : %x \n",iphd->saddr);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"Dest IP : %x \n \n",iphd->daddr);
-
-}
-
 void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
 {
         PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -270,15 +301,9 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
                 return -EINVAL;
 
         pPhsdeviceExtension->pstServiceFlowPhsRulesTable =
-      (S_SERVICEFLOW_TABLE*)OsalMemAlloc(sizeof(S_SERVICEFLOW_TABLE),
-            PHS_MEM_TAG);
+                kzalloc(sizeof(S_SERVICEFLOW_TABLE), GFP_KERNEL);
 
-    if(pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
-        {
-                OsalZeroMemory(pPhsdeviceExtension->pstServiceFlowPhsRulesTable,
-              sizeof(S_SERVICEFLOW_TABLE));
-        }
-        else
+    if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation ServiceFlowPhsRulesTable failed");
                 return -ENOMEM;
@@ -288,14 +313,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
         for(i=0;i<MAX_SERVICEFLOWS;i++)
         {
                 S_SERVICEFLOW_ENTRY sServiceFlow = pstServiceFlowTable->stSFList[i];
-                sServiceFlow.pstClassifierTable = (S_CLASSIFIER_TABLE*)OsalMemAlloc(
-            sizeof(S_CLASSIFIER_TABLE), PHS_MEM_TAG);
-                if(sServiceFlow.pstClassifierTable)
-                {
-                        OsalZeroMemory(sServiceFlow.pstClassifierTable,sizeof(S_CLASSIFIER_TABLE));
-                        pstServiceFlowTable->stSFList[i].pstClassifierTable = sServiceFlow.pstClassifierTable;
-        }
-                else
+                sServiceFlow.pstClassifierTable = kzalloc(sizeof(S_CLASSIFIER_TABLE), GFP_KERNEL);
+                if(!sServiceFlow.pstClassifierTable)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
                         free_phs_serviceflow_rules(pPhsdeviceExtension->
@@ -305,9 +324,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
                 }
         }
 
-
-        pPhsdeviceExtension->CompressedTxBuffer =
-          OsalMemAlloc(PHS_BUFFER_SIZE,PHS_MEM_TAG);
+        pPhsdeviceExtension->CompressedTxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
 
     if(pPhsdeviceExtension->CompressedTxBuffer == NULL)
         {
@@ -317,12 +334,11 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
                 return -ENOMEM;
         }
 
-        pPhsdeviceExtension->UnCompressedRxBuffer =
-      OsalMemAlloc(PHS_BUFFER_SIZE,PHS_MEM_TAG);
+    pPhsdeviceExtension->UnCompressedRxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
         if(pPhsdeviceExtension->UnCompressedRxBuffer == NULL)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
-                OsalMemFree(pPhsdeviceExtension->CompressedTxBuffer,PHS_BUFFER_SIZE);
+                kfree(pPhsdeviceExtension->CompressedTxBuffer);
                 free_phs_serviceflow_rules(pPhsdeviceExtension->pstServiceFlowPhsRulesTable);
                 pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
                 return -ENOMEM;
@@ -343,16 +359,11 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
                 pPHSDeviceExt->pstServiceFlowPhsRulesTable = NULL;
         }
 
-        if(pPHSDeviceExt->CompressedTxBuffer)
-        {
-                OsalMemFree(pPHSDeviceExt->CompressedTxBuffer,PHS_BUFFER_SIZE);
-                pPHSDeviceExt->CompressedTxBuffer = NULL;
-        }
-        if(pPHSDeviceExt->UnCompressedRxBuffer)
-        {
-                OsalMemFree(pPHSDeviceExt->UnCompressedRxBuffer,PHS_BUFFER_SIZE);
-                pPHSDeviceExt->UnCompressedRxBuffer = NULL;
-        }
+        kfree(pPHSDeviceExt->CompressedTxBuffer);
+        pPHSDeviceExt->CompressedTxBuffer = NULL;
+
+        kfree(pPHSDeviceExt->UnCompressedRxBuffer);
+        pPHSDeviceExt->UnCompressedRxBuffer = NULL;
 
         return 0;
 }
@@ -478,20 +489,12 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
                         {
                                 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].bUsed && pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule)
                                 {
-                                        if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-                                        .pstPhsRule->u8PHSI == u8PHSI)
-                                        {
-                                                if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule
-                                                ->u8RefCnt)
-                                                        pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule
-                                                          ->u8RefCnt--;
-                                                if(0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
-                            .pstPhsRule->u8RefCnt)
-                                                        OsalMemFree(pstClassifierRulesTable
-                                                    ->stActivePhsRulesList[nClsidIndex].pstPhsRule,
-                                                      sizeof(S_PHS_RULE));
-                                                OsalZeroMemory(&pstClassifierRulesTable
-                                                        ->stActivePhsRulesList[nClsidIndex],
+                                        if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8PHSI == u8PHSI)                                     {
+                                                if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                                        pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
+                                                if(0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                                        kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
+                                                memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0,
                                                         sizeof(S_CLASSIFIER_ENTRY));
                                         }
                                 }
@@ -548,10 +551,10 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
                                 if(pstClassifierEntry->pstPhsRule->u8RefCnt)
                                 pstClassifierEntry->pstPhsRule->u8RefCnt--;
                                 if(0==pstClassifierEntry->pstPhsRule->u8RefCnt)
-                                OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE));
+                                        kfree(pstClassifierEntry->pstPhsRule);
 
                         }
-                        OsalZeroMemory(pstClassifierEntry,sizeof(S_CLASSIFIER_ENTRY));
+                        memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_ENTRY));
                 }
 
                 nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
@@ -559,10 +562,8 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
 
            if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule))
                 {
-                        if(pstClassifierEntry->pstPhsRule)
-                        //Delete the classifier entry
-                        OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE));
-                        OsalZeroMemory(pstClassifierEntry,sizeof(S_CLASSIFIER_ENTRY));
+                        kfree(pstClassifierEntry->pstPhsRule);
+                        memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_ENTRY));
                 }
         }
         return lStatus;
@@ -619,14 +620,11 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
                                                                                     .pstPhsRule->u8RefCnt--;
                                         if(0==pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
                                                           .pstPhsRule->u8RefCnt)
-                                                OsalMemFree(pstClassifierRulesTable
-                                                            ->stActivePhsRulesList[nClsidIndex].pstPhsRule,
-                                                             sizeof(S_PHS_RULE));
+                                                kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
                                             pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
                                         .pstPhsRule = NULL;
                                 }
-                                OsalZeroMemory(&pstClassifierRulesTable
-                    ->stActivePhsRulesList[nClsidIndex],sizeof(S_CLASSIFIER_ENTRY));
+                                memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
                                 if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule)
                                 {
                                         if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
@@ -635,15 +633,12 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
                                                                   .pstPhsRule->u8RefCnt--;
                                         if(0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
                                         .pstPhsRule->u8RefCnt)
-                                                OsalMemFree(pstClassifierRulesTable
-                                                      ->stOldPhsRulesList[nClsidIndex].pstPhsRule,
-                                                       sizeof(S_PHS_RULE));
+                                                kfree(pstClassifierRulesTable
+                                                      ->stOldPhsRulesList[nClsidIndex].pstPhsRule);
                                         pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
                               .pstPhsRule = NULL;
                                 }
-                                OsalZeroMemory(&pstClassifierRulesTable
-                  ->stOldPhsRulesList[nClsidIndex],
-                   sizeof(S_CLASSIFIER_ENTRY));
+                                memset(&pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
                         }
                 }
                 pstServiceFlowEntry->bUsed = FALSE;
@@ -849,7 +844,7 @@ ULONG PhsDeCompress(IN void* pvContext,
 // Does not return any value.
 //-----------------------------------------------------------------------------
 
-void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
+static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
 {
         int i,j;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -876,8 +871,7 @@ void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
                                                                                                         ->u8RefCnt--;
                                                 if(0==pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule
                                                                 ->u8RefCnt)
-                                                        OsalMemFree(pstClassifierRulesTable->stActivePhsRulesList[j].
-                                                                                                      pstPhsRule, sizeof(S_PHS_RULE));
+                                                        kfree(pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule);
                                                 pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule = NULL;
                                         }
                                         if(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule)
@@ -888,24 +882,23 @@ void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
                                                                                                   ->u8RefCnt--;
                                                 if(0==pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule
                                                                       ->u8RefCnt)
-                                                        OsalMemFree(pstClassifierRulesTable->stOldPhsRulesList[j]
-                                                                                .pstPhsRule,sizeof(S_PHS_RULE));
+                                                        kfree(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule);
                                                 pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule = NULL;
                                         }
                                 }
-                            OsalMemFree(pstClassifierRulesTable,sizeof(S_CLASSIFIER_TABLE));
+                                kfree(pstClassifierRulesTable);
                             stServiceFlowEntry.pstClassifierTable = pstClassifierRulesTable = NULL;
                         }
                 }
         }
 
-        OsalMemFree(psServiceFlowRulesTable,sizeof(S_SERVICEFLOW_TABLE));
-        psServiceFlowRulesTable = NULL;
+    kfree(psServiceFlowRulesTable);
+    psServiceFlowRulesTable = NULL;
 }
 
 
 
-BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
+static BOOLEAN ValidatePHSRuleComplete(IN S_PHS_RULE *psPhsRule)
 {
         if(psPhsRule)
         {
@@ -988,9 +981,9 @@ UINT GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
         return PHS_INVALID_TABLE_INDEX;
 }
 
-UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
-      IN B_UINT32 uiPHSI,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
-      OUT S_PHS_RULE **ppstPhsRule)
+static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable,
+                            IN B_UINT32 uiPHSI,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,
+                            OUT S_PHS_RULE **ppstPhsRule)
 {
         int  i;
         S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;
@@ -1102,7 +1095,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
                 if(psPhsRule->u8PHSFLength)
                 {
                         //update PHSF
-                        OsalMemMove(pstClassifierEntry->pstPhsRule->u8PHSF,
+                        memcpy(pstClassifierEntry->pstPhsRule->u8PHSF,
                             psPhsRule->u8PHSF , MAX_PHS_LENGTHS);
                 }
                 if(psPhsRule->u8PHSFLength)
@@ -1114,7 +1107,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
                 if(psPhsRule->u8PHSMLength)
                 {
                         //update PHSM
-                        OsalMemMove(pstClassifierEntry->pstPhsRule->u8PHSM,
+                        memcpy(pstClassifierEntry->pstPhsRule->u8PHSM,
                             psPhsRule->u8PHSM, MAX_PHS_LENGTHS);
                 }
                 if(psPhsRule->u8PHSMLength)
@@ -1147,7 +1140,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
         return uiStatus;
 }
 
-UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
+static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
     S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
     E_CLASSIFIER_ENTRY_CONTEXT eClsContext,B_UINT8 u8AssociatedPHSI)
 {
@@ -1234,8 +1227,7 @@ UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
         {
                 if(psClassifierRules->pstPhsRule == NULL)
                 {
-                        psClassifierRules->pstPhsRule = (S_PHS_RULE*)OsalMemAlloc
-                (sizeof(S_PHS_RULE),PHS_MEM_TAG);
+                        psClassifierRules->pstPhsRule = kmalloc(sizeof(S_PHS_RULE),GFP_KERNEL);
 
           if(NULL == psClassifierRules->pstPhsRule)
                                 return ERR_PHSRULE_MEMALLOC_FAIL;
@@ -1247,7 +1239,7 @@ UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
                 psClassifierRules->bUnclassifiedPHSRule = psPhsRule->bUnclassifiedPHSRule;
 
         /* Update The PHS rule */
-                OsalMemMove(psClassifierRules->pstPhsRule,
+                memcpy(psClassifierRules->pstPhsRule,
                     psPhsRule, sizeof(S_PHS_RULE));
         }
         else
@@ -1259,7 +1251,7 @@ UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 }
 
 
-UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
+static UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
       IN S_CLASSIFIER_ENTRY *pstClassifierEntry,
       S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,
       B_UINT8 u8AssociatedPHSI)
@@ -1289,13 +1281,13 @@ UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
                 //Step 2.a PHS Rule Does Not Exist .Create New PHS Rule for uiClsId
                 if(FALSE == bPHSRuleOrphaned)
                 {
-                        pstClassifierEntry->pstPhsRule = (S_PHS_RULE*)OsalMemAlloc(sizeof(S_PHS_RULE),PHS_MEM_TAG);
+                        pstClassifierEntry->pstPhsRule = kmalloc(sizeof(S_PHS_RULE), GFP_KERNEL);
                         if(NULL == pstClassifierEntry->pstPhsRule)
                         {
                                 return ERR_PHSRULE_MEMALLOC_FAIL;
                         }
                 }
-                OsalMemMove(pstClassifierEntry->pstPhsRule, psPhsRule, sizeof(S_PHS_RULE));
+                memcpy(pstClassifierEntry->pstPhsRule, psPhsRule, sizeof(S_PHS_RULE));
 
         }
         else
@@ -1304,14 +1296,8 @@ UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nTying Classifier to Existing PHS Rule");
                 if(bPHSRuleOrphaned)
                 {
-                    if(pstClassifierEntry->pstPhsRule)
-                    {
-                        //Just Free the PHS Rule as Ref Count is Zero
-                        OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE));
+                        kfree(pstClassifierEntry->pstPhsRule);
                         pstClassifierEntry->pstPhsRule = NULL;
-
-                    }
-
                 }
                 pstClassifierEntry->pstPhsRule = pstAddPhsRule;
 
@@ -1326,7 +1312,7 @@ UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
 
 }
 
-BOOLEAN DerefPhsRule(IN B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable,S_PHS_RULE *pstPhsRule)
+static BOOLEAN DerefPhsRule(IN B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable,S_PHS_RULE *pstPhsRule)
 {
         if(pstPhsRule==NULL)
                 return FALSE;
@@ -1345,22 +1331,6 @@ BOOLEAN DerefPhsRule(IN B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable
         }
 }
 
-static void DumpBuffer(PVOID BuffVAddress, int xferSize)
-{
-        int i;
-        int iPrintLength;
-        PUCHAR temp=(PUCHAR)BuffVAddress;
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-        iPrintLength=(xferSize<32?xferSize:32);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n");
-
-        for (i=0;i < iPrintLength;i++) {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "%x|",temp[i]);
-        }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n");
-}
-
-
 void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
 {
         int i,j,k,l;
@@ -1520,8 +1490,8 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
 //      size-The number of bytes copied into the output buffer i.e dynamic fields
 //      0       -If PHS rule is NULL.If PHSV field is not set.If the verification fails.
 //-----------------------------------------------------------------------------
-int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
-                                                ,unsigned char *out_buf,UINT *header_size,UINT *new_header_size)
+static int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
+                        ,unsigned char *out_buf,UINT *header_size,UINT *new_header_size)
 {
         unsigned char *old_addr = out_buf;
         int supress = 0;
@@ -1581,9 +1551,9 @@ int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
 //      0       -Packet has failed the verification.
 //-----------------------------------------------------------------------------
 
- int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buffer,
-                                                                unsigned char *phsf,unsigned char *phsm,unsigned int phss,
-                                                                unsigned int phsv,UINT* new_header_size)
+static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buffer,
+                                unsigned char *phsf,unsigned char *phsm,unsigned int phss,
+                                unsigned int phsv,UINT* new_header_size)
 {
         unsigned int size=0;
         int bit,i=0;
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index bf2b5763252c..0dd05a7c55d9 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -27,19 +27,6 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
 
 int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter);
 
-void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable);
-
-int phs_compress(S_PHS_RULE   *phs_members,unsigned char *in_buf,
-                                                unsigned char *out_buf,unsigned int *header_size,UINT *new_header_size );
-
-
-int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buffer,
-                                                                unsigned char *phsf,unsigned char *phsm,unsigned int phss,unsigned int phsv,UINT *new_header_size );
-
-int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,\
-                                                  S_PHS_RULE   *phs_rules,UINT *header_size);
-
-
 int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);
 
 //Utility Functions
@@ -52,42 +39,10 @@ ULONG PhsDeleteClassifierRule(void* pvContext, B_UINT16 uiVcid ,B_UINT16  uiClsI
 ULONG PhsDeleteSFRules(void* pvContext,B_UINT16 uiVcid) ;
 
 
-ULONG PhsCompress(void* pvContext,
-                                  B_UINT16 uiVcid,
-                                  B_UINT16 uiClsId,
-                                  void *pvInputBuffer,
-                                  void *pvOutputBuffer,
-                                  UINT *pOldHeaderSize,
-                                  UINT *pNewHeaderSize );
-
-ULONG PhsDeCompress(void* pvContext,
-                                  B_UINT16 uiVcid,
-                                  void *pvInputBuffer,
-                                  void *pvOutputBuffer,
-                                  UINT *pInHeaderSize,
-                                  UINT *pOutHeaderSize);
-
-
 BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
 
-BOOLEAN ValidatePHSRuleComplete(S_PHS_RULE *psPhsRule);
-
 UINT GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable,B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);
 
-UINT GetClassifierEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiClsid,E_CLASSIFIER_ENTRY_CONTEXT eClsContext, S_CLASSIFIER_ENTRY **ppstClassifierEntry);
-
-UINT GetPhsRuleEntry(S_CLASSIFIER_TABLE *pstClassifierTable,B_UINT32 uiPHSI,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,S_PHS_RULE **ppstPhsRule);
-
-
-UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid,B_UINT16  uiClsId,S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
-
-UINT CreateClassiferToPHSRuleMapping(B_UINT16 uiVcid,B_UINT16  uiClsId,S_SERVICEFLOW_ENTRY *pstServiceFlowEntry,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
-
-UINT CreateClassifierPHSRule(B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,E_CLASSIFIER_ENTRY_CONTEXT eClsContext,B_UINT8 u8AssociatedPHSI);
-
-UINT UpdateClassifierPHSRule(B_UINT16  uiClsId,S_CLASSIFIER_ENTRY *pstClassifierEntry,S_CLASSIFIER_TABLE *psaClassifiertable ,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI);
-
-BOOLEAN DerefPhsRule(B_UINT16  uiClsId,S_CLASSIFIER_TABLE *psaClassifiertable,S_PHS_RULE *pstPhsRule);
 
 void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
 
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index 00f1cc12356a..b8a4009bdf0c 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -85,10 +85,10 @@ typedef struct _ETH_CS_ETH2_FRAME
         ETH_HEADER_STRUC EThHdr;
 } __attribute__((packed)) ETH_CS_ETH2_FRAME;
 
+#define ETHERNET_FRAMETYPE_IPV4         ntohs(0x0800)
+#define ETHERNET_FRAMETYPE_IPV6         ntohs(0x86dd)
+#define ETHERNET_FRAMETYPE_802QVLAN     ntohs(0x8100)
 
-#define ETHERNET_FRAMETYPE_IPV4 ntohs(0x0800)
-#define ETHERNET_FRAMETYPE_IPV6 ntohs(0x86dd)
-#define ETHERNET_FRAMETYPE_802QVLAN 0x8100
 //Per SF CS Specification Encodings
 typedef enum _E_SERVICEFLOW_CS_SPEC_
 {
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 70ec8bcafd1e..b80b806c90a3 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -1,23 +1,12 @@
 #ifndef _PROTOTYPES_H_
 #define _PROTOTYPES_H_
 
-int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */
-                        char *path,     /**< path to image file */
-                        unsigned int loc    /**< Download Address on the chip*/
-                        );
 VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer);
 
 VOID StatisticsResponse(PMINI_ADAPTER Adapter,PVOID pvBuffer);
 
 VOID IdleModeResponse(PMINI_ADAPTER Adapter,PUINT puiBuffer);
 
-void bcm_kfree_skb(struct sk_buff *skb);
-VOID bcm_kfree(VOID *ptr);
-
-
-VOID handle_rx_control_packet(PMINI_ADAPTER Adapter,    /**<Pointer to the Adapter structure*/
-                                                                struct sk_buff *skb);                           /**<Pointer to the socket buffer*/
-
 int control_packet_handler      (PMINI_ADAPTER Adapter);
 
 VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex);
@@ -38,25 +27,16 @@ VOID SortClassifiers(PMINI_ADAPTER Adapter);
 
 VOID flush_all_queues(PMINI_ADAPTER Adapter);
 
-USHORT  IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */
-                                        struct iphdr *iphd, /**<Pointer to the IP Hdr of the packet*/
-                                        S_CLASSIFIER_RULE *pstClassifierRule );
-
-VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structure*/
-                                        INT iIndex/**<Queue Index*/
-                                        );
-
 VOID PruneQueueAllSF(PMINI_ADAPTER Adapter);
 
 INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid);
 
-USHORT GetPacketQueueIndex(PMINI_ADAPTER Adapter, /**<Pointer to the driver control structure */
-                                                                struct sk_buff* Packet /**< Pointer to the Packet to be sent*/
-                                                                );
+USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb);
+
+BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);
+BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);
+BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol);
 
-VOID
-reply_to_arp_request(struct sk_buff *skb  /**<sk_buff of ARP request*/
-                                                );
 
 INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
                                         struct sk_buff *Packet, /**<data buffer*/
@@ -70,11 +50,9 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
                                                         char *pControlPacket/**<Control Packet*/
                                                         );
 
-INT bcm_transmit(struct sk_buff *skb,           /**< skb */
-                                        struct net_device *dev  /**< net device pointer */
-                                        );
 
 int register_networkdev(PMINI_ADAPTER Adapter);
+void unregister_networkdev(PMINI_ADAPTER Adapter);
 
 INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);
 
@@ -82,8 +60,6 @@ VOID AdapterFree(PMINI_ADAPTER Adapter);
 
 INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);
 
-int create_worker_threads(PMINI_ADAPTER psAdapter);
-
 int tx_pkt_handler(PMINI_ADAPTER Adapter);
 
 int  reset_card_proc(PMINI_ADAPTER Adapter );
@@ -92,7 +68,6 @@ int run_card_proc(PMINI_ADAPTER Adapter );
 
 int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter);
 
-int bcm_parse_target_params(PMINI_ADAPTER Adapter);
 
 INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter);
 
@@ -110,26 +85,15 @@ int rdmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
 
 int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user * user_buffer);
 
-void SendLinkDown(PMINI_ADAPTER Adapter);
-
 void SendIdleModeResponse(PMINI_ADAPTER Adapter);
 
-void HandleShutDownModeRequest(PMINI_ADAPTER Adapter,PUCHAR pucBuffer);
-
-int  ProcessGetHostMibs(PMINI_ADAPTER Adapter, PVOID ioBuffer,
-        ULONG inputBufferLength);
 
-int GetDroppedAppCntrlPktMibs(PVOID ioBuffer, PPER_TARANG_DATA pTarang);
+int  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *buf);
+void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, PPER_TARANG_DATA pTarang);
 void beceem_parse_target_struct(PMINI_ADAPTER Adapter);
 
-void doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
-
 int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
 
-void bcm_unregister_networkdev(PMINI_ADAPTER Adapter);
-
-int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid);
-
 void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
                 CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
 
@@ -149,7 +113,6 @@ void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter);
 
 void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter,B_UINT16 TID,BOOLEAN bFreeAll);
 
-void beceem_protocol_reset (PMINI_ADAPTER Adapter);
 
 void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex);
 
@@ -164,31 +127,11 @@ INT BeceemEEPROMBulkRead(
         UINT uiNumBytes);
 
 
-INT BeceemFlashBulkRead(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes);
-
-UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
 
 INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData);
 
-UINT BcmGetFlashSize(PMINI_ADAPTER Adapter);
-
-UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize);
-
-INT BeceemFlashBulkWrite(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes,
-        BOOLEAN bVerify);
-
 INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter);
 
-INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter);
-
 
 INT BeceemEEPROMBulkWrite(
         PMINI_ADAPTER Adapter,
@@ -198,11 +141,8 @@ INT BeceemEEPROMBulkWrite(
         BOOLEAN bVerify);
 
 
-INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData, UINT dwNumData);
-
 INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData);
 
-NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
 
 INT BeceemNVMRead(
         PMINI_ADAPTER Adapter,
@@ -217,24 +157,12 @@ INT BeceemNVMWrite(
         UINT uiNumBytes,
         BOOLEAN bVerify);
 
-INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize);
 
 INT BcmInitNVM(PMINI_ADAPTER Adapter);
 
-INT BcmGetNvmSize(PMINI_ADAPTER Adapter);
-
-INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
-
-VOID BcmValidateNvmType(PMINI_ADAPTER Adapter);
-
-VOID ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter);
+INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize);
+BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
 
-INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter);
-INT ReadDSDHeader(PMINI_ADAPTER Adapter, PDSD_HEADER psDSDHeader, FLASH2X_SECTION_VAL dsd);
-INT BcmGetActiveDSD(PMINI_ADAPTER Adapter);
-INT ReadISOHeader(PMINI_ADAPTER Adapter, PISO_HEADER psISOHeader, FLASH2X_SECTION_VAL IsoImage);
-INT BcmGetActiveISO(PMINI_ADAPTER Adapter);
-B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset);
 INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2xBitMap);
 
 INT BcmFlash2xBulkWrite(
@@ -251,7 +179,6 @@ INT BcmFlash2xBulkRead(
         FLASH2X_SECTION_VAL eFlashSectionVal,
         UINT uiOffsetWithinSectionVal,
         UINT uiNumBytes);
-INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
 
 INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
 
@@ -264,34 +191,13 @@ INT BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
 INT     validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);
 INT IsFlash2x(PMINI_ADAPTER Adapter);
-INT GetFlashBaseAddr(PMINI_ADAPTER Adapter);
-INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiSectAlignAddr);
 INT     BcmCopySection(PMINI_ADAPTER Adapter,
                                                 FLASH2X_SECTION_VAL SrcSection,
                                                 FLASH2X_SECTION_VAL DstSection,
                                                 UINT offset,
                                                 UINT numOfBytes);
 
-INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset);
-INT BcmMakeFlashCSActive(PMINI_ADAPTER Adapter, UINT offset);
-INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd);
-INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd);
-FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter);
-INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso);
-INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso);
-FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter);
-INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
-                                                                                PUINT pBuff,
-                                                                                FLASH2X_SECTION_VAL eFlash2xSectionVal,
-                                                                                UINT uiOffset,
-                                                                                UINT uiNumBytes
-                                                                                );
-
-//UINT getNumOfSubSectionWithWRPermisson(PMINI_ADAPTER Adapter, SECTION_TYPE secType);
-BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
-INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section);
-INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
-INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+
 BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter);
 
 
@@ -300,7 +206,6 @@ VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter,PUINT puiBuffer);
 int wrmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
 int rdmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
 
-int rdmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
 int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
 INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
                 unsigned long u32StartingAddress);
@@ -309,11 +214,6 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
 VOID putUsbSuspend(struct work_struct *work);
 BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios);
 
-#ifdef BCM_SHM_INTERFACE
-INT beceem_virtual_device_init(void);
-VOID virtual_mail_box_interrupt(void);
-INT beceem_virtual_device_exit(void);
-#endif
 
 #endif
 
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 75b2b879633f..8ce4536e6e28 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -4,15 +4,14 @@ This file contains the routines related to Quality of Service.
 */
 #include "headers.h"
 
-BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP);
-BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService);
-BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort);
-BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort);
-BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol);
-BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP);
-USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb);
-void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo);
-BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport);
+static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo);
+static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport);
+
+static USHORT   IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd,
+                           S_CLASSIFIER_RULE *pstClassifierRule );
+
+static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex);
+
 
 /*******************************************************************
 * Function    - MatchSrcIpAddress()
@@ -205,11 +204,10 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 Compares IPV4 Ip address and port number
 @return Queue Index.
 */
-USHORT  IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */
-                                        struct iphdr *iphd, /**<Pointer to the IP Hdr of the packet*/
-                                        S_CLASSIFIER_RULE *pstClassifierRule )
+static USHORT   IpVersion4(PMINI_ADAPTER Adapter,
+                           struct iphdr *iphd,
+                           S_CLASSIFIER_RULE *pstClassifierRule )
 {
-        //IPHeaderFormat                *pIpHeader=NULL;
         xporthdr                *xprt_hdr=NULL;
         BOOLEAN bClassificationSucceed=FALSE;
 
@@ -261,15 +259,6 @@ USHORT	IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
                 //if protocol is not TCP or UDP then no need of comparing source port and destination port
                 if(iphd->protocol!=TCP && iphd->protocol!=UDP)
                         break;
-#if 0
-                //check if memory is available of src and Dest port
-                if(ETH_AND_IP_HEADER_LEN + L4_SRC_PORT_LEN + L4_DEST_PORT_LEN > Packet->len)
-                {
-                        //This is not an erroneous condition and pkt will be checked for next classification.
-                        bClassificationSucceed = FALSE;
-                        break;
-                }
-#endif
                 //******************Checking Transport Layer Header field if present *****************//
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x",
                         (iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source);
@@ -312,29 +301,6 @@ USHORT	IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 
         return bClassificationSucceed;
 }
-/**
-@ingroup tx_functions
-@return  Queue Index based on priority.
-*/
-USHORT GetPacketQueueIndex(PMINI_ADAPTER Adapter, /**<Pointer to the driver control structure */
-                                                                struct sk_buff* Packet /**< Pointer to the Packet to be sent*/
-                                                                )
-{
-        USHORT                  usIndex=-1;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, QUEUE_INDEX, DBG_LVL_ALL, "=====>");
-
-        if(NULL==Adapter || NULL==Packet)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, QUEUE_INDEX, DBG_LVL_ALL, "Got NULL Values<======");
-                return -1;
-        }
-
-        usIndex = ClassifyPacket(Adapter,Packet);
-
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, QUEUE_INDEX, DBG_LVL_ALL, "Got Queue Index %x",usIndex);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, QUEUE_INDEX, DBG_LVL_ALL, "GetPacketQueueIndex <==============");
-        return usIndex;
-}
 
 VOID PruneQueueAllSF(PMINI_ADAPTER Adapter)
 {
@@ -357,23 +323,21 @@ is less than number of bytes in the queue. If so -
 drops packets from the Head till the number of bytes is
 less than or equal to max queue size for the queue.
 */
-VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structure*/
-                                        INT iIndex/**<Queue Index*/
-                                        )
+static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 {
         struct sk_buff* PacketToDrop=NULL;
-        struct net_device_stats*  netstats=NULL;
+        struct net_device_stats *netstats;
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "=====> Index %d",iIndex);
 
         if(iIndex == HiPriority)
-        return;
+                return;
 
         if(!Adapter || (iIndex < 0) || (iIndex > HiPriority))
                 return;
 
         /* To Store the netdevice statistic */
-        netstats = &((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats;
+        netstats = &Adapter->dev->stats;
 
         spin_lock_bh(&Adapter->PackInfo[iIndex].SFQueueLock);
 
@@ -395,9 +359,13 @@ VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structur
 
                 if(PacketToDrop)
                 {
-                        if(netstats)
-                                netstats->tx_dropped++;
-                        atomic_inc(&Adapter->TxDroppedPacketCount);
+                        struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iIndex);
+                        if (netif_msg_tx_err(Adapter))
+                                pr_info(PFX "%s: tx queue %d overlimit\n", 
+                                        Adapter->dev->name, iIndex);
+
+                        txq->tx_dropped++;
+
                         DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue,
                                                 Adapter->PackInfo[iIndex].LastTxQueue);
                         /// update current bytes and packets count
@@ -407,7 +375,7 @@ VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structur
                         /// update dropped bytes and packets counts
                         Adapter->PackInfo[iIndex].uiDroppedCountBytes += PacketToDrop->len;
                         Adapter->PackInfo[iIndex].uiDroppedCountPackets++;
-                        bcm_kfree_skb(PacketToDrop);
+                        dev_kfree_skb(PacketToDrop);
 
                 }
 
@@ -416,7 +384,6 @@ VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structur
                         Adapter->PackInfo[iIndex].uiDroppedCountPackets);
 
                 atomic_dec(&Adapter->TotalPacketCount);
-                Adapter->bcm_jiffies = jiffies;
         }
 
         spin_unlock_bh(&Adapter->PackInfo[iIndex].SFQueueLock);
@@ -430,16 +397,15 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 {
         INT             iQIndex;
         UINT    uiTotalPacketLength;
-        struct sk_buff*                         PacketToDrop=NULL;
-        struct net_device_stats*        netstats=NULL;
+        struct sk_buff*                 PacketToDrop=NULL;
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "=====>");
-        /* To Store the netdevice statistic */
-        netstats = &((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats;
 
 //      down(&Adapter->data_packet_queue_lock);
         for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++)
         {
+                struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iQIndex);
+
                 spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
                 while(Adapter->PackInfo[iQIndex].FirstTxQueue)
                 {
@@ -447,8 +413,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
                         if(PacketToDrop)
                         {
                                 uiTotalPacketLength = PacketToDrop->len;
-                                netstats->tx_dropped++;
-                                atomic_inc(&Adapter->TxDroppedPacketCount);
+                                txq->tx_dropped++;
                         }
                         else
                                 uiTotalPacketLength = 0;
@@ -457,7 +422,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
                                                 Adapter->PackInfo[iQIndex].LastTxQueue);
 
                         /* Free the skb */
-                        bcm_kfree_skb(PacketToDrop);
+                        dev_kfree_skb(PacketToDrop);
 
                         /// update current bytes and packets count
                         Adapter->PackInfo[iQIndex].uiCurrentBytesOnHost -= uiTotalPacketLength;
@@ -559,12 +524,6 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
         for(uiLoopIndex = MAX_CLASSIFIERS - 1; uiLoopIndex >= 0; uiLoopIndex--)
         {
-                if (Adapter->device_removed)
-                {
-                        bClassificationSucceed = FALSE;
-                        break;
-                }
-
                 if(bClassificationSucceed)
                         break;
                 //Iterate through all classifiers which are already in order of priority
@@ -810,7 +769,10 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 }
 
 
-BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport)
+static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,
+                                PS_ETHCS_PKT_INFO pstEthCsPktInfo,
+                                S_CLASSIFIER_RULE *pstClassifierRule,
+                                B_UINT8 EthCSCupport)
 {
         BOOLEAN bClassificationSucceed = FALSE;
         bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule,((ETH_HEADER_STRUC *)(skb->data))->au8SourceAddress);
@@ -840,9 +802,11 @@ BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_
         return bClassificationSucceed;
 }
 
-void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo)
+static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,
+                            PS_ETHCS_PKT_INFO pstEthCsPktInfo)
 {
         USHORT u16Etype = ntohs(((ETH_HEADER_STRUC*)pvEthPayload)->u16Etype);
+
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCSGetPktInfo : Eth Hdr Type : %X\n",u16Etype);
         if(u16Etype > 0x5dc)
         {
diff --git a/drivers/staging/bcm/TODO b/drivers/staging/bcm/TODO
index 366634be5fe1..cd3e9f2ed87a 100644
--- a/drivers/staging/bcm/TODO
+++ b/drivers/staging/bcm/TODO
@@ -1,15 +1,22 @@
+This driver is barely functional in its current state.
+
+BIG:
+        - existing API is (/dev/tarang) should be replaced
+          Is it possible to use same API as Intel Wimax stack and
+          have same user level components.
+        - Qos and queue model is non-standard and inflexible.
+          Use existing TC Qos?
+
 TODO:
+        - support more than one board - eliminate global variables
+        - remove developer debug BCM_DEBUG() macros
+          add a limited number of messages through netif_msg()
         - fix non-standard kernel style
-        - sparse warnings
         - checkpatch warnings
-        - remove compatiablity code for older kernels
-        - remove #ifdef's
-        - fix bogus device nameing and reference counting (see bcm_notify_event)
-        - fix use of file I/O to load config
-        - request firmware
-        - update to current network device API
-        - merge some files together
+        - use request firmware
+        - fix use of file I/O to load config with better API
+        - merge some files together?
         - cleanup/eliminate debug messages
 
-        - integrate with existing Wimax stack?
+
 
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 12f9e13457db..0f7000960d50 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -6,7 +6,7 @@
 digraph transmit1 {
 node[shape=box]
 edge[weight=5;color=red]
-bcm_transmit->reply_to_arp_request[label="ARP"]
+
 bcm_transmit->GetPacketQueueIndex[label="IP Packet"]
 GetPacketQueueIndex->IpVersion4[label="IPV4"]
 GetPacketQueueIndex->IpVersion6[label="IPV6"]
@@ -35,169 +35,16 @@ SendPacketFromQueue->SetupNextSend->bcm_cmd53
 
 #include "headers.h"
 
-/*******************************************************************
-* Function    - bcm_transmit()
-*
-* Description - This is the main transmit function for our virtual
-*                               interface(veth0). It handles the ARP packets. It
-*                               clones this packet and then Queue it to a suitable
-*                               Queue. Then calls the transmit_packet().
-*
-* Parameter   -  skb - Pointer to the socket buffer structure
-*                                dev - Pointer to the virtual net device structure
-*
-* Returns     -  zero (success) or -ve value (failure)
-*
-*********************************************************************/
-
-INT bcm_transmit(struct sk_buff *skb,           /**< skb */
-                                        struct net_device *dev  /**< net device pointer */
-                                        )
-{
-        PMINI_ADAPTER           Adapter = NULL;
-        USHORT                          qindex=0;
-        struct timeval tv;
-        UINT            pkt_type = 0;
-        UINT            calltransmit = 0;
-
-        BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "\n%s====>\n",__FUNCTION__);
-
-        memset(&tv, 0, sizeof(tv));
-        /* Check for valid parameters */
-        if(skb == NULL || dev==NULL)
-        {
-            BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX,TX_OSAL_DBG, DBG_LVL_ALL, "Got NULL skb or dev\n");
-                return -EINVAL;
-        }
-
-        Adapter = GET_BCM_ADAPTER(dev);
-        if(!Adapter)
-        {
-                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Got Invalid Adapter\n");
-                return -EINVAL;
-        }
-        if(Adapter->device_removed == TRUE || !Adapter->LinkUpStatus)
-        {
-                if(!netif_queue_stopped(dev)) {
-                                netif_carrier_off(dev);
-                                netif_stop_queue(dev);
-                }
-                return STATUS_FAILURE;
-        }
-        BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Packet size : %d\n", skb->len);
-
-        /*Add Ethernet CS check here*/
-        if(Adapter->TransferMode == IP_PACKET_ONLY_MODE )
-        {
-        pkt_type = ntohs(*(PUSHORT)(skb->data + 12));
-                /* Get the queue index where the packet is to be queued */
-                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Getting the Queue Index.....");
-
-                qindex = GetPacketQueueIndex(Adapter,skb);
-
-                if((SHORT)INVALID_QUEUE_INDEX==(SHORT)qindex)
-                {
-                        if(pkt_type == ETH_ARP_FRAME)
-                        {
-                                /*
-                                Reply directly to ARP request packet
-                                ARP Spoofing only if NO ETH CS rule matches for it
-                                */
-                                BCM_DEBUG_PRINT (Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL,"ARP OPCODE = %02x",
-
-                (*(PUCHAR)(skb->data + 21)));
-
-                reply_to_arp_request(skb);
-
-                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX,TX_OSAL_DBG, DBG_LVL_ALL,"After reply_to_arp_request \n");
-
-                        }
-                        else
-                        {
-                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL,
-                        "Invalid queue index, dropping pkt\n");
-
-                                bcm_kfree_skb(skb);
-                        }
-                        return STATUS_SUCCESS;
-        }
-
-                if(Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >= SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
-                {
-                        atomic_inc(&Adapter->TxDroppedPacketCount);
-                        bcm_kfree_skb(skb);
-                        return STATUS_SUCCESS;
-                }
-
-                /* Now Enqueue the packet */
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "bcm_transmit Enqueueing the Packet To Queue %d",qindex);
-                spin_lock(&Adapter->PackInfo[qindex].SFQueueLock);
-                Adapter->PackInfo[qindex].uiCurrentBytesOnHost += skb->len;
-                Adapter->PackInfo[qindex].uiCurrentPacketsOnHost++;
-
-                *((B_UINT32 *)skb->cb + SKB_CB_LATENCY_OFFSET ) = jiffies;
-                ENQUEUEPACKET(Adapter->PackInfo[qindex].FirstTxQueue,
-                          Adapter->PackInfo[qindex].LastTxQueue, skb);
-                atomic_inc(&Adapter->TotalPacketCount);
-                spin_unlock(&Adapter->PackInfo[qindex].SFQueueLock);
-                do_gettimeofday(&tv);
-
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL,"ENQ: \n");
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Pkt Len = %d, sec: %ld, usec: %ld\n",
-                (skb->len-ETH_HLEN), tv.tv_sec, tv.tv_usec);
-
-#ifdef BCM_SHM_INTERFACE
-                spin_lock(&Adapter->txtransmitlock);
-                if(Adapter->txtransmit_running == 0)
-                {
-                        Adapter->txtransmit_running = 1;
-                        calltransmit = 1;
-                }
-                else
-                        calltransmit = 0;
-
-                spin_unlock(&Adapter->txtransmitlock);
-#endif
-                if(calltransmit == 1)
-                        transmit_packets(Adapter);
-                else
-                {
-                        if(!atomic_read(&Adapter->TxPktAvail))
-                        {
-                                atomic_set(&Adapter->TxPktAvail, 1);
-#ifdef BCM_SHM_INTERFACE
-                                virtual_mail_box_interrupt();
-#endif
-                                wake_up(&Adapter->tx_packet_wait_queue);
-                        }
-                }
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "<====");
-        }
-        else
-                bcm_kfree_skb(skb);
-
-  return STATUS_SUCCESS;
-}
-
 
 /**
 @ingroup ctrl_pkt_functions
 This function dispatches control packet to the h/w interface
 @return zero(success) or -ve value(failure)
 */
-INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
-                                                        char *pControlPacket/**<Control Packet*/
-                                                        )
+INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 {
-        PLEADER PLeader = NULL;
-        struct timeval tv;
-        memset(&tv, 0, sizeof(tv));
-
-
-
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "========>");
+        PLEADER PLeader = (PLEADER)pControlPacket;
 
-        PLeader=(PLEADER)pControlPacket;
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Tx");
         if(!pControlPacket || !Adapter)
         {
@@ -208,12 +55,6 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
                 ((PLeader->PLength-1)/MAX_DEVICE_DESC_SIZE)+1))
     {
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "NO FREE DESCRIPTORS TO SEND CONTROL PACKET");
-        if(Adapter->bcm_jiffies == 0)
-        {
-                Adapter->bcm_jiffies = jiffies;
-            BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "UPDATED TIME(hex): %lu",
-                                Adapter->bcm_jiffies);
-        }
         return STATUS_FAILURE;
     }
 
@@ -224,76 +65,33 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader Length: %x",PLeader->PLength);
         if(Adapter->device_removed)
                 return 0;
-#ifndef BCM_SHM_INTERFACE
-        Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
-                                        pControlPacket, (PLeader->PLength + LEADER_SIZE));
-#else
-        tx_pkts_to_firmware(pControlPacket,(PLeader->PLength + LEADER_SIZE),1);
 
-        if(PLeader->Status==IDLE_MESSAGE)
-        {
-                if(((CONTROL_MESSAGE*)PLeader)->szData[0] == GO_TO_IDLE_MODE_PAYLOAD &&
-                ((CONTROL_MESSAGE*)PLeader)->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Idle Mode Ack Sent to the Device\n");
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Host Entering into Idle Mode\n");
-                        do_gettimeofday(&tv);
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "IdleMode Msg sent to f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                        if(Adapter->bDoSuspend != TRUE)
-                        {
-                                Adapter->IdleMode = TRUE;
-                                Adapter->bPreparingForLowPowerMode = FALSE ;
-                        }
-                }
-        }
-        if((PLeader->Status == LINK_UP_CONTROL_REQ) &&
-                ((PUCHAR)pControlPacket)[sizeof(LEADER)] == LINK_UP_ACK &&
-                ((PUCHAR)pControlPacket)[sizeof(LEADER)+1] ==
-                                                                LINK_SHUTDOWN_REQ_FROM_FIRMWARE  &&
-                ((PUCHAR)pControlPacket)[sizeof(LEADER)+2] == SHUTDOWN_ACK_FROM_DRIVER)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Shut Down ACK Sent and Host entering Shut State \n");
-                if(Adapter->bDoSuspend != TRUE)
-                {
-                        Adapter->bShutStatus = TRUE;
-                        Adapter->bPreparingForLowPowerMode = FALSE;
-                        Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
-                }
+        if (netif_msg_pktdata(Adapter))
+                print_hex_dump(KERN_DEBUG, PFX "tx control: ", DUMP_PREFIX_NONE,
+                               16, 1, pControlPacket, PLeader->PLength + LEADER_SIZE, 0);
 
-        }
-#endif
+        Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
+                                        pControlPacket, (PLeader->PLength + LEADER_SIZE));
 
-        ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_packets++;
-        ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_bytes+=
-                        PLeader->PLength;
         atomic_dec(&Adapter->CurrNumFreeTxDesc);
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "<=========");
         return STATUS_SUCCESS;
 }
-static  LEADER Leader={0};
+
 /**
 @ingroup tx_functions
 This function despatches the IP packets with the given vcid
 to the target via the host h/w interface.
 @return  zero(success) or -ve value(failure)
 */
-INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
-                                        struct sk_buff *Packet, /**<data buffer*/
-                                        USHORT Vcid)                    /**<VCID for this packet*/
+INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 {
         int             status=0;
-#ifdef GDMA_INTERFACE
-        int dontfree = 0;
-#endif
         BOOLEAN bHeaderSupressionEnabled = FALSE;
         B_UINT16            uiClassifierRuleID;
-        int QueueIndex = NO_OF_QUEUES + 1;
+        u16     QueueIndex = skb_get_queue_mapping(Packet);
+        LEADER Leader={0};
 
-        if(!Adapter || !Packet)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Got NULL Adapter or Packet");
-                return -EINVAL;
-        }
         if(Packet->len > MAX_DEVICE_DESC_SIZE)
         {
                 status = STATUS_FAILURE;
@@ -302,14 +100,10 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
 
         /* Get the Classifier Rule ID */
         uiClassifierRuleID = *((UINT32*) (Packet->cb)+SKB_CB_CLASSIFICATION_OFFSET);
-        QueueIndex = SearchVcid( Adapter,Vcid);
-        if(QueueIndex < NO_OF_QUEUES)
-        {
-                bHeaderSupressionEnabled =
-                        Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled;
-                bHeaderSupressionEnabled =
-                        bHeaderSupressionEnabled & Adapter->bPHSEnabled;
-        }
+
+        bHeaderSupressionEnabled = Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled
+                & Adapter->bPHSEnabled;
+
         if(Adapter->device_removed)
                 {
                 status = STATUS_FAILURE;
@@ -327,15 +121,10 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
 
         Leader.Vcid     = Vcid;
 
-    if(TCP_ACK == *((UINT32*) (Packet->cb) + SKB_CB_TCPACK_OFFSET ))
-        {
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Sending TCP ACK\n");
+        if(TCP_ACK == *((UINT32*) (Packet->cb) + SKB_CB_TCPACK_OFFSET ))
                 Leader.Status = LEADER_STATUS_TCP_ACK;
-        }
         else
-        {
                 Leader.Status = LEADER_STATUS;
-        }
 
         if(Adapter->PackInfo[QueueIndex].bEthCSSupport)
         {
@@ -351,68 +140,53 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
                 skb_push(Packet, LEADER_SIZE);
                 memcpy(Packet->data, &Leader, LEADER_SIZE);
         }
-
         else
         {
                 Leader.PLength = Packet->len - ETH_HLEN;
                 memcpy((LEADER*)skb_pull(Packet, (ETH_HLEN - LEADER_SIZE)), &Leader, LEADER_SIZE);
         }
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Packet->len = %d", Packet->len);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Vcid = %d", Vcid);
-
-#ifndef BCM_SHM_INTERFACE
         status = Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
                         Packet->data, (Leader.PLength + LEADER_SIZE));
-#else
-        status = tx_pkts_to_firmware(Packet,Packet->len,0);
-#endif
         if(status)
         {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Tx Failed..\n");
+                ++Adapter->dev->stats.tx_errors;
+                if (netif_msg_tx_err(Adapter))
+                        pr_info(PFX "%s: transmit error %d\n", Adapter->dev->name,
+                                status);
         }
         else
         {
+                struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, QueueIndex);
                 Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength;
-                atomic_add(Leader.PLength, &Adapter->GoodTxByteCount);
-                atomic_inc(&Adapter->TxTotalPacketCount);
-#ifdef GDMA_INTERFACE
-    dontfree = 1;
-#endif
-        }
 
-        atomic_dec(&Adapter->CurrNumFreeTxDesc);
-
-errExit:
+                txq->tx_bytes += Leader.PLength;
+                ++txq->tx_packets;
 
-        if(STATUS_SUCCESS == status)
-        {
                 Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3;
                 Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len);
                 Adapter->PackInfo[QueueIndex].uiSentPackets++;
                 Adapter->PackInfo[QueueIndex].NumOfPacketsSent++;
 
                 atomic_dec(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount);
-#ifdef BCM_SHM_INTERFACE
-                if(atomic_read(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount) < 0)
-                {
-                        atomic_set(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount, 0);
-                }
-#endif
                 Adapter->PackInfo[QueueIndex].uiThisPeriodSentBytes += Leader.PLength;
         }
 
+        atomic_dec(&Adapter->CurrNumFreeTxDesc);
 
-#ifdef GDMA_INTERFACE
-  if(!dontfree){
-        bcm_kfree_skb(Packet);
-  }
-#else
-        bcm_kfree_skb(Packet);
-#endif
+errExit:
+
+        dev_kfree_skb(Packet);
         return status;
 }
 
+static int tx_pending(PMINI_ADAPTER Adapter)
+{
+        return (atomic_read(&Adapter->TxPktAvail)
+                && MINIMUM_PENDING_DESCRIPTORS < atomic_read(&Adapter->CurrNumFreeTxDesc))
+                || Adapter->device_removed || (1 == Adapter->downloadDDR);
+}
+
 /**
 @ingroup tx_functions
 Transmit thread
@@ -420,57 +194,26 @@ Transmit thread
 int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
                                 )
 {
-#ifndef BCM_SHM_INTERFACE
         int status = 0;
-#endif
-
-        UINT calltransmit = 1;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Entring to wait for signal from the interrupt service thread!Adapter = %p",Adapter);
-
 
-        while(1)
-        {
-                if(Adapter->LinkUpStatus){
+        while(! kthread_should_stop()) {
+                /* FIXME - the timeout looks like workaround for racey usage of TxPktAvail */
+                if(Adapter->LinkUpStatus)
                         wait_event_timeout(Adapter->tx_packet_wait_queue,
-                                ((atomic_read(&Adapter->TxPktAvail) &&
-                                (MINIMUM_PENDING_DESCRIPTORS <
-                                atomic_read(&Adapter->CurrNumFreeTxDesc)) &&
-                                (Adapter->device_removed == FALSE))) ||
-                                (1 == Adapter->downloadDDR) || kthread_should_stop()
-#ifndef BCM_SHM_INTERFACE
-                                || (TRUE == Adapter->bEndPointHalted)
-#endif
-                                , msecs_to_jiffies(10));
-                }
-                else{
-                        wait_event(Adapter->tx_packet_wait_queue,
-                                ((atomic_read(&Adapter->TxPktAvail) &&
-                                (MINIMUM_PENDING_DESCRIPTORS <
-                                atomic_read(&Adapter->CurrNumFreeTxDesc)) &&
-                                (Adapter->device_removed == FALSE))) ||
-                                (1 == Adapter->downloadDDR) || kthread_should_stop()
-#ifndef BCM_SHM_INTERFACE
-                                || (TRUE == Adapter->bEndPointHalted)
-#endif
-                                );
-                }
-
-                if(kthread_should_stop() || Adapter->device_removed)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Exiting the tx thread..\n");
-                        Adapter->transmit_packet_thread = NULL;
-                        return 0;
-                }
+                                           tx_pending(Adapter), msecs_to_jiffies(10));
+                else
+                        wait_event_interruptible(Adapter->tx_packet_wait_queue,
+                                                 tx_pending(Adapter));
 
-#ifndef BCM_SHM_INTERFACE
+                if (Adapter->device_removed)
+                        break;
 
                 if(Adapter->downloadDDR == 1)
                 {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Downloading DDR Settings\n");
                         Adapter->downloadDDR +=1;
                         status = download_ddr_settings(Adapter);
                         if(status)
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "DDR DOWNLOAD FAILED!\n");
+                                pr_err(PFX "DDR DOWNLOAD FAILED! %d\n", status);
                         continue;
                 }
 
@@ -489,7 +232,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
                                 update_per_sf_desc_cnts(Adapter);
                         }
                 }
-#endif
 
                 if( atomic_read(&Adapter->CurrNumFreeTxDesc) &&
                         Adapter->LinkStatus == SYNC_UP_REQUEST &&
@@ -507,49 +249,12 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
                                 wake_up(&Adapter->process_rx_cntrlpkt);
                 }
 
-#ifdef BCM_SHM_INTERFACE
-                spin_lock_bh(&Adapter->txtransmitlock);
-                if(Adapter->txtransmit_running == 0)
-                {
-                        Adapter->txtransmit_running = 1;
-                        calltransmit = 1;
-                }
-                else
-                        calltransmit = 0;
-                spin_unlock_bh(&Adapter->txtransmitlock);
-#endif
-
-                if(calltransmit)
-                        transmit_packets(Adapter);
+                transmit_packets(Adapter);
 
                 atomic_set(&Adapter->TxPktAvail, 0);
         }
-        return 0;
-}
-
-#ifdef BCM_SHM_INTERFACE
-extern PMINI_ADAPTER psAdaptertest;
-void  virtual_mail_box_interrupt(void)
-{
-
-#ifndef GDMA_INTERFACE
-        PUINT ptr =  (PUINT)CPE_VIRTUAL_MAILBOX_REG;
-        UINT intval = (UINT)((*ptr & 0xFF00) >> 8);
-        if (intval != 0)
-        {
-                atomic_set(&psAdaptertest->CurrNumFreeTxDesc,   intval);
-                atomic_set (&psAdaptertest->uiMBupdate, TRUE);
 
-                //make it to 0
-                *ptr = *ptr & 0xffff00ff;
-        }
-#endif
-}
-unsigned int total_tx_pkts_pending(void)
-{
-        return atomic_read(&psAdaptertest->TotalPacketCount);
+        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Exiting the tx thread..\n");
+        Adapter->transmit_packet_thread = NULL;
+        return 0;
 }
-
-#endif
-
-
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 4cbe30022248..890778450a86 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -2,19 +2,6 @@
 #define CNTRL_SIGNALING_INTERFACE_
 
 
-#ifdef BECEEM_TARGET
-
-#include <mac_common.h>
-#include <msg_Dsa.h>
-#include <msg_Dsc.h>
-#include <msg_Dsd.h>
-#include <sch_definitions.h>
-using namespace Beceem;
-#ifdef ENABLE_CORRIGENDUM2_UPDATE
-extern B_UINT32 g_u32Corr2MacFlags;
-#endif
-
-#else
 
 
 #define DSA_REQ 11
@@ -28,7 +15,6 @@ extern B_UINT32 g_u32Corr2MacFlags;
 #define DSD_ACK 19
 #define MAX_CLASSIFIERS_IN_SF  4
 
-#endif
 
 #define MAX_STRING_LEN 20
 #define MAX_PHS_LENGTHS 255
@@ -57,37 +43,7 @@ extern B_UINT32 g_u32Corr2MacFlags;
 ////////////////////////structure Definitions///////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 /// \brief class cCPacketClassificationRule
-#ifdef BECEEM_TARGET
-class CCPacketClassificationRuleSI{
-        public:
-                /// \brief Constructor for the class
-        CCPacketClassificationRuleSI():
-                u8ClassifierRulePriority(mClassifierRulePriority),
-                u8IPTypeOfServiceLength(mIPTypeOfService),
-                u8Protocol(mProtocol),
-                u8IPMaskedSourceAddressLength(0),
-                u8IPDestinationAddressLength(0),
-                u8ProtocolSourcePortRangeLength(0),
-                u8ProtocolDestPortRangeLength(0),
-                u8EthernetDestMacAddressLength(0),
-                u8EthernetSourceMACAddressLength(0),
-                u8EthertypeLength(0),
-                u16UserPriority(mUserPriority),
-                u16VLANID(mVLANID),
-                u8AssociatedPHSI(mAssociatedPHSI),
-                u16PacketClassificationRuleIndex(mPacketClassifierRuleIndex),
-                u8VendorSpecificClassifierParamLength(mVendorSpecificClassifierParamLength),
-                u8IPv6FlowLableLength(mIPv6FlowLableLength),
-                u8ClassifierActionRule(mClassifierActionRule)
-
-                {}
-              void Reset()
-              {
-                    CCPacketClassificationRuleSI();
-              }
-#else
 struct _stCPacketClassificationRuleSI{
-#endif
 
         /**  16bit UserPriority Of The Service Flow*/
     B_UINT16                        u16UserPriority;
@@ -145,29 +101,10 @@ struct _stCPacketClassificationRuleSI{
     B_UINT8                                                     u8ClassifierActionRule;
     B_UINT16                                                    u16ValidityBitMap;
 };
-#ifndef BECEEM_TARGET
 typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI,stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
-#endif
 
 /// \brief class CPhsRuleSI
-#ifdef BECEEM_TARGET
-class CPhsRuleSI{
-        public:
-                /// \brief Constructor for the class
-                CPhsRuleSI():
-                        u8PHSI(mPHSI),
-                        u8PHSFLength(0),
-                        u8PHSMLength(0),
-                        u8PHSS(mPHSS),
-                        u8PHSV(mPHSV),
-                        u8VendorSpecificPHSParamsLength(mVendorSpecificPHSParamLength){}
-                void Reset()
-                {
-                        CPhsRuleSI();
-                }
-#else
 typedef struct _stPhsRuleSI {
-#endif
         /**  8bit PHS Index Of The Service Flow*/
     B_UINT8                         u8PHSI;
         /**  PHSF Length Of The Service Flow*/
@@ -188,31 +125,11 @@ typedef struct _stPhsRuleSI {
     B_UINT8                         u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
 
         B_UINT8                         u8Padding[2];
-#ifdef BECEEM_TARGET
-};
-#else
 }stPhsRuleSI,*pstPhsRuleSI;
 typedef stPhsRuleSI CPhsRuleSI;
-#endif
 
 /// \brief structure cConvergenceSLTypes
-#ifdef BECEEM_TARGET
-class CConvergenceSLTypes{
-        public:
-                /// \brief Constructor for the class
-                CConvergenceSLTypes():
-                u8ClassfierDSCAction(mClassifierDSCAction),
-                u8PhsDSCAction  (mPhsDSCAction)
-                {}
-              void Reset()
-              {
-                    CConvergenceSLTypes();
-                    cCPacketClassificationRule.Reset();
-                    cPhsRule.Reset();
-              }
-#else
 struct _stConvergenceSLTypes{
-#endif
         /**  8bit Phs Classfier Action Of The Service Flow*/
     B_UINT8                         u8ClassfierDSCAction;
         /**  8bit Phs DSC Action Of The Service Flow*/
@@ -220,111 +137,15 @@ struct _stConvergenceSLTypes{
         /**   16bit Padding */
     B_UINT8                         u8Padding[2];
     /// \brief class cCPacketClassificationRule
-#ifdef BECEEM_TARGET
-    CCPacketClassificationRuleSI      cCPacketClassificationRule;
-#else
     stCPacketClassificationRuleSI     cCPacketClassificationRule;
-#endif
     /// \brief class CPhsRuleSI
-#ifdef BECEEM_TARGET
-    CPhsRuleSI                          cPhsRule;
-#else
      struct _stPhsRuleSI                cPhsRule;
-#endif
 };
-#ifndef BECEEM_TARGET
 typedef struct _stConvergenceSLTypes stConvergenceSLTypes,CConvergenceSLTypes, *pstConvergenceSLTypes;
-#endif
 
 
 /// \brief structure CServiceFlowParamSI
-#ifdef BECEEM_TARGET
-class CServiceFlowParamSI{
-        public:
-                /// \brief Constructor for the class
-                CServiceFlowParamSI():
-                        u32SFID(mSFid),
-                        u16CID(mCid),
-                        u8ServiceClassNameLength(mServiceClassNameLength),
-                        u8MBSService(mMBSService),
-                        u8QosParamSet(mQosParamSetType),
-                        u8TrafficPriority(mTrafficPriority),
-                        u32MaxSustainedTrafficRate(mMaximumSustainedTrafficRate),
-                        u32MaxTrafficBurst(mMaximumTrafficBurst),
-                        u32MinReservedTrafficRate(mMinimumReservedTrafficRate),
-                        u8ServiceFlowSchedulingType(mServiceFlowSchedulingType),
-                        u8RequesttransmissionPolicy(mRequestTransmissionPolicy),
-                        u32ToleratedJitter(mToleratedJitter),
-                        u32MaximumLatency(mMaximumLatency),
-                        u8FixedLengthVSVariableLengthSDUIndicator
-                        (mFixedLengthVSVariableLength),
-                        u8SDUSize(mSDUSize),
-                        u16TargetSAID(mTargetSAID),
-                        u8ARQEnable(mARQEnable),
-                        u16ARQWindowSize(mARQWindowSize),
-                        u16ARQBlockLifeTime(mARQBlockLifeTime),
-                        u16ARQSyncLossTimeOut(mARQSyncLossTimeOut),
-                        u8ARQDeliverInOrder(mARQDeliverInOrder),
-                        u16ARQRxPurgeTimeOut(mARQRXPurgeTimeOut),
-                        //Add ARQ BLOCK SIZE, ARQ TX and RX delay initializations here
-                        //after we move to only CORR2
-                        u8RxARQAckProcessingTime(mRxARQAckProcessingTime),
-                        u8CSSpecification(mCSSpecification),
-                        u8TypeOfDataDeliveryService(mTypeOfDataDeliveryService),
-                        u16SDUInterArrivalTime(mSDUInterArrivalTime),
-                        u16TimeBase(mTimeBase),
-                        u8PagingPreference(mPagingPreference),
-                        u8MBSZoneIdentifierassignment(mMBSZoneIdentifierassignmentLength),
-                        u8TrafficIndicationPreference(mTrafficIndicationPreference),
-                        u8GlobalServicesClassNameLength(mGlobalServicesClassNameLength),
-                        u8SNFeedbackEnabled(mSNFeedbackEnabled),
-                        u8FSNSize(mFSNSize),
-                        u8CIDAllocation4activeBSsLength(mCIDAllocation4activeBSsLength),
-                        u16UnsolicitedGrantInterval(mUnsolicitedGrantInterval),
-                        u16UnsolicitedPollingInterval(mUnsolicitedPollingInterval),
-                        u8PDUSNExtendedSubheader4HarqReordering(mPDUSNExtendedSubheader4HarqReordering),
-                        u8MBSContentsIDLength(mMBSContentsIDLength),
-                        u8HARQServiceFlows(mHARQServiceFlows),
-                        u8AuthTokenLength(mAuthTokenLength),
-                        u8HarqChannelMappingLength(mHarqChannelMappingLength),
-                        u8VendorSpecificQoSParamLength(mVendorSpecificQoSParamLength),
-            bValid(FALSE),
-             u8TotalClassifiers()
-{
-//Remove the bolck after we move to Corr2 only code
-#ifdef ENABLE_CORRIGENDUM2_UPDATE
-        if((g_u32Corr2MacFlags & CORR_2_DSX)  ||  (g_u32Corr2MacFlags & CORR_2_ARQ))
-        {
-        /* IEEE Comment #627 / MTG Comment #426 */
-        u16ARQBlockSize = mARQBlockSize;
-                if(g_u32Corr2MacFlags & CORR_2_ARQ) {
-                        u16ARQRetryTxTimeOut = mARQRetryTimeOutTxDelay;
-                        if(g_u32VENDOR_TYPE == VENDOR_ALCATEL) {
-                                u16ARQRetryRxTimeOut = mARQRetryTimeOutRxDelay_ALU;
-                        } else {
-                                u16ARQRetryRxTimeOut = mARQRetryTimeOutRxDelay;
-                        }
-                }
-                else
-                {
-                        u16ARQRetryTxTimeOut = mARQRetryTimeOutTxDelayCorr1;
-                        u16ARQRetryRxTimeOut = mARQRetryTimeOutRxDelayCorr1;
-                }
-        }
-        else
-#endif
-        {
-                u16ARQBlockSize = mARQBlockSizeCorr1;
-                u16ARQRetryTxTimeOut = mARQRetryTimeOutTxDelayCorr1;
-                u16ARQRetryRxTimeOut = mARQRetryTimeOutRxDelayCorr1;
-        }
-}
-
-        void ComputeMacOverhead(B_UINT8 u8SecOvrhead);
-        B_UINT16        GetMacOverhead() { return       u16MacOverhead; }
-#else
 typedef struct _stServiceFlowParamSI{
-#endif //end of ifdef BECEEM_TARGET
 
      /**  32bitSFID Of The Service Flow*/
     B_UINT32                        u32SFID;
@@ -367,11 +188,6 @@ typedef struct _stServiceFlowParamSI{
 
          /**  16bit ARQ Purge timeout */
     B_UINT16                        u16ARQRxPurgeTimeOut;
-#if 0 //def ENABLE_CORRIGENDUM2_UPDATE
-/* IEEE Comment #627 / MTG Comment #426 */
-    /// \brief Size of an ARQ block, changed from 2 bytes to 1
-    B_UINT8                        u8ARQBlockSize;
-#endif
 //TODO::Remove this once we move to a new CORR2 driver
     /// \brief Size of an ARQ block
     B_UINT16                        u16ARQBlockSize;
@@ -496,35 +312,18 @@ typedef struct _stServiceFlowParamSI{
         B_UINT8                                                 bValid; /**<  Validity flag */
         B_UINT8                         u8Padding;       /**<  Padding byte*/
 
-#ifdef BECEEM_TARGET
-/**
-Structure for Convergence SubLayer Types with a maximum of 4 classifiers
-*/
-        CConvergenceSLTypes             cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
-#else
 /**
 Structure for Convergence SubLayer Types with a maximum of 4 classifiers
 */
         stConvergenceSLTypes            cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
-#endif
 
-#ifdef BECEEM_TARGET
-};
-#else
 } stServiceFlowParamSI, *pstServiceFlowParamSI;
 typedef stServiceFlowParamSI CServiceFlowParamSI;
-#endif
 
 /**
 structure stLocalSFAddRequest
 */
 typedef struct _stLocalSFAddRequest{
-#ifdef BECEEM_TARGET
-           _stLocalSFAddRequest( ) :
-                u8Type(0x00),  eConnectionDir(0x00),
-                u16TID(0x0000), u16CID(0x0000),  u16VCID(0x0000)
-                        {}
-#endif
 
         B_UINT8                         u8Type; /**<  Type*/
         B_UINT8      eConnectionDir;            /**<  Connection direction*/
@@ -535,19 +334,9 @@ typedef struct _stLocalSFAddRequest{
         /// \brief 16bitVCID
         B_UINT16                        u16VCID;        /**<  16bit VCID*/
     /// \brief structure ParameterSet
-#ifdef BECEEM_SIGNALLING_INTERFACE_API
-        CServiceFlowParamSI sfParameterSet;
-#endif
 
-#ifdef BECEEM_TARGET
-    CServiceFlowParamSI              *psfParameterSet;
-#else
         stServiceFlowParamSI    *psfParameterSet;       /**<  structure ParameterSet*/
-#endif
 
-#ifdef USING_VXWORKS
-    USE_DATA_MEMORY_MANAGER();
-#endif
 }stLocalSFAddRequest, *pstLocalSFAddRequest;
 
 
@@ -555,12 +344,6 @@ typedef struct _stLocalSFAddRequest{
 structure stLocalSFAddIndication
 */
 typedef struct _stLocalSFAddIndication{
-#ifdef BECEEM_TARGET
-           _stLocalSFAddIndication( ) :
-                u8Type(0x00),  eConnectionDir(0x00),
-                u16TID(0x0000), u16CID(0x0000),  u16VCID(0x0000)
-                        {}
-#endif
 
         B_UINT8                         u8Type; /**<  Type*/
         B_UINT8      eConnectionDir;    /**<  Connection Direction*/
@@ -571,37 +354,19 @@ typedef struct _stLocalSFAddIndication{
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;     /**<  16bitVCID*/
 
-#ifdef  BECEEM_SIGNALLING_INTERFACE_API
-        CServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    CServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    CServiceFlowParamSI              sfActiveSet;
-#endif
 
     /// \brief structure AuthorizedSet
-#ifdef BECEEM_TARGET
-    CServiceFlowParamSI              *psfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    CServiceFlowParamSI              *psfAdmittedSet;
-    /// \brief structure ActiveSet
-    CServiceFlowParamSI              *psfActiveSet;
-#else
     /// \brief structure AuthorizedSet
     stServiceFlowParamSI              *psfAuthorizedSet;        /**<  AuthorizedSet of type stServiceFlowParamSI*/
     /// \brief structure AdmittedSet
     stServiceFlowParamSI              *psfAdmittedSet;  /**<  AdmittedSet of type stServiceFlowParamSI*/
     /// \brief structure ActiveSet
     stServiceFlowParamSI              *psfActiveSet;    /**<  sfActiveSet of type stServiceFlowParamSI*/
-#endif
         B_UINT8                            u8CC;        /**<  Confirmation Code*/
         B_UINT8                            u8Padd;              /**<  8-bit Padding */
 
     B_UINT16               u16Padd;     /**< 16 bit Padding */
 
-#ifdef USING_VXWORKS
-    USE_DATA_MEMORY_MANAGER();
-#endif
 }stLocalSFAddIndication;
 
 
@@ -619,33 +384,17 @@ typedef struct _stLocalSFAddIndication stLocalSFChangeIndication, *pstLocalSFCha
 structure stLocalSFDeleteRequest
 */
 typedef struct _stLocalSFDeleteRequest{
-#ifdef BECEEM_TARGET
-           _stLocalSFDeleteRequest( ) :
-                u8Type(0x00),  u8Padding(0x00),
-                u16TID(0x0000), u32SFID (0x00000000)
-                        {}
-#endif
         B_UINT8                         u8Type;  /**< Type*/
         B_UINT8                         u8Padding;       /**<  Padding byte*/
         B_UINT16                        u16TID;          /**<  TID*/
     /// \brief 32bitSFID
     B_UINT32                        u32SFID;     /**<  SFID*/
-#ifdef USING_VXWORKS
-    USE_DATA_MEMORY_MANAGER();
-#endif
 }stLocalSFDeleteRequest, *pstLocalSFDeleteRequest;
 
 /**
 structure stLocalSFDeleteIndication
 */
 typedef struct stLocalSFDeleteIndication{
-#ifdef BECEEM_TARGET
-           stLocalSFDeleteIndication( ) :
-                u8Type(0x00),  u8Padding(0x00),
-                u16TID(0x0000), u16CID(0x0000),
-                u16VCID(0x0000),u32SFID (0x00000000)
-                        {}
-#endif
         B_UINT8                         u8Type; /**< Type */
         B_UINT8                         u8Padding;      /**< Padding  */
         B_UINT16                        u16TID;                 /**< TID */
@@ -658,9 +407,6 @@ typedef struct stLocalSFDeleteIndication{
         /// \brief 8bit Confirmation code
         B_UINT8                         u8ConfirmationCode;     /**< Confirmation code */
         B_UINT8                         u8Padding1[3];          /**< 3 byte Padding  */
-#ifdef USING_VXWORKS
-    USE_DATA_MEMORY_MANAGER();
-#endif
 }stLocalSFDeleteIndication;
 
 typedef struct _stIM_SFHostNotify
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index 9d4e3aca1b34..1148e5e22eb9 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -22,7 +22,6 @@
 #include <linux/etherdevice.h>
 #include <net/ip.h>
 #include <linux/wait.h>
-#include <linux/notifier.h>
 #include <linux/proc_fs.h>
 #include <linux/interrupt.h>
 
@@ -36,26 +35,10 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <asm/uaccess.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/kthread.h>
-#endif
 #include <linux/tcp.h>
 #include <linux/udp.h>
-#ifndef BCM_SHM_INTERFACE
 #include <linux/usb.h>
-#endif
-#ifdef BECEEM_TARGET
-
-#include <mac_common.h>
-#include <msg_Dsa.h>
-#include <msg_Dsc.h>
-#include <msg_Dsd.h>
-#include <sch_definitions.h>
-using namespace Beceem;
-#ifdef ENABLE_CORRIGENDUM2_UPDATE
-extern B_UINT32 g_u32Corr2MacFlags;
-#endif
-#endif
 
 #include "Typedefs.h"
 #include "Version.h"
@@ -71,39 +54,28 @@ extern B_UINT32 g_u32Corr2MacFlags;
 #include "CmHost.h"
 #include "DDRInit.h"
 #include "Debug.h"
-#include "HostMibs.h"
 #include "IPv6ProtocolHdr.h"
-#include "osal_misc.h"
 #include "PHSModule.h"
 #include "Protocol.h"
 #include "Prototypes.h"
 #include "Queue.h"
 #include "vendorspecificextn.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 #include "InterfaceMacros.h"
 #include "InterfaceAdapter.h"
 #include "InterfaceIsr.h"
-#include "Interfacemain.h"
 #include "InterfaceMisc.h"
 #include "InterfaceRx.h"
 #include "InterfaceTx.h"
-#endif
 #include "InterfaceIdleMode.h"
 #include "InterfaceInit.h"
 
-#ifdef BCM_SHM_INTERFACE
-#include <linux/cpe_config.h>
-
-#ifdef GDMA_INTERFACE
-#include "GdmaInterface.h"
-#include "symphony.h"
-#else
-#include "virtual_interface.h"
-
-#endif
-
-#endif
+#define DRV_NAME        "beceem"
+#define DEV_NAME        "tarang"
+#define DRV_DESCRIPTION "Beceem Communications Inc. WiMAX driver"
+#define DRV_COPYRIGHT   "Copyright 2010. Beceem Communications Inc"
+#define DRV_VERSION     VER_FILEVERSION_STR
+#define PFX             DRV_NAME " "
 
 #endif
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index e9da513b3c24..c13ea5c9a2aa 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -10,12 +10,8 @@
  */
 #include "headers.h"
 
-INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
-                                                  PVOID ioBuffer,
-                                                  ULONG inputBufferLength)
+INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)
 {
-
-        S_MIBS_HOST_STATS_MIBS *pstHostMibs         = NULL;
         S_SERVICEFLOW_ENTRY    *pstServiceFlowEntry = NULL;
         S_PHS_RULE             *pstPhsRule          = NULL;
         S_CLASSIFIER_TABLE     *pstClassifierTable  = NULL;
@@ -30,15 +26,6 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
                 return STATUS_FAILURE;
         }
 
-        if(ioBuffer == NULL)
-        {
-                return -EINVAL;
-        }
-        memset(ioBuffer,0,sizeof(S_MIBS_HOST_STATS_MIBS));
-
-        pstHostMibs = (S_MIBS_HOST_STATS_MIBS *)ioBuffer;
-
-
         //Copy the classifier Table
         for(nClassifierIndex=0; nClassifierIndex < MAX_CLASSIFIERS;
                         nClassifierIndex++)
@@ -54,7 +41,7 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
         {
         if(Adapter->PackInfo[nSfIndex].bValid)
         {
-                        OsalMemMove((PVOID)&pstHostMibs->astSFtable[nSfIndex],(PVOID)&Adapter->PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE));
+                        memcpy((PVOID)&pstHostMibs->astSFtable[nSfIndex],(PVOID)&Adapter->PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE));
         }
         else
         {
@@ -83,7 +70,7 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
 
                         pstHostMibs->astPhsRulesTable[nPhsTableIndex].ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
 
-                        OsalMemMove(&pstHostMibs->astPhsRulesTable[nPhsTableIndex].u8PHSI,
+                        memcpy(&pstHostMibs->astPhsRulesTable[nPhsTableIndex].u8PHSI,
                                                 &pstPhsRule->u8PHSI,
                                                 sizeof(S_PHS_RULE));
                                 nPhsTableIndex++;
@@ -95,12 +82,9 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
         }
 
 
-
         //copy other Host Statistics parameters
-        pstHostMibs->stHostInfo.GoodTransmits =
-                                atomic_read(&Adapter->TxTotalPacketCount);
-        pstHostMibs->stHostInfo.GoodReceives =
-                                atomic_read(&Adapter->GoodRxPktCount);
+        pstHostMibs->stHostInfo.GoodTransmits = Adapter->dev->stats.tx_packets;
+        pstHostMibs->stHostInfo.GoodReceives = Adapter->dev->stats.rx_packets;
         pstHostMibs->stHostInfo.CurrNumFreeDesc =
                         atomic_read(&Adapter->CurrNumFreeTxDesc);
         pstHostMibs->stHostInfo.BEBucketSize = Adapter->BEBucketSize;
@@ -115,13 +99,10 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter,
 }
 
 
-INT GetDroppedAppCntrlPktMibs(PVOID ioBuffer, PPER_TARANG_DATA pTarang)
+VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_TARANG_DATA pTarang)
 {
-        S_MIBS_HOST_STATS_MIBS *pstHostMibs = (S_MIBS_HOST_STATS_MIBS *)ioBuffer;
-
-        memcpy((PVOID)&(pstHostMibs->stDroppedAppCntrlMsgs),(PVOID)&(pTarang->stDroppedAppCntrlMsgs),sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
-
-        return STATUS_SUCCESS ;
+        memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),
+               &(pTarang->stDroppedAppCntrlMsgs),sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
 }
 
 
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 97adaae7dfc0..16e939fa15d6 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -108,52 +108,16 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
         ulong timeout = 0;
 
         /*Read initial value of packets sent/received */
-        Initial_num_of_packts_tx = atomic_read(&Adapter->TxTotalPacketCount);
-        Initial_num_of_packts_rx = atomic_read(&Adapter->GoodRxPktCount);
+        Initial_num_of_packts_tx = Adapter->dev->stats.tx_packets;
+        Initial_num_of_packts_rx = Adapter->dev->stats.rx_packets;
+
         /*Scale the rate of transfer to no of blinks.*/
         num_of_time_tx= ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
         num_of_time_rx= ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
 
         while((Adapter->device_removed == FALSE))
         {
-                #if 0
-                if(0 == num_of_time_tx && 0 == num_of_time_rx)
-                {
-                        timeout = 1000;
-                        Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
-                                currdriverstate!= Adapter->DriverState || kthread_should_stop(),
-                                msecs_to_jiffies (timeout));
-                        if(kthread_should_stop())
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
-                                Adapter->LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;
-                                return EVENT_SIGNALED;
-                        }
-                        if(Status)
-                                return EVENT_SIGNALED;
-
-                }
-                #endif
-
                 timeout = 50;
-                #if 0
-                /*Turn on LED if Tx is high bandwidth*/
-                if(num_of_time_tx > MAX_NUM_OF_BLINKS)
-                {
-                        TURN_ON_LED(1<<GPIO_Num_tx, uiTxLedIndex);
-                        num_of_time_tx = 0;
-                        bBlinkBothLED = FALSE;
-                        num_of_time = num_of_time_rx;
-                }
-                        /*Turn on LED if Rx is high bandwidth*/
-                if(num_of_time_rx > MAX_NUM_OF_BLINKS)
-                {
-                        TURN_ON_LED(1<<GPIO_Num_rx, uiRxLedIndex);
-                        num_of_time_rx = 0;
-                        bBlinkBothLED = FALSE;
-                        num_of_time = num_of_time_tx;
-                }
-                #endif
                 /*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/
                 if(bBlinkBothLED)
                 {
@@ -249,9 +213,10 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
                  * Read the Tx & Rx packets transmission after 1 second and
                  * calculate rate of transfer
                  */
-                Final_num_of_packts_tx = atomic_read(&Adapter->TxTotalPacketCount);
+                Final_num_of_packts_tx = Adapter->dev->stats.tx_packets;
+                Final_num_of_packts_rx = Adapter->dev->stats.rx_packets;
+
                 rate_of_transfer_tx = Final_num_of_packts_tx - Initial_num_of_packts_tx;
-                Final_num_of_packts_rx = atomic_read(&Adapter->GoodRxPktCount);
                 rate_of_transfer_rx = Final_num_of_packts_rx - Initial_num_of_packts_rx;
 
                 /*Read initial value of packets sent/received */
@@ -293,7 +258,7 @@ static INT ValidateDSDParamsChecksum(
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",ulParamOffset, usParamLen);
 
-        puBuffer = OsalMemAlloc(usParamLen,"!MEM");
+        puBuffer = kmalloc(usParamLen, GFP_KERNEL);
         if(!puBuffer)
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum Allocation failed");
@@ -341,10 +306,7 @@ static INT ValidateDSDParamsChecksum(
         }
 
 exit:
-        if(puBuffer)
-        {
-                OsalMemFree(puBuffer, usParamLen);
-        }
+        kfree(puBuffer);
         return Status;
 }
 
@@ -497,12 +459,10 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
 {
         int Status = STATUS_SUCCESS;
         UCHAR GPIO_Array[NUM_OF_LEDS+1]; /*Array to store GPIO numbers from EEPROM*/
-#ifndef BCM_SHM_INTERFACE
         UINT uiIndex = 0;
         UINT uiNum_of_LED_Type = 0;
         PUCHAR puCFGData        = NULL;
         UCHAR bData = 0;
-#endif
         memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
 
         if(!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams))
@@ -524,10 +484,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
                 *bEnableThread = FALSE;
                 return Status;
         }
-#ifdef BCM_SHM_INTERFACE
-        *bEnableThread = FALSE;
-        return Status ;
-#else
   /*
      * CONFIG file read successfully. Deallocate the memory of
      * uiFileNameBufferSize
@@ -578,23 +534,7 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
         }
         if(uiNum_of_LED_Type >= NUM_OF_LEDS)
                 *bEnableThread = FALSE;
-#endif
 
-#if 0
-        for(uiIndex=0; uiIndex<NUM_OF_LEDS; uiIndex++)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Type = %x\n", uiIndex,
-                        Adapter->LEDInfo.LEDState[uiIndex].LED_Type);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_On_State = %x\n", uiIndex,
-                        Adapter->LEDInfo.LEDState[uiIndex].LED_On_State);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Blink_State = %x\n", uiIndex,
-                        Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State);
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].GPIO_Num = %x\n", uiIndex,
-                        Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num);
-        }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Polarity = %d\n",
-                        Adapter->LEDInfo.BitPolarty);
-#endif
         return Status;
 }
 //--------------------------------------------------------------------------
@@ -721,20 +661,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                         TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
                         return ;//STATUS_FAILURE;
                 }
-        #if 0
-                if(Adapter->device_removed)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"Device removed hence exiting from Led Thread..");
-                        return ; //-ENODEV;
-                }
-        #endif
-                #if 0
-                if((GPIO_num != DISABLE_GPIO_NUM) &&
-                        ((currdriverstate != FW_DOWNLOAD) &&
-                        (currdriverstate != NORMAL_OPERATION) &&
-                        (currdriverstate != IDLEMODE_EXIT)))
-                        TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
-                #endif
 
                 if(GPIO_num != DISABLE_GPIO_NUM)
                 {
@@ -752,10 +678,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                         case DRIVER_INIT:
                         {
                                 currdriverstate = DRIVER_INIT;//Adapter->DriverState;
-        #if 0
-                                LedGpioInit(Adapter);
-                                Adapter->LEDInfo.bLedInitDone = TRUE;
-        #endif
                                 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate);
 
                                 if(GPIO_num  != DISABLE_GPIO_NUM)
@@ -768,13 +690,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                         {
                                 //BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n");
                                 currdriverstate = FW_DOWNLOAD;
-                        #if 0
-                                if(Adapter->LEDInfo.bLedInitDone == FALSE)
-                                {
-                                        LedGpioInit(Adapter);
-                                        Adapter->LEDInfo.bLedInitDone = TRUE;
-                                }
-                        #endif
                                 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,  &uiLedIndex, &dummyIndex, currdriverstate);
 
                                 if(GPIO_num != DISABLE_GPIO_NUM)
@@ -796,12 +711,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                         break;
 
                         case SHUTDOWN_EXIT:
-                        #if 0
-                        if(Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN)
-                        {
-                                LedGpioInit(Adapter);
-                        }
-                        #endif
                         //no break, continue to NO_NETWORK_ENTRY state as well.
 
                         case NO_NETWORK_ENTRY:
@@ -875,34 +784,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                         break;
                         case IDLEMODE_EXIT:
                         {
-#if 0
-                                UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
-                                UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
-                                UCHAR uiTxLedIndex = 0;
-                                UCHAR uiRxLedIndex = 0;
-
-                                currdriverstate  = IDLEMODE_EXIT;
-                                if(DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN == Adapter->ulPowerSaveMode)
-                                {
-                                        LedGpioInit(Adapter);
-                                }
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx, &GPIO_num_rx, &uiTxLedIndex,&uiRxLedIndex,currdriverstate);
-
-                                Adapter->LEDInfo.bIdle_led_off =  FALSE;
-
-                                if((GPIO_num_tx == DISABLE_GPIO_NUM) && (GPIO_num_rx == DISABLE_GPIO_NUM))
-                                {
-                                        GPIO_num = DISABLE_GPIO_NUM ;
-                                }
-                                else
-                                {
-                                        timeout = 50;
-                                        if(Adapter->LEDInfo.bIdleMode_tx_from_host)
-                                                LED_Blink(Adapter, 1<<GPIO_num_tx, uiTxLedIndex, timeout, -1,currdriverstate);
-                                        else
-                                                LED_Blink(Adapter, 1<<GPIO_num_rx, uiRxLedIndex, timeout, -1,currdriverstate);
-                                }
-#endif
                         }
                         break;
                         case DRIVER_HALT:
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 41c9ab8a2385..c7292373a65f 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1,6 +1,56 @@
 #include "headers.h"
 
 #define DWORD unsigned int
+
+static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset);
+static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter);
+static INT BcmGetActiveISO(PMINI_ADAPTER Adapter);
+static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
+static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter);
+static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize);
+
+static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter);
+static INT BcmGetNvmSize(PMINI_ADAPTER Adapter);
+static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter);
+static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
+
+static INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+
+static B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset);
+static INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section);
+static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section);
+
+static INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd);
+static INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd);
+static INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso);
+static INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso);
+
+static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
+static INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiSectAlignAddr);
+static INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, PUINT pBuff,
+                                          FLASH2X_SECTION_VAL eFlash2xSectionVal,
+                                          UINT uiOffset, UINT uiNumBytes);
+static FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter);
+static FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter);
+
+static INT BeceemFlashBulkRead(
+        PMINI_ADAPTER Adapter,
+        PUINT pBuffer,
+        UINT uiOffset,
+        UINT uiNumBytes);
+
+static INT BeceemFlashBulkWrite(
+        PMINI_ADAPTER Adapter,
+        PUINT pBuffer,
+        UINT uiOffset,
+        UINT uiNumBytes,
+        BOOLEAN bVerify);
+
+static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter);
+
+static INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData, UINT dwNumData);
+
 // Procedure:   ReadEEPROMStatusRegister
 //
 // Description: Reads the standard EEPROM Status Register.
@@ -228,213 +278,27 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
                 ReadBeceemEEPROMBulk(Adapter, uiTempOffset + MAX_RW_SIZE, (PUINT)&uiData[4], 4);
         }
 
-        OsalMemMove( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4);
+        memcpy( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4);
 
         return STATUS_SUCCESS;
 } /* ReadBeceemEEPROM() */
 
 
-#if 0
-//-----------------------------------------------------------------------------
-// Procedure:   IsEEPROMWriteDone
-//
-// Description: Reads the SPI status to see the status of previous write.
-//
-// Arguments:
-//              Adapter    - ptr to Adapter object instance
-//
-// Returns:
-//              BOOLEAN - TRUE  - write went through
-//              - FALSE - Write Failed.
-//-----------------------------------------------------------------------------
-
-BOOLEAN IsEEPROMWriteDone(PMINI_ADAPTER Adapter)
-{
-        UINT uiRetries = 16;
-        //UINT uiStatus  = 0;
-        UINT value;
-
-        //sleep for 1.2ms ..worst case EEPROM write can take up to 1.2ms.
-        mdelay(2);
-
-        value = 0;
-        rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-
-        while(((value >> 14) & 1) == 1)
-        {
-                // EEPROM_SPI_Q_STATUS1_REG will be cleared only if write back to that.
-                value = (0x1 << 14);
-                wrmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
-                udelay(1000);
-                uiRetries--;
-                if(uiRetries == 0)
-                {
-                        return FALSE;
-                }
-                value = 0;
-                rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-        }
-        return TRUE;
-
-
-}
-
-
-//-----------------------------------------------------------------------------
-// Procedure:   ReadBeceemEEPROMBulk
-//
-// Description: This routine reads 16Byte data from EEPROM
-//
-// Arguments:
-//              Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//              OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-        DWORD dwRetries = 16;
-        DWORD dwIndex = 0;
-        UINT value, tmpVal;
-
-
-        value = 0;
-        rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-
-        //read 0x0f003020 untill  bit 1 of 0x0f003008 is set.
-        while(((value >> 1) & 1) == 0)
-        {
-
-                rdmalt (Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-                dwRetries--;
-                if(dwRetries == 0)
-                {
-                        return -1;
-                }
-                value = 0;
-                rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-        }
-
-        value = dwAddress | 0xfb000000;
-        wrmalt (Adapter, 0x0f003018, &value, sizeof(value));
-
-        udelay(1000);
-        value = 0;
-        for(dwIndex = 0;dwIndex < 4 ; dwIndex++)
-        {
-                value = 0;
-                rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-                pdwData[dwIndex] = value;
-
-                value = 0;
-                rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-                pdwData[dwIndex] |= (value << 8);
-
-                value = 0;
-                rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-                pdwData[dwIndex] |= (value << 16);
-
-                value = 0;
-                rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-                pdwData[dwIndex] |= (value << 24);
-
-        }
-        return 0;
-}
-
-//-----------------------------------------------------------------------------
-// Procedure:   ReadBeceemEEPROM
-//
-// Description: This routine reads 4Byte data from EEPROM
-//
-// Arguments:
-//              Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//              OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-
-        DWORD dwReadValue = 0;
-        DWORD dwRetries = 16, dwCompleteWord = 0;
-        UINT    value, tmpVal;
-
-        rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-        while (((value >> 1) & 1) == 0) {
-                rdmalt(Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-
-                if (dwRetries == 0) {
-                        return -1;
-                }
-                rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-        }
-
-
-        //wrm (0x0f003018, 0xNbXXXXXX)      // N is the number of bytes u want to read  (0 means 1, f means 16,   b is the opcode for page read)
-        //     Follow it up by N executions of  rdm(0x0f003020) to read the rxed bytes from rx queue.
-        dwAddress |= 0x3b000000;
-        wrmalt(Adapter, 0x0f003018,&dwAddress,4);
-        mdelay(10);
-        rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-        dwCompleteWord=dwReadValue;
-        rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-        dwCompleteWord|=(dwReadValue<<8);
-        rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-        dwCompleteWord|=(dwReadValue<<16);
-        rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-        dwCompleteWord|=(dwReadValue<<24);
-
-        *pdwData = dwCompleteWord;
-
-        return 0;
-}
-#endif
 
 INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
 {
-        INT Status=0, i;
-        unsigned char puMacAddr[6] = {0};
-        INT AllZeroMac = 0;
-        INT AllFFMac = 0;
+        INT Status;
+        unsigned char puMacAddr[6];
 
         Status = BeceemNVMRead(Adapter,
                         (PUINT)&puMacAddr[0],
                         INIT_PARAMS_1_MACADDRESS_ADDRESS,
                         MAC_ADDRESS_SIZE);
 
-        if(Status != STATUS_SUCCESS)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Error in Reading the mac Addres with status :%d", Status);
-                return Status;
-        }
-
-        memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Modem MAC Addr :");
-    BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_PRINTK, 0, DBG_LVL_ALL,&Adapter->dev->dev_addr[0],MAC_ADDRESS_SIZE);
-        for(i=0;i<MAC_ADDRESS_SIZE;i++)
-        {
-
-                if(Adapter->dev->dev_addr[i] == 0x00)
-                        AllZeroMac++;
-                if(Adapter->dev->dev_addr[i] == 0xFF)
-                        AllFFMac++;
-
-        }
-        //BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\n");
-        if(AllZeroMac == MAC_ADDRESS_SIZE)
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Warning :: MAC Address has all 00's");
-        if(AllFFMac == MAC_ADDRESS_SIZE)
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Warning :: MAC Address has all FF's");
+        if(Status == STATUS_SUCCESS)
+                memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
 
         return Status;
-
 }
 
 //-----------------------------------------------------------------------------
@@ -476,7 +340,7 @@ INT BeceemEEPROMBulkRead(
                 ReadBeceemEEPROMBulk(Adapter,uiTempOffset,(PUINT)&uiData[0],4);
                 if(uiBytesRemaining >= (MAX_RW_SIZE - uiExtraBytes))
                 {
-                        OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes);
+                        memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes);
 
                         uiBytesRemaining -= (MAX_RW_SIZE - uiExtraBytes);
                         uiIndex += (MAX_RW_SIZE - uiExtraBytes);
@@ -484,7 +348,7 @@ INT BeceemEEPROMBulkRead(
                 }
                 else
                 {
-                        OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining);
+                        memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining);
                         uiIndex += uiBytesRemaining;
                         uiOffset += uiBytesRemaining;
                         uiBytesRemaining = 0;
@@ -508,7 +372,7 @@ INT BeceemEEPROMBulkRead(
                          * We read 4 Dwords of data */
                         if(0 == ReadBeceemEEPROMBulk(Adapter,uiOffset,&uiData[0],4))
                         {
-                                OsalMemMove(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE);
+                                memcpy(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE);
                                 uiOffset += MAX_RW_SIZE;
                                 uiBytesRemaining -= MAX_RW_SIZE;
                                 uiIndex += MAX_RW_SIZE;
@@ -523,7 +387,7 @@ INT BeceemEEPROMBulkRead(
                 {
                         if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
                         {
-                                OsalMemMove(pcBuff+uiIndex,&uiData[0],4);
+                                memcpy(pcBuff+uiIndex,&uiData[0],4);
                                 uiOffset += 4;
                                 uiBytesRemaining -= 4;
                                 uiIndex +=4;
@@ -540,7 +404,7 @@ INT BeceemEEPROMBulkRead(
                         pCharBuff += uiIndex;
                         if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
                         {
-                                OsalMemMove(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested.
+                                memcpy(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested.
                                 uiBytesRemaining = 0;
                         }
                         else
@@ -571,7 +435,7 @@ INT BeceemEEPROMBulkRead(
 //              <FAILURE>                       - if failed.
 //-----------------------------------------------------------------------------
 
-INT BeceemFlashBulkRead(
+static INT BeceemFlashBulkRead(
         PMINI_ADAPTER Adapter,
         PUINT pBuffer,
         UINT uiOffset,
@@ -653,16 +517,8 @@ INT BeceemFlashBulkRead(
 //
 //-----------------------------------------------------------------------------
 
-UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
+static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
 {
-#if 0
-        if(Adapter->bDDRInitDone)
-        {
-                return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT|FLASH_SIZE_ADDR);
-        }
-
-        return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT|FLASH_SIZE_ADDR);
-#endif
         if(IsFlash2x(Adapter))
                 return  (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
         else
@@ -684,7 +540,7 @@ UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
 //
 //-----------------------------------------------------------------------------
 
-UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
+static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
 {
         UINT uiData = 0;
         UINT uiIndex = 0;
@@ -733,60 +589,6 @@ UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
         return 0;
 }
 
-#if 0
-/***********************************************************************************/
-//
-//  WriteBeceemEEPROM: Writes 4 byte data to EEPROM offset.
-//
-//                     uiEEPROMOffset - Offset to be written to.
-//                     uiData         - Data to be written.
-//
-/***********************************************************************************/
-
-INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData)
-{
-        INT Status = 0;
-        ULONG ulRdBk = 0;
-        ULONG ulRetryCount = 3;
-        UINT value;
-
-        if(uiEEPROMOffset > EEPROM_END)
-        {
-
-                return -1;
-        }
-
-        uiData = htonl(uiData);
-        while(ulRetryCount--)
-        {
-                value = 0x06000000;
-                wrmalt(Adapter, 0x0F003018,&value, sizeof(value));//flush the EEPROM FIFO.
-                wrmalt(Adapter, 0x0F00301C,&uiData, sizeof(uiData));
-                value = 0x3A000000 | uiEEPROMOffset;
-                wrmalt(Adapter, 0x0F003018,&value, sizeof(value));
-                __udelay(100000);
-                //read back and verify.
-                Status = ReadBeceemEEPROM(Adapter,uiEEPROMOffset,(UINT *)&ulRdBk);
-                if(Status == 0)
-                {
-                        if(ulRdBk == uiData)
-                        {
-                                return Status;
-                        }
-                        else
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback does not match\n");
-                        }
-                }
-                else
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback failed\n");
-                }
-        }
-
-        return 0;
-}
-#endif
 
 //-----------------------------------------------------------------------------
 // Procedure:   FlashSectorErase
@@ -973,7 +775,7 @@ static INT flashWrite(
 // need not write 0xFFFFFFFF because write requires an erase and erase will
 // make whole sector 0xFFFFFFFF.
 //
-        if (!OsalMemCompare(pData, uiErasePattern, MAX_RW_SIZE))
+        if (!memcmp(pData, uiErasePattern, MAX_RW_SIZE))
         {
                 return 0;
         }
@@ -1138,7 +940,7 @@ static INT flashWriteStatus(
 // need not write 0xFFFFFFFF because write requires an erase and erase will
 // make whole sector 0xFFFFFFFF.
 //
-        if (!OsalMemCompare(pData,uiErasePattern,MAX_RW_SIZE))
+        if (!memcmp(pData,uiErasePattern,MAX_RW_SIZE))
         {
                 return 0;
         }
@@ -1332,7 +1134,7 @@ static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter,UINT uiOffset, UINT ui
 //
 //-----------------------------------------------------------------------------
 
-INT BeceemFlashBulkWrite(
+static INT BeceemFlashBulkWrite(
         PMINI_ADAPTER Adapter,
         PUINT pBuffer,
         UINT uiOffset,
@@ -1353,15 +1155,6 @@ INT BeceemFlashBulkWrite(
         UINT uiTemp                             = 0;
         UINT index                                      = 0;
         UINT uiPartOffset                       = 0;
-        #if 0
-        struct timeval tv1 = {0};
-        struct timeval tv2 = {0};
-
-        struct timeval tr = {0};
-        struct timeval te = {0};
-        struct timeval tw = {0};
-        struct timeval twv = {0};
-        #endif
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
   Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
@@ -1377,12 +1170,9 @@ INT BeceemFlashBulkWrite(
         uiCurrSectOffsetAddr    = uiOffset & (Adapter->uiSectorSize - 1);
         uiSectBoundary                  = uiSectAlignAddr + Adapter->uiSectorSize;
 
-        //pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN');
-        pTempBuff = OsalMemAlloc(Adapter->uiSectorSize ,"!MVN");
+        pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
         if(NULL == pTempBuff)
-        {
                 goto BeceemFlashBulkWrite_EXIT;
-        }
 //
 // check if the data to be written is overlapped accross sectors
 //
@@ -1399,7 +1189,6 @@ INT BeceemFlashBulkWrite(
                         uiNumSectTobeRead++;
                 }
         }
-        #if 1
         //Check whether Requested sector is writable or not in case of flash2x write. But if  write call is
         // for DSD calibration, allow it without checking of sector permission
 
@@ -1420,7 +1209,6 @@ INT BeceemFlashBulkWrite(
                          index = index + 1 ;
                 }
         }
-        #endif
         Adapter->SelectedChip = RESET_CHIP_SELECT;
         while(uiNumSectTobeRead)
         {
@@ -1448,13 +1236,13 @@ INT BeceemFlashBulkWrite(
                 if(uiNumSectTobeRead > 1)
                 {
 
-                        OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
+                        memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                         pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
                         uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                 }
                 else
                 {
-                                OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
+                                memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
                 }
 
                 if(IsFlash2x(Adapter))
@@ -1503,7 +1291,7 @@ INT BeceemFlashBulkWrite(
                                 }
                                 else
                                 {
-                                        if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
+                                        if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
                                         {
                                                 if(STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter,uiPartOffset+uiIndex,&pTempBuff[uiIndex]))
                                                 {
@@ -1541,10 +1329,8 @@ BeceemFlashBulkWrite_EXIT:
         {
                 BcmRestoreBlockProtectStatus(Adapter,ulStatus);
         }
-        if(pTempBuff)
-        {
-                OsalMemFree(pTempBuff,Adapter->uiSectorSize);
-        }
+        
+        kfree(pTempBuff);
 
         Adapter->SelectedChip = RESET_CHIP_SELECT;
         return Status;
@@ -1599,14 +1385,10 @@ static INT BeceemFlashBulkWriteStatus(
         uiCurrSectOffsetAddr    = uiOffset & (Adapter->uiSectorSize - 1);
         uiSectBoundary                  = uiSectAlignAddr + Adapter->uiSectorSize;
 
-
-
-//      pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN');
-        pTempBuff = OsalMemAlloc(Adapter->uiSectorSize,"!MVN");
+        pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
         if(NULL == pTempBuff)
-        {
                 goto BeceemFlashBulkWriteStatus_EXIT;
-        }
+
 //
 // check if the data to be written is overlapped accross sectors
 //
@@ -1662,13 +1444,13 @@ static INT BeceemFlashBulkWriteStatus(
                 if(uiNumSectTobeRead > 1)
                 {
 
-                        OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
+                        memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                         pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
                         uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
                 }
                 else
                 {
-                        OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
+                        memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
                 }
 
                 if(IsFlash2x(Adapter))
@@ -1698,25 +1480,10 @@ static INT BeceemFlashBulkWriteStatus(
                 {
                         for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE)
                         {
-#if 0
-                                if(0 == BeceemFlashBulkRead(Adapter,uiReadBk,uiOffsetFromSectStart+uiIndex + Adapter->ulFlashCalStart ,MAX_RW_SIZE))
-                                {
-                                        for(uiReadIndex = 0;uiReadIndex < 4; uiReadIndex++)
-                                        {
-                                                if(*((PUINT)&pTempBuff[uiIndex+uiReadIndex*4]) != uiReadBk[uiReadIndex])
-                                                {
-                                                        Status = -1;
-                                                        goto BeceemFlashBulkWriteStatus_EXIT;
-
-                                                }
-                                        }
-
-                                }
-#endif
 
                                 if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE))
                                 {
-                                        if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
+                                        if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
                                         {
                                                 Status = STATUS_FAILURE;
                                                 goto BeceemFlashBulkWriteStatus_EXIT;
@@ -1747,10 +1514,8 @@ BeceemFlashBulkWriteStatus_EXIT:
         {
                 BcmRestoreBlockProtectStatus(Adapter,ulStatus);
         }
-        if(pTempBuff)
-        {
-                OsalMemFree(pTempBuff,Adapter->uiSectorSize);
-        }
+
+        kfree(pTempBuff);
         Adapter->SelectedChip = RESET_CHIP_SELECT;
         return Status;
 
@@ -1771,7 +1536,7 @@ BeceemFlashBulkWriteStatus_EXIT:
 
 INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
 {
-        PCHAR pBuff = OsalMemAlloc(BUFFER_4K,"3MVN");
+        PCHAR pBuff = kmalloc(BUFFER_4K, GFP_KERNEL);
         UINT uiEepromSize = 0;
         UINT uiIndex = 0;
         UINT uiBytesToCopy = 0;
@@ -1787,14 +1552,14 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
         if(0 != BeceemEEPROMBulkRead(Adapter,&uiEepromSize,EEPROM_SIZE_OFFSET,4))
         {
 
-                OsalMemFree(pBuff,BUFFER_4K);
+                kfree(pBuff);
                 return -1;
         }
 
         uiEepromSize >>= 16;
         if(uiEepromSize > 1024*1024)
         {
-                OsalMemFree(pBuff,BUFFER_4K);
+                kfree(pBuff);
                 return -1;
         }
 
@@ -1820,7 +1585,7 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
         wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-4,&value, sizeof(value));
         value = 0xbeadbead;
         wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-8,&value, sizeof(value));
-        OsalMemFree(pBuff,MAX_RW_SIZE);
+        kfree(pBuff);
 
         return Status;
 
@@ -1873,16 +1638,13 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
                 return -1;
         }
 
-        pBuff = OsalMemAlloc(uiEepromSize, 0);
-
+        pBuff = kmalloc(uiEepromSize, GFP_KERNEL);
         if ( pBuff == NULL )
-        {
                 return -1;
-        }
 
         if(0 != BeceemNVMRead(Adapter,(PUINT)pBuff,uiCalStartAddr, uiEepromSize))
         {
-                OsalMemFree(pBuff, 0);
+                kfree(pBuff);
                 return -1;
         }
 
@@ -1905,7 +1667,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
                 uiBytesToCopy = MIN(BUFFER_4K,uiEepromSize);
         }
 
-        OsalMemFree(pBuff, 0);
+        kfree(pBuff);
         return Status;
 
 }
@@ -1947,14 +1709,14 @@ static INT BeceemEEPROMReadBackandVerify(
                 {// for the requests more than or equal to MAX_RW_SIZE bytes, use bulk read function to make the access faster.
                         BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
 
-                        if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
+                        if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
                         {
                                 // re-write
                                 BeceemEEPROMBulkWrite(Adapter,(PUCHAR)(pBuffer+uiIndex),uiOffset,MAX_RW_SIZE,FALSE);
                                 mdelay(3);
                                 BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
 
-                                if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
+                                if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
                                 {
                                         return -1;
                                 }
@@ -1986,7 +1748,7 @@ static INT BeceemEEPROMReadBackandVerify(
                 else
                 { // Handle the reads less than 4 bytes...
                         uiData = 0;
-                        OsalMemMove(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes);
+                        memcpy(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes);
                         BeceemEEPROMBulkRead(Adapter,&uiRdbk,uiOffset,4);
 
                         if(memcmp(&uiData, &uiRdbk, uiNumBytes))
@@ -2186,7 +1948,7 @@ INT BeceemEEPROMBulkWrite(
 
                 if(uiBytesToCopy >= (16 -uiExtraBytes))
                 {
-                        OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
+                        memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
 
                         if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
                                         return STATUS_FAILURE;
@@ -2197,7 +1959,7 @@ INT BeceemEEPROMBulkWrite(
                 }
                 else
                 {
-                        OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
+                        memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
 
                         if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
                                         return STATUS_FAILURE;
@@ -2233,7 +1995,7 @@ INT BeceemEEPROMBulkWrite(
         // To program non 16byte aligned data, read 16byte and then update.
         //
                         BeceemEEPROMBulkRead(Adapter,&uiData[0],uiOffset,16);
-                        OsalMemMove(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
+                        memcpy(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
 
 
                         if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiOffset ) )
@@ -2535,7 +2297,7 @@ INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize)
 //
 //-----------------------------------------------------------------------------
 
-UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize)
+static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize)
 {
         UINT uiSectorSize = 0;
         UINT uiSectorSig = 0;
@@ -2642,20 +2404,8 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
 
 INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
 {
-#ifdef BCM_SHM_INTERFACE
-#ifdef FLASH_DIRECT_ACCESS
-        unsigned int data,data1,data2 = 1;
-        wrm(ps_adapter, PAD_SELECT_REGISTER, &data2, 4);
-        data1 = rdm(ps_adapter,SYS_CFG,&data,4);
-        data1 = rdm(ps_adapter,SYS_CFG,&data,4);
-        data2 = (data | 0x80 | 0x8000);
-        wrm(ps_adapter,SYS_CFG, &data2,4); // over-write as Flash boot mode
-#endif
-        ps_adapter->eNVMType = NVM_FLASH;
-#else
         BcmValidateNvmType(ps_adapter);
         BcmInitEEPROMQueues(ps_adapter);
-#endif
 
         if(ps_adapter->eNVMType == NVM_AUTODETECT)
         {
@@ -2684,7 +2434,7 @@ INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
 */
 /***************************************************************************/
 
-INT BcmGetNvmSize(PMINI_ADAPTER Adapter)
+static INT BcmGetNvmSize(PMINI_ADAPTER Adapter)
 {
         if(Adapter->eNVMType == NVM_EEPROM)
         {
@@ -2708,7 +2458,7 @@ INT BcmGetNvmSize(PMINI_ADAPTER Adapter)
 // Returns:
 //              <VOID>
 //-----------------------------------------------------------------------------
-VOID BcmValidateNvmType(PMINI_ADAPTER Adapter)
+static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter)
 {
 
         //
@@ -2775,7 +2525,7 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
         if(psAdapter->psFlash2xCSInfo == NULL)
         {
                 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate memory for Flash 2.x");
-                bcm_kfree(psAdapter->psFlashCSInfo);
+                kfree(psAdapter->psFlashCSInfo);
                 return -ENOMEM;
         }
 
@@ -2783,8 +2533,8 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
         if(psAdapter->psFlash2xVendorInfo == NULL)
         {
                 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate Vendor Info Memory for Flash 2.x");
-                bcm_kfree(psAdapter->psFlashCSInfo);
-                bcm_kfree(psAdapter->psFlash2xCSInfo);
+                kfree(psAdapter->psFlashCSInfo);
+                kfree(psAdapter->psFlash2xCSInfo);
                 return -ENOMEM;
         }
 
@@ -2798,9 +2548,9 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
                 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0," Adapter structure point is NULL");
                 return -EINVAL;
         }
-        bcm_kfree(psAdapter->psFlashCSInfo);
-        bcm_kfree(psAdapter->psFlash2xCSInfo);
-        bcm_kfree(psAdapter->psFlash2xVendorInfo);
+        kfree(psAdapter->psFlashCSInfo);
+        kfree(psAdapter->psFlash2xCSInfo);
+        kfree(psAdapter->psFlash2xVendorInfo);
         return STATUS_SUCCESS ;
 }
 
@@ -2954,7 +2704,7 @@ static INT	ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
         return STATUS_SUCCESS;
 }
 
-INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
+static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {
         return ( Adapter->uiVendorExtnFlag &&
                 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
@@ -3052,7 +2802,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
 //              <VOID>
 //-----------------------------------------------------------------------------
 
-INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
+static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 {
         //FLASH_CS_INFO sFlashCsInfo = {0};
 
@@ -3070,7 +2820,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
         memset(Adapter->psFlashCSInfo, 0 ,sizeof(FLASH_CS_INFO));
         memset(Adapter->psFlash2xCSInfo, 0 ,sizeof(FLASH2X_CS_INFO));
 
-#ifndef BCM_SHM_INTERFACE
         if(!Adapter->bDDRInitDone)
         {
                 {
@@ -3079,7 +2828,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
                 }
         }
 
-#endif
 
         // Reading first 8 Bytes to get the Flash Layout
         // MagicNumber(4 bytes) +FlashLayoutMinorVersion(2 Bytes) +FlashLayoutMajorVersion(2 Bytes)
@@ -3147,9 +2895,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
                         return STATUS_FAILURE;
                 }
                 ConvertEndianOf2XCSStructure(Adapter->psFlash2xCSInfo);
-#ifndef BCM_SHM_INTERFACE
                 BcmDumpFlash2XCSStructure(Adapter->psFlash2xCSInfo,Adapter);
-#endif
                 if((FLASH_CONTROL_STRUCT_SIGNATURE == Adapter->psFlash2xCSInfo->MagicNumber) &&
                    (SCSI_FIRMWARE_MINOR_VERSION <= MINOR_VERSION(Adapter->psFlash2xCSInfo->SCSIFirmwareVersion)) &&
                    (FLASH_SECTOR_SIZE_SIG == Adapter->psFlash2xCSInfo->FlashSectorSizeSig) &&
@@ -3181,21 +2927,10 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
         Concerns: what if CS sector size does not match with this sector size ???
         what is the indication of AccessBitMap  in CS in flash 2.x ????
         */
-#ifndef BCM_SHM_INTERFACE
         Adapter->ulFlashID = BcmReadFlashRDID(Adapter);
-#endif
 
         Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion;
 
-        #if 0
-        if(FLASH_PART_SST25VF080B == Adapter->ulFlashID)
-        {
-        //
-        // 1MB flash has been selected. we have to use 64K as sector size no matter what is kept in FLASH_CS.
-        //
-                Adapter->uiSectorSize = 0x10000;
-        }
-        #endif
 
         return STATUS_SUCCESS ;
 }
@@ -3214,7 +2949,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 //
 //-----------------------------------------------------------------------------
 
-NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter)
+static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter)
 {
         UINT uiData = 0;
 
@@ -3569,39 +3304,6 @@ INT BcmFlash2xBulkWrite(
 }
 
 /**
-*       ReadDSDHeader : Read the DSD map for the DSD Section val provided in Argument.
-*       @Adapter : Beceem Private Data Structure
-*       @psDSDHeader :Pointer of the buffer where header has to be read
-*       @dsd :value of the Dyanmic DSD like DSD0 of DSD1 or DSD2
-*
-*       Return Value:-
-*               if suceeds return STATUS_SUCCESS or negative error code.
-**/
-INT ReadDSDHeader(PMINI_ADAPTER Adapter, PDSD_HEADER psDSDHeader, FLASH2X_SECTION_VAL dsd)
-{
-        INT Status = STATUS_SUCCESS;
-
-        Status =BcmFlash2xBulkRead(Adapter,
-                                                    (PUINT)psDSDHeader,
-                                                        dsd,
-                                                        Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader,
-                                                        sizeof(DSD_HEADER));
-        if(Status == STATUS_SUCCESS)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "DSDImageMagicNumber :0X%x", ntohl(psDSDHeader->DSDImageMagicNumber));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "DSDImageSize :0X%x ",ntohl(psDSDHeader->DSDImageSize));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "DSDImageCRC :0X%x",ntohl(psDSDHeader->DSDImageCRC));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "DSDImagePriority :0X%x",ntohl(psDSDHeader->DSDImagePriority));
-        }
-        else
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"DSD Header read is failed with status :%d", Status);
-        }
-
-        return Status;
-}
-
-/**
 *       BcmGetActiveDSD : Set the Active DSD in Adapter Structure which has to be dumped in DDR
 *       @Adapter :-Drivers private Data Structure
 *
@@ -3609,7 +3311,7 @@ INT ReadDSDHeader(PMINI_ADAPTER Adapter, PDSD_HEADER psDSDHeader, FLASH2X_SECTIO
 *               Return STATUS_SUCESS if get sucess in setting the right DSD else negaive error code
 *
 **/
-INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
+static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
 {
         FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ;
 
@@ -3647,39 +3349,6 @@ INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
         return STATUS_SUCCESS;
 }
 
-/**
-*       ReadISOUnReservedBytes : Read the ISO map for the ISO Section val provided in Argument.
-*       @Adapter : Driver Private Data Structure
-*       @psISOHeader :Pointer of the location where header has to be read
-*       @IsoImage :value of the Dyanmic ISO like ISO_IMAGE1 of ISO_IMAGE2
-*
-*       Return Value:-
-*               if suceeds return STATUS_SUCCESS or negative error code.
-**/
-
-INT ReadISOHeader(PMINI_ADAPTER Adapter, PISO_HEADER psISOHeader, FLASH2X_SECTION_VAL IsoImage)
-{
-        INT Status = STATUS_SUCCESS;
-
-        Status = BcmFlash2xBulkRead(Adapter,
-                                            (PUINT)psISOHeader,
-                                                IsoImage,
-                                                0,
-                                                sizeof(ISO_HEADER));
-
-        if(Status == STATUS_SUCCESS)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "ISOImageMagicNumber :0X%x", ntohl(psISOHeader->ISOImageMagicNumber));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "ISOImageSize :0X%x ",ntohl(psISOHeader->ISOImageSize));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "ISOImageCRC :0X%x",ntohl(psISOHeader->ISOImageCRC));
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "ISOImagePriority :0X%x",ntohl(psISOHeader->ISOImagePriority));
-        }
-        else
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "ISO Header Read failed");
-        }
-        return Status;
-}
 
 /**
 *       BcmGetActiveISO :- Set the Active ISO in Adapter Data Structue
@@ -3691,7 +3360,7 @@ INT ReadISOHeader(PMINI_ADAPTER Adapter, PISO_HEADER psISOHeader, FLASH2X_SECTIO
 *
 **/
 
-INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
+static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
 {
 
         INT HighestPriISO = 0 ;
@@ -4588,7 +4257,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 
         }
 
-        bcm_kfree(Buff);
+        kfree(Buff);
 
         return Status;
 }
@@ -4789,7 +4458,7 @@ Return Value:-
         Success :- Base Address of the Flash
 **/
 
-INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
+static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter)
 {
 
         UINT uiBaseAddr = 0;
@@ -4866,20 +4535,6 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
                 return  -EINVAL;
         }
 
-        #if 0
-        else
-        {
-                if((SrcSection == VSA0) || (SrcSection == VSA1) || (SrcSection == VSA2))
-                {
-                        if((DstSection != VSA0) && (DstSection != VSA1) && (DstSection != VSA2))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Source and Destion secton is not of same type");
-                                return -EINVAL;
-                        }
-                }
-
-        }
-        #endif
         //if offset zero means have to copy complete secton
 
         if(numOfBytes == 0)
@@ -4954,7 +4609,7 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
                                 BytesToBeCopied = numOfBytes;
                 }
         }while(numOfBytes > 0) ;
-        bcm_kfree(pBuff);
+        kfree(pBuff);
         Adapter->bHeaderChangeAllowed = FALSE ;
         return Status;
 }
@@ -4979,14 +4634,6 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
         UINT uiSectAlignAddr = 0;
         UINT sig = 0;
 
-        #if 0
-        //if Chenges in Header is allowed, Return back
-        if(Adapter->bHeaderChangeAllowed == TRUE)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Header Change is allowed");
-                return STATUS_SUCCESS ;
-        }
-        #endif
         //making the offset sector alligned
         uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
 
@@ -5024,7 +4671,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
                 //Replace Buffer content with Header
                 memcpy(pBuff +offsetToProtect,pTempBuff,HeaderSizeToProtect);
 
-                bcm_kfree(pTempBuff);
+                kfree(pTempBuff);
         }
         if(bHasHeader && Adapter->bSigCorrupted)
         {
@@ -5044,29 +4691,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
 
         return STATUS_SUCCESS ;
 }
-INT BcmMakeFlashCSActive(PMINI_ADAPTER Adapter, UINT offset)
-{
-        UINT GPIOConfig = 0 ;
-
-
-        if(Adapter->bFlashRawRead == FALSE)
-        {
-                //Applicable for Flash2.x
-                if(IsFlash2x(Adapter) == FALSE)
-                        return STATUS_SUCCESS;
-        }
 
-        if(offset/FLASH_PART_SIZE)
-        {
-                //bit[14..12] -> will select make Active CS1, CS2 or CS3
-                // Select CS1, CS2 and CS3 (CS0 is dedicated pin)
-                rdmalt(Adapter,FLASH_GPIO_CONFIG_REG, &GPIOConfig, 4);
-                GPIOConfig |= (7 << 12);
-                wrmalt(Adapter,FLASH_GPIO_CONFIG_REG, &GPIOConfig, 4);
-        }
-
-        return STATUS_SUCCESS ;
-}
 /**
 BcmDoChipSelect : This will selcet the appropriate chip for writing.
 @Adapater :- Bcm Driver Private Data Structure
@@ -5074,7 +4699,7 @@ BcmDoChipSelect : This will selcet the appropriate chip for writing.
 OutPut:-
         Select the Appropriate chip and retrn status Sucess
 **/
-INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
+static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 {
         UINT FlashConfig = 0;
         INT ChipNum = 0;
@@ -5365,39 +4990,6 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
         return Status;
 }
 
-#if 0
-UINT getNumOfSubSectionWithWRPermisson(PMINI_ADAPTER Adapter, SECTION_TYPE secType)
-{
-
-        UINT numOfWRSubSec = 0;
-        switch(secType)
-        {
-                case ISO :
-                        if(IsSectionWritable(Adapter,ISO_IMAGE1))
-                                numOfWRSubSec = numOfWRSubSec + 1;
-                        if(IsSectionWritable(Adapter,ISO_IMAGE2))
-                                numOfWRSubSec = numOfWRSubSec + 1;
-                        break;
-
-                case DSD :
-                        if(IsSectionWritable(Adapter,DSD2))
-                                numOfWRSubSec = numOfWRSubSec + 1;
-                        if(IsSectionWritable(Adapter,DSD1))
-                                numOfWRSubSec = numOfWRSubSec + 1;
-                        if(IsSectionWritable(Adapter,DSD0))
-                                numOfWRSubSec = numOfWRSubSec + 1;
-                        break ;
-
-                case VSA :
-                                //for VSA Add code Here
-                 default :
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Invalid secton<%d> is passed", secType);\
-                        numOfWRSubSec = 0;
-
-        }
-        return numOfWRSubSec;
-}
-#endif
 BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {
 
@@ -5479,7 +5071,7 @@ INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section)
                 return Status ;
 }
 
-INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
 {
 
         PUCHAR pBuff = NULL;
@@ -5543,16 +5135,16 @@ INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
         else
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
-                bcm_kfree(pBuff);
+                kfree(pBuff);
                 return STATUS_FAILURE;
         }
 
-        bcm_kfree(pBuff);
+        kfree(pBuff);
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
         return STATUS_SUCCESS ;
 }
 
-INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
+static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
 {
 
         PUCHAR pBuff = NULL;
@@ -5593,14 +5185,14 @@ INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
         else
         {
                 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
-                bcm_kfree(pBuff);
+                kfree(pBuff);
                 return STATUS_FAILURE;
         }
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
         BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,pBuff,MAX_RW_SIZE);
 
-        bcm_kfree(pBuff);
+        kfree(pBuff);
         return STATUS_SUCCESS ;
 }
 
diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index 6ec6ca85b501..651b5a455b32 100644
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -323,15 +323,6 @@ typedef struct _ISO_HEADER
 
 
 
-#ifdef BCM_SHM_INTERFACE
-
-#define FLASH_ADDR_MASK                          0x1F000000
-extern int bcmflash_raw_read(unsigned int flash_id, unsigned int offset, unsigned char *inbuf, unsigned int len);
-extern int bcmflash_raw_write(unsigned int flash_id, unsigned int offset, unsigned char *outbuf, unsigned int len);
-extern int bcmflash_raw_writenoerase(unsigned int flash_id, unsigned int offset, unsigned char *outbuf, unsigned int len);
-
-
-#endif
 
 #define FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT   0x1C000000
 #define FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT  0x1F000000
@@ -414,76 +405,5 @@ extern int bcmflash_raw_writenoerase(unsigned int flash_id, unsigned int offset,
 
 #define FIELD_OFFSET_IN_HEADER(HeaderPointer,Field) ((PUCHAR)&((HeaderPointer)(NULL))->Field - (PUCHAR)(NULL))
 
-#if 0
-INT BeceemEEPROMBulkRead(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes);
-
-
-INT BeceemFlashBulkRead(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes);
-
-UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
-
-UINT BcmGetFlashSize(PMINI_ADAPTER Adapter);
-
-UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter);
-
-
-
-INT BeceemFlashBulkWrite(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes,
-        BOOLEAN bVerify);
-
-INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter);
-
-INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter);
-
-
-INT BeceemEEPROMBulkWrite(
-        PMINI_ADAPTER Adapter,
-        PUCHAR pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes,
-        BOOLEAN bVerify);
-
-
-INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData);
-
-NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
-
-INT BeceemNVMRead(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes);
-
-INT BeceemNVMWrite(
-        PMINI_ADAPTER Adapter,
-        PUINT pBuffer,
-        UINT uiOffset,
-        UINT uiNumBytes,
-        BOOLEAN bVerify);
-
-INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter);
-
-INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize);
-
-INT BcmInitNVM(PMINI_ADAPTER Adapter);
-
-VOID BcmValidateNvmType(PMINI_ADAPTER Adapter);
-
-VOID BcmGetFlashCSInfo(PMINI_ADAPTER Adapter);
-
-#endif
-
 #endif
 
diff --git a/drivers/staging/bcm/osal_misc.h b/drivers/staging/bcm/osal_misc.h
deleted file mode 100644
index ff4adde17cd8..000000000000
--- a/drivers/staging/bcm/osal_misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-        /*++
-
-        Copyright (c) Beceem Communications Inc.
-
-        Module Name:
-                OSAL_Misc.h
-
-        Abstract:
-                Provides the OS Abstracted macros to access:
-                        Linked Lists
-                        Dispatcher Objects(Events,Semaphores,Spin Locks and the like)
-                        Files
-
-
-        Revision History:
-                Who         When        What
-                --------    --------    ----------------------------------------------
-                Name            Date            Created/reviewed/modified
-                Rajeev          24/1/08         Created
-        Notes:
-
-        --*/
-#ifndef _OSAL_MISC_H_
-#define _OSAL_MISC_H_
-//OSAL Macros
-//OSAL Primitives
-typedef PUCHAR  POSAL_NW_PACKET  ;              //Nw packets
-
-
-#define OsalMemAlloc(n,t) kmalloc(n,GFP_KERNEL)
-
-#define OsalMemFree(x,n) bcm_kfree(x)
-
-#define OsalMemMove(dest, src, len)             \
-{                                                                               \
-                        memcpy(dest,src, len);          \
-}
-
-#define OsalZeroMemory(pDest, Len)              \
-{                                                                               \
-                        memset(pDest,0,Len);            \
-}
-
-//#define OsalMemSet(pSrc,Char,Len) memset(pSrc,Char,Len)
-
-bool OsalMemCompare(void *dest, void *src, UINT len);
-
-#endif
-
diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README
index a27bb0b4f581..99e67669f26b 100644
--- a/drivers/staging/brcm80211/README
+++ b/drivers/staging/brcm80211/README
@@ -43,14 +43,8 @@ Firmware is available from the Linux firmware repository at:
         http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
         https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
 
-For all chips, copy brcm/bcm43xx-0-610-809-0.fw and
-brcm/bcm43xx_hdr-0-610-809-0.fw to /lib/firmware/brcm (or wherever firmware is
-normally installed on the system).  In the /lib/firmware/brcm directory, then
-create the following symlinks:
-
-        ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw
-        ln -s bcm43xx_hdr-0-610-809-0.fw bcm43xx_hdr-0.fw
-
+For all chips, copy brcm/bcm43xx-0.fw and brcm/bcm43xx_hdr-0.fw to
+/lib/firmware/brcm (or wherever firmware is normally installed on your system).
 
 Currently supported chips
 ==============
diff --git a/drivers/staging/brcm80211/brcmfmac/README b/drivers/staging/brcm80211/brcmfmac/README
index 43601fa8b17e..be29e4236920 100644
--- a/drivers/staging/brcm80211/brcmfmac/README
+++ b/drivers/staging/brcm80211/brcmfmac/README
@@ -25,8 +25,9 @@ Firmware is available from the Linux firmware repository at:
         http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
         https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
 
-For 4329 chip, copy brcm/bcm4329-fullmac-4-218-248-5.bin and
-bcm4329-fullmac-4-218-248-5.txt to /lib/firmware/brcm
+For 4329 chip, copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt
+to /lib/firmware/brcm (or wherever firmware is normally installed on your
+system).
 
 Contact Info:
 =============
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 4c613da3553a..acf43a365081 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -16,13 +16,14 @@
 /* ****************** BCMSDH Interface Functions *************************** */
 
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <hndsoc.h>
 #include <siutils.h>
-#include <osl.h>
 
 #include <bcmsdh.h>             /* BRCM API for SDIO
                          clients (such as wl, dhd) */
@@ -38,7 +39,7 @@ struct bcmsdh_info {
         bool init_success;      /* underlying driver successfully attached */
         void *sdioh;            /* handler for sdioh */
         u32 vendevid;   /* Target Vendor and Device ID on SD bus */
-        osl_t *osh;
+        struct osl_info *osh;
         bool regfail;           /* Save status of last
                                  reg_read/reg_write call */
         u32 sbwad;              /* Save backplane window address */
@@ -55,7 +56,8 @@ void bcmsdh_enable_hw_oob_intr(bcmsdh_info_t *sdh, bool enable)
 }
 #endif
 
-bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
+bcmsdh_info_t *bcmsdh_attach(struct osl_info *osh, void *cfghdl,
+                                void **regsva, uint irq)
 {
         bcmsdh_info_t *bcmsdh;
 
@@ -84,7 +86,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
         return bcmsdh;
 }
 
-int bcmsdh_detach(osl_t *osh, void *sdh)
+int bcmsdh_detach(struct osl_info *osh, void *sdh)
 {
         bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
 
@@ -451,7 +453,7 @@ bool bcmsdh_regfail(void *sdh)
 
 int
 bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags,
-                u8 *buf, uint nbytes, void *pkt,
+                u8 *buf, uint nbytes, struct sk_buff *pkt,
                 bcmsdh_cmplt_fn_t complete, void *handle)
 {
         bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 9028cd01d9d0..d24b5e7d753c 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -20,8 +20,7 @@
 
 #define __UNDEF_NO_VERSION__
 
-#include <linuxver.h>
-
+#include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/completion.h>
 
@@ -57,7 +56,7 @@ struct bcmsdh_hc {
 #else
         struct pci_dev *dev;    /* pci device handle */
 #endif                          /* BCMPLATFORM_BUS */
-        osl_t *osh;
+        struct osl_info *osh;
         void *regs;             /* SDIO Host Controller address */
         bcmsdh_info_t *sdh;     /* SDIO Host Controller handle */
         void *ch;
@@ -139,22 +138,11 @@ static int __devexit bcmsdh_remove(struct device *dev);
 #endif                          /* BCMLXSDMMC */
 
 #ifndef BCMLXSDMMC
-static struct device_driver bcmsdh_driver = {
-        .name = "pxa2xx-mci",
-        .bus = &platform_bus_type,
-        .probe = bcmsdh_probe,
-        .remove = bcmsdh_remove,
-        .suspend = NULL,
-        .resume = NULL,
-};
-#endif                          /* BCMLXSDMMC */
-
-#ifndef BCMLXSDMMC
 static
 #endif                          /* BCMLXSDMMC */
 int bcmsdh_probe(struct device *dev)
 {
-        osl_t *osh = NULL;
+        struct osl_info *osh = NULL;
         bcmsdh_hc_t *sdhc = NULL;
         unsigned long regs = 0;
         bcmsdh_info_t *sdh = NULL;
@@ -189,7 +177,7 @@ int bcmsdh_probe(struct device *dev)
         }
 #endif                          /* defined(OOB_INTR_ONLY) */
         /* allocate SDIO Host Controller state info */
-        osh = osl_attach(dev, PCI_BUS, false);
+        osh = osl_attach(dev, PCI_BUS);
         if (!osh) {
                 SDLX_MSG(("%s: osl_attach failed\n", __func__));
                 goto err;
@@ -258,7 +246,7 @@ static
 int bcmsdh_remove(struct device *dev)
 {
         bcmsdh_hc_t *sdhc, *prev;
-        osl_t *osh;
+        struct osl_info *osh;
 
         sdhc = sdhcinfo;
         drvinfo.detach(sdhc->ch);
@@ -291,269 +279,23 @@ int bcmsdh_remove(struct device *dev)
 
         return 0;
 }
-
-#else                           /* BCMPLATFORM_BUS */
-
-#if !defined(BCMLXSDMMC)
-/* forward declarations for PCI probe and remove functions. */
-static int __devinit bcmsdh_pci_probe(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent);
-static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev);
-
-/**
- * pci id table
- */
-static struct pci_device_id bcmsdh_pci_devid[] __devinitdata = {
-{
-        .vendor = PCI_ANY_ID,
-        .device = PCI_ANY_ID,
-        .subvendor = PCI_ANY_ID,
-        .subdevice = PCI_ANY_ID,
-        .class = 0,
-        .class_mask = 0,
-        .driver_data = 0,
-},
-{0,}
-};
-
-MODULE_DEVICE_TABLE(pci, bcmsdh_pci_devid);
-
-/**
- * SDIO Host Controller pci driver info
- */
-static struct pci_driver bcmsdh_pci_driver = {
-        .node = {},
-        .name = "bcmsdh",
-        .id_table = bcmsdh_pci_devid,
-        .probe = bcmsdh_pci_probe,
-        .remove = bcmsdh_pci_remove,
-        .suspend = NULL,
-        .resume = NULL,
-};
-
-extern uint sd_pci_slot;        /* Force detection to a particular PCI */
-                                /* slot only . Allows for having multiple */
-                                /* WL devices at once in a PC */
-                                /* Only one instance of dhd will be */
-                                /* usable at a time */
-                                /* Upper word is bus number, */
-                                /* lower word is slot number */
-                                /* Default value of 0xFFFFffff turns this */
-                                /* off */
-module_param(sd_pci_slot, uint, 0);
-
-/**
- * Detect supported SDIO Host Controller and attach if found.
- *
- * Determine if the device described by pdev is a supported SDIO Host
- * Controller.  If so, attach to it and attach to the target device.
- */
-static int __devinit
-bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        osl_t *osh = NULL;
-        bcmsdh_hc_t *sdhc = NULL;
-        unsigned long regs;
-        bcmsdh_info_t *sdh = NULL;
-        int rc;
-
-        if (sd_pci_slot != 0xFFFFffff) {
-                if (pdev->bus->number != (sd_pci_slot >> 16) ||
-                    PCI_SLOT(pdev->devfn) != (sd_pci_slot & 0xffff)) {
-                        SDLX_MSG(("%s: %s: bus %X, slot %X, vend %X, dev %X\n",
-                                  __func__,
-                                  bcmsdh_chipmatch(pdev->vendor, pdev->device) ?
-                                  "Found compatible SDIOHC" :
-                                  "Probing unknown device",
-                                  pdev->bus->number, PCI_SLOT(pdev->devfn),
-                                  pdev->vendor, pdev->device));
-                        return -ENODEV;
-                }
-                SDLX_MSG(("%s: %s: bus %X, slot %X, vendor %X, device %X "
-                        "(good PCI location)\n", __func__,
-                        bcmsdh_chipmatch(pdev->vendor, pdev->device) ?
-                        "Using compatible SDIOHC" : "WARNING, forced use "
-                        "of unkown device",
-                pdev->bus->number, PCI_SLOT(pdev->devfn), pdev->vendor,
-                pdev->device));
-        }
-
-        if ((pdev->vendor == VENDOR_TI)
-            && ((pdev->device == PCIXX21_FLASHMEDIA_ID)
-                || (pdev->device == PCIXX21_FLASHMEDIA0_ID))) {
-                u32 config_reg;
-
-                SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n",
-                          __func__));
-                osh = osl_attach(pdev, PCI_BUS, false);
-                if (!osh) {
-                        SDLX_MSG(("%s: osl_attach failed\n", __func__));
-                        goto err;
-                }
-
-                config_reg = OSL_PCI_READ_CONFIG(osh, 0x4c, 4);
-
-                /*
-                 * Set MMC_SD_DIS bit in FlashMedia Controller.
-                 * Disbling the SD/MMC Controller in the FlashMedia Controller
-                 * allows the Standard SD Host Controller to take over control
-                 * of the SD Slot.
-                 */
-                config_reg |= 0x02;
-                OSL_PCI_WRITE_CONFIG(osh, 0x4c, 4, config_reg);
-                osl_detach(osh);
-        }
-        /* match this pci device with what we support */
-        /* we can't solely rely on this to believe it is
-                our SDIO Host Controller! */
-        if (!bcmsdh_chipmatch(pdev->vendor, pdev->device))
-                return -ENODEV;
-
-        /* this is a pci device we might support */
-        SDLX_MSG(("%s: Found possible SDIO Host Controller: "
-                "bus %d slot %d func %d irq %d\n", __func__,
-                pdev->bus->number, PCI_SLOT(pdev->devfn),
-                PCI_FUNC(pdev->devfn), pdev->irq));
-
-        /* use bcmsdh_query_device() to get the vendor ID of the target device
-         * so it will eventually appear in the Broadcom string on the console
-         */
-
-        /* allocate SDIO Host Controller state info */
-        osh = osl_attach(pdev, PCI_BUS, false);
-        if (!osh) {
-                SDLX_MSG(("%s: osl_attach failed\n", __func__));
-                goto err;
-        }
-        sdhc = kzalloc(sizeof(bcmsdh_hc_t), GFP_ATOMIC);
-        if (!sdhc) {
-                SDLX_MSG(("%s: out of memory\n", __func__));
-                goto err;
-        }
-        sdhc->osh = osh;
-
-        sdhc->dev = pdev;
-
-        /* map to address where host can access */
-        pci_set_master(pdev);
-        rc = pci_enable_device(pdev);
-        if (rc) {
-                SDLX_MSG(("%s: Cannot enable PCI device\n", __func__));
-                goto err;
-        }
-        sdh = bcmsdh_attach(osh, (void *)(unsigned long)pci_resource_start(pdev, 0),
-                        (void **)&regs, pdev->irq);
-        if (!sdh) {
-                SDLX_MSG(("%s: bcmsdh_attach failed\n", __func__));
-                goto err;
-        }
-
-        sdhc->sdh = sdh;
-
-        /* try to attach to the target device */
-        sdhc->ch = drvinfo.attach(VENDOR_BROADCOM, /* pdev->vendor, */
-                                bcmsdh_query_device(sdh) & 0xFFFF, 0, 0, 0, 0,
-                                (void *)regs, NULL, sdh);
-        if (!sdhc->ch) {
-                SDLX_MSG(("%s: device attach failed\n", __func__));
-                goto err;
-        }
-
-        /* chain SDIO Host Controller info together */
-        sdhc->next = sdhcinfo;
-        sdhcinfo = sdhc;
-
-        return 0;
-
-        /* error handling */
-err:
-        if (sdhc->sdh)
-                bcmsdh_detach(sdhc->osh, sdhc->sdh);
-        if (sdhc)
-                kfree(sdhc);
-        if (osh)
-                osl_detach(osh);
-        return -ENODEV;
-}
-
-/**
- * Detach from target devices and SDIO Host Controller
- */
-static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev)
-{
-        bcmsdh_hc_t *sdhc, *prev;
-        osl_t *osh;
-
-        /* find the SDIO Host Controller state for this
-                 pdev and take it out from the list */
-        for (sdhc = sdhcinfo, prev = NULL; sdhc; sdhc = sdhc->next) {
-                if (sdhc->dev == pdev) {
-                        if (prev)
-                                prev->next = sdhc->next;
-                        else
-                                sdhcinfo = NULL;
-                        break;
-                }
-                prev = sdhc;
-        }
-        if (!sdhc)
-                return;
-
-        drvinfo.detach(sdhc->ch);
-
-        bcmsdh_detach(sdhc->osh, sdhc->sdh);
-
-        /* release SDIO Host Controller info */
-        osh = sdhc->osh;
-        kfree(sdhc);
-        osl_detach(osh);
-}
-#endif                          /* BCMLXSDMMC */
 #endif                          /* BCMPLATFORM_BUS */
 
 extern int sdio_function_init(void);
 
 int bcmsdh_register(bcmsdh_driver_t *driver)
 {
-        int error = 0;
-
         drvinfo = *driver;
 
-#if defined(BCMPLATFORM_BUS)
-#if defined(BCMLXSDMMC)
         SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
-        error = sdio_function_init();
-#else
-        SDLX_MSG(("Intel PXA270 SDIO Driver\n"));
-        error = driver_register(&bcmsdh_driver);
-#endif                          /* defined(BCMLXSDMMC) */
-        return error;
-#endif                          /* defined(BCMPLATFORM_BUS) */
-
-#if !defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-        error = pci_register_driver(&bcmsdh_pci_driver);
-        if (!error)
-                return 0;
-
-        SDLX_MSG(("%s: pci_register_driver failed 0x%x\n", __func__, error));
-#endif                          /* BCMPLATFORM_BUS */
-
-        return error;
+        return sdio_function_init();
 }
 
 extern void sdio_function_cleanup(void);
 
 void bcmsdh_unregister(void)
 {
-#if defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-                driver_unregister(&bcmsdh_driver);
-#endif
-#if defined(BCMLXSDMMC)
         sdio_function_cleanup();
-#endif                          /* BCMLXSDMMC */
-#if !defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-        pci_unregister_driver(&bcmsdh_pci_driver);
-#endif                          /* BCMPLATFORM_BUS */
 }
 
 #if defined(OOB_INTR_ONLY)
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index f6c9c4541813..d399b5c76f94 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -14,11 +14,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
-#include <bcmutils.h>
 #include <osl.h>
+#include <bcmutils.h>
 #include <sdio.h>               /* SDIO Device and Protocol Specs */
 #include <sdioh.h>              /* SDIO Host Controller Specification */
 #include <bcmsdbus.h>           /* bcmsdh to/from specific controller APIs */
@@ -111,7 +112,7 @@ static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd)
 /*
  *      Public entry points & extern's
  */
-extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq)
+extern sdioh_info_t *sdioh_attach(struct osl_info *osh, void *bar0, uint irq)
 {
         sdioh_info_t *sd;
         int err_ret;
@@ -174,7 +175,7 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq)
         return sd;
 }
 
-extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd)
+extern SDIOH_API_RC sdioh_detach(struct osl_info *osh, sdioh_info_t *sd)
 {
         sd_trace(("%s\n", __func__));
 
@@ -750,7 +751,7 @@ sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, u32 length)
         sd_trace(("%s: Func = %d\n", __func__, func));
 
         if (!sd->func_cis_ptr[func]) {
-                bzero(cis, length);
+                memset(cis, 0, length);
                 sd_err(("%s: no func_cis_ptr[%d]\n", __func__, func));
                 return SDIOH_API_RC_FAIL;
         }
@@ -927,13 +928,13 @@ sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func,
 
 static SDIOH_API_RC
 sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
-                     uint addr, void *pkt)
+                     uint addr, struct sk_buff *pkt)
 {
         bool fifo = (fix_inc == SDIOH_DATA_FIX);
         u32 SGCount = 0;
         int err_ret = 0;
 
-        void *pnext;
+        struct sk_buff *pnext;
 
         sd_trace(("%s: Enter\n", __func__));
 
@@ -943,8 +944,8 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
 
         /* Claim host controller */
         sdio_claim_host(gInstance->func[func]);
-        for (pnext = pkt; pnext; pnext = PKTNEXT(pnext)) {
-                uint pkt_len = PKTLEN(pnext);
+        for (pnext = pkt; pnext; pnext = pnext->next) {
+                uint pkt_len = pnext->len;
                 pkt_len += 3;
                 pkt_len &= 0xFFFFFFFC;
 
@@ -961,23 +962,23 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
                  * is supposed to give
                  * us something we can work with.
                  */
-                ASSERT(((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) == 0);
+                ASSERT(((u32) (pkt->data) & DMA_ALIGN_MASK) == 0);
 
                 if ((write) && (!fifo)) {
                         err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
-                                                   ((u8 *) PKTDATA(pnext)),
+                                                   ((u8 *) (pnext->data)),
                                                    pkt_len);
                 } else if (write) {
                         err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
-                                                   ((u8 *) PKTDATA(pnext)),
+                                                   ((u8 *) (pnext->data)),
                                                    pkt_len);
                 } else if (fifo) {
                         err_ret = sdio_readsb(gInstance->func[func],
-                                              ((u8 *) PKTDATA(pnext)),
+                                              ((u8 *) (pnext->data)),
                                               addr, pkt_len);
                 } else {
                         err_ret = sdio_memcpy_fromio(gInstance->func[func],
-                                                     ((u8 *) PKTDATA(pnext)),
+                                                     ((u8 *) (pnext->data)),
                                                      addr, pkt_len);
                 }
 
@@ -1025,10 +1026,10 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
 extern SDIOH_API_RC
 sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
                      uint func, uint addr, uint reg_width, uint buflen_u,
-                     u8 *buffer, void *pkt)
+                     u8 *buffer, struct sk_buff *pkt)
 {
         SDIOH_API_RC Status;
-        void *mypkt = NULL;
+        struct sk_buff *mypkt = NULL;
 
         sd_trace(("%s: Enter\n", __func__));
 
@@ -1038,52 +1039,52 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
         if (pkt == NULL) {
                 sd_data(("%s: Creating new %s Packet, len=%d\n",
                          __func__, write ? "TX" : "RX", buflen_u));
-                mypkt = PKTGET(sd->osh, buflen_u, write ? true : false);
+                mypkt = pkt_buf_get_skb(sd->osh, buflen_u);
                 if (!mypkt) {
-                        sd_err(("%s: PKTGET failed: len %d\n",
+                        sd_err(("%s: pkt_buf_get_skb failed: len %d\n",
                                 __func__, buflen_u));
                         return SDIOH_API_RC_FAIL;
                 }
 
                 /* For a write, copy the buffer data into the packet. */
                 if (write)
-                        bcopy(buffer, PKTDATA(mypkt), buflen_u);
+                        bcopy(buffer, mypkt->data, buflen_u);
 
                 Status =
                     sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);
 
                 /* For a read, copy the packet data back to the buffer. */
                 if (!write)
-                        bcopy(PKTDATA(mypkt), buffer, buflen_u);
+                        bcopy(mypkt->data, buffer, buflen_u);
 
-                PKTFREE(sd->osh, mypkt, write ? true : false);
-        } else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) {
+                pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);
+        } else if (((u32) (pkt->data) & DMA_ALIGN_MASK) != 0) {
                 /* Case 2: We have a packet, but it is unaligned. */
 
                 /* In this case, we cannot have a chain. */
-                ASSERT(PKTNEXT(pkt) == NULL);
+                ASSERT(pkt->next == NULL);
 
                 sd_data(("%s: Creating aligned %s Packet, len=%d\n",
-                         __func__, write ? "TX" : "RX", PKTLEN(pkt)));
-                mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? true : false);
+                         __func__, write ? "TX" : "RX", pkt->len));
+                mypkt = pkt_buf_get_skb(sd->osh, pkt->len);
                 if (!mypkt) {
-                        sd_err(("%s: PKTGET failed: len %d\n",
-                                __func__, PKTLEN(pkt)));
+                        sd_err(("%s: pkt_buf_get_skb failed: len %d\n",
+                                __func__, pkt->len));
                         return SDIOH_API_RC_FAIL;
                 }
 
                 /* For a write, copy the buffer data into the packet. */
                 if (write)
-                        bcopy(PKTDATA(pkt), PKTDATA(mypkt), PKTLEN(pkt));
+                        bcopy(pkt->data, mypkt->data, pkt->len);
 
                 Status =
                     sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);
 
                 /* For a read, copy the packet data back to the buffer. */
                 if (!write)
-                        bcopy(PKTDATA(mypkt), PKTDATA(pkt), PKTLEN(mypkt));
+                        bcopy(mypkt->data, pkt->data, mypkt->len);
 
-                PKTFREE(sd->osh, mypkt, write ? true : false);
+                pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);
         } else {                /* case 3: We have a packet and
                                  it is aligned. */
                 sd_data(("%s: Aligned %s Packet, direct DMA\n",
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index ae7b566b11d7..ceaa47490680 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -15,7 +15,9 @@
  */
 #include <linux/types.h>
 #include <linux/sched.h>        /* request_irq() */
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <sdio.h>               /* SDIO Specs */
 #include <bcmsdbus.h>           /* bcmsdh to/from specific controller APIs */
@@ -211,7 +213,7 @@ int sdio_function_init(void)
         if (!gInstance)
                 return -ENOMEM;
 
-        bzero(&sdmmc_dev, sizeof(sdmmc_dev));
+        memset(&sdmmc_dev, 0, sizeof(sdmmc_dev));
         error = sdio_register_driver(&bcmsdh_sdmmc_driver);
 
         return error;
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index 57d06b2da46f..69c6a0272812 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -77,7 +77,7 @@ enum dhd_prealloc_index {
 /* Common structure for module and instance linkage */
 typedef struct dhd_pub {
         /* Linkage ponters */
-        osl_t *osh;             /* OSL handle */
+        struct osl_info *osh;           /* OSL handle */
         struct dhd_bus *bus;    /* Bus module handle */
         struct dhd_prot *prot;  /* Protocol module handle */
         struct dhd_info *info;  /* Info module handle */
@@ -277,15 +277,16 @@ typedef struct dhd_if_event {
  */
 
 /* To allow osl_attach/detach calls from os-independent modules */
-osl_t *dhd_osl_attach(void *pdev, uint bustype);
-void dhd_osl_detach(osl_t *osh);
+struct osl_info *dhd_osl_attach(void *pdev, uint bustype);
+void dhd_osl_detach(struct osl_info *osh);
 
 /* Indication from bus module regarding presence/insertion of dongle.
  * Return dhd_pub_t pointer, used as handle to OS module in later calls.
  * Returned structure should have bus and prot pointers filled in.
  * bus_hdrlen specifies required headroom for bus module header.
  */
-extern dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen);
+extern dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
+                                uint bus_hdrlen);
 extern int dhd_net_attach(dhd_pub_t *dhdp, int idx);
 
 /* Indication from bus module regarding removal/absence of dongle */
@@ -294,10 +295,12 @@ extern void dhd_detach(dhd_pub_t *dhdp);
 /* Indication from bus module to change flow-control state */
 extern void dhd_txflowcontrol(dhd_pub_t *dhdp, int ifidx, bool on);
 
-extern bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec);
+extern bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q,
+                         struct sk_buff *pkt, int prec);
 
 /* Receive frame for delivery to OS.  Callee disposes of rxp. */
-extern void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *rxp, int numpkt);
+extern void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx,
+                         struct sk_buff *rxp, int numpkt);
 
 /* Return pointer to interface name */
 extern char *dhd_ifname(dhd_pub_t *dhdp, int idx);
@@ -306,7 +309,7 @@ extern char *dhd_ifname(dhd_pub_t *dhdp, int idx);
 extern void dhd_sched_dpc(dhd_pub_t *dhdp);
 
 /* Notify tx completion */
-extern void dhd_txcomplete(dhd_pub_t *dhdp, void *txp, bool success);
+extern void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success);
 
 /* Query ioctl */
 extern int dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf,
@@ -377,7 +380,7 @@ extern void dhd_vif_sendup(struct dhd_info *dhd, int ifidx, unsigned char * cp,
                            int len);
 
 /* Send packet to dongle via data channel */
-extern int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pkt);
+extern int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pkt);
 
 /* Send event to host */
 extern void dhd_sendup_event(dhd_pub_t *dhdp, wl_event_msg_t *event,
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
index 3b39c9966f81..cd0d5400bf07 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
@@ -26,8 +26,8 @@ extern int dhd_bus_register(void);
 extern void dhd_bus_unregister(void);
 
 /* Download firmware image and nvram image */
-extern bool dhd_bus_download_firmware(struct dhd_bus *bus, osl_t * osh,
-                                      char *fw_path, char *nv_path);
+extern bool dhd_bus_download_firmware(struct dhd_bus *bus,
+              struct osl_info *osh, char *fw_path, char *nv_path);
 
 /* Stop bus module: clear pending frames, disable data flow */
 extern void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex);
@@ -36,7 +36,7 @@ extern void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex);
 extern int dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex);
 
 /* Send a data frame to the dongle.  Callee disposes of txp. */
-extern int dhd_bus_txdata(struct dhd_bus *bus, void *txp);
+extern int dhd_bus_txdata(struct dhd_bus *bus, struct sk_buff *txp);
 
 /* Send/receive a control message to/from the dongle.
  * Expects caller to enforce a single outstanding transaction.
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index bcbaac9bcdcc..b7b527f5024c 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <osl.h>
 
@@ -297,6 +298,15 @@ done:
         return ret;
 }
 
+#define PKTSUMNEEDED(skb) \
+                (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)
+#define PKTSETSUMGOOD(skb, x) \
+                (((struct sk_buff *)(skb))->ip_summed = \
+                ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
+
+/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because
+        skb->ip_summed is overloaded */
+
 int
 dhd_prot_iovar_op(dhd_pub_t *dhdp, const char *name,
                   void *params, int plen, void *arg, int len, bool set)
@@ -309,7 +319,7 @@ void dhd_prot_dump(dhd_pub_t *dhdp, struct bcmstrbuf *strbuf)
         bcm_bprintf(strbuf, "Protocol CDC: reqid %d\n", dhdp->prot->reqid);
 }
 
-void dhd_prot_hdrpush(dhd_pub_t *dhd, int ifidx, void *pktbuf)
+void dhd_prot_hdrpush(dhd_pub_t *dhd, int ifidx, struct sk_buff *pktbuf)
 {
 #ifdef BDC
         struct bdc_header *h;
@@ -320,33 +330,33 @@ void dhd_prot_hdrpush(dhd_pub_t *dhd, int ifidx, void *pktbuf)
 #ifdef BDC
         /* Push BDC header used to convey priority for buses that don't */
 
-        PKTPUSH(pktbuf, BDC_HEADER_LEN);
+        skb_push(pktbuf, BDC_HEADER_LEN);
 
-        h = (struct bdc_header *)PKTDATA(pktbuf);
+        h = (struct bdc_header *)(pktbuf->data);
 
         h->flags = (BDC_PROTO_VER << BDC_FLAG_VER_SHIFT);
         if (PKTSUMNEEDED(pktbuf))
                 h->flags |= BDC_FLAG_SUM_NEEDED;
 
-        h->priority = (PKTPRIO(pktbuf) & BDC_PRIORITY_MASK);
+        h->priority = (pktbuf->priority & BDC_PRIORITY_MASK);
         h->flags2 = 0;
         h->rssi = 0;
 #endif                          /* BDC */
         BDC_SET_IF_IDX(h, ifidx);
 }
 
-bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 * fcbits)
+bool dhd_proto_fcinfo(dhd_pub_t *dhd, struct sk_buff *pktbuf, u8 * fcbits)
 {
 #ifdef BDC
         struct bdc_header *h;
 
-        if (PKTLEN(pktbuf) < BDC_HEADER_LEN) {
+        if (pktbuf->len < BDC_HEADER_LEN) {
                 DHD_ERROR(("%s: rx data too short (%d < %d)\n",
-                           __func__, PKTLEN(pktbuf), BDC_HEADER_LEN));
+                           __func__, pktbuf->len, BDC_HEADER_LEN));
                 return BCME_ERROR;
         }
 
-        h = (struct bdc_header *)PKTDATA(pktbuf);
+        h = (struct bdc_header *)(pktbuf->data);
 
         *fcbits = h->priority >> BDC_PRIORITY_FC_SHIFT;
         if ((h->flags2 & BDC_FLAG2_FC_FLAG) == BDC_FLAG2_FC_FLAG)
@@ -355,7 +365,7 @@ bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 * fcbits)
         return false;
 }
 
-int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
+int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, struct sk_buff *pktbuf)
 {
 #ifdef BDC
         struct bdc_header *h;
@@ -366,13 +376,13 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
 #ifdef BDC
         /* Pop BDC header used to convey priority for buses that don't */
 
-        if (PKTLEN(pktbuf) < BDC_HEADER_LEN) {
+        if (pktbuf->len < BDC_HEADER_LEN) {
                 DHD_ERROR(("%s: rx data too short (%d < %d)\n", __func__,
-                           PKTLEN(pktbuf), BDC_HEADER_LEN));
+                           pktbuf->len, BDC_HEADER_LEN));
                 return BCME_ERROR;
         }
 
-        h = (struct bdc_header *)PKTDATA(pktbuf);
+        h = (struct bdc_header *)(pktbuf->data);
 
         *ifidx = BDC_GET_IF_IDX(h);
         if (*ifidx >= DHD_MAX_IFS) {
@@ -395,9 +405,9 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
                 PKTSETSUMGOOD(pktbuf, true);
         }
 
-        PKTSETPRIO(pktbuf, (h->priority & BDC_PRIORITY_MASK));
+        pktbuf->priority = h->priority & BDC_PRIORITY_MASK;
 
-        PKTPULL(pktbuf, BDC_HEADER_LEN);
+        skb_pull(pktbuf, BDC_HEADER_LEN);
 #endif                          /* BDC */
 
         return 0;
@@ -467,7 +477,7 @@ int dhd_prot_init(dhd_pub_t *dhd)
                 dhd_os_proto_unblock(dhd);
                 return ret;
         }
-        memcpy(dhd->mac.octet, buf, ETHER_ADDR_LEN);
+        memcpy(dhd->mac.octet, buf, ETH_ALEN);
 
         dhd_os_proto_unblock(dhd);
 
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 703188fc28ec..3dbf72eebd4a 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
@@ -326,9 +327,10 @@ void dhd_store_conn_status(u32 event, u32 status, u32 reason)
         }
 }
 
-bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
+bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, struct sk_buff *pkt,
+                  int prec)
 {
-        void *p;
+        struct sk_buff *p;
         int eprec = -1;         /* precedence to evict from */
         bool discard_oldest;
 
@@ -366,7 +368,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
                         ASSERT(p);
                 }
 
-                PKTFREE(dhdp->osh, p, true);
+                pkt_buf_free_skb(dhdp->osh, p, true);
         }
 
         /* Enqueue */
@@ -832,7 +834,7 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata,
         u16 flags;
         int evlen;
 
-        if (bcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
+        if (memcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
                 DHD_ERROR(("%s: mismatched OUI, bailing\n", __func__));
                 return BCME_ERROR;
         }
@@ -1254,7 +1256,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd)
          */
         ret = dhd_custom_get_mac_address(ea_addr.octet);
         if (!ret) {
-                bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETHER_ADDR_LEN,
+                bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETH_ALEN,
                             buf, sizeof(buf));
                 ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, sizeof(buf));
                 if (ret < 0) {
@@ -1262,7 +1264,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd)
                                    __func__, ret));
                 } else
                         memcpy(dhd->mac.octet, (void *)&ea_addr,
-                               ETHER_ADDR_LEN);
+                               ETH_ALEN);
         }
 #endif                          /* GET_CUSTOM_MAC_ENABLE */
 
@@ -1532,7 +1534,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
                                         break;
 
                                 if (!memcmp
-                                    (bi->BSSID.octet, addr, ETHER_ADDR_LEN)) {
+                                    (bi->BSSID.octet, addr, ETH_ALEN)) {
                                         DHD_ISCAN(("%s: Del BSS[%2.2d:%2.2d] "
                                         "%X:%X:%X:%X:%X:%X\n",
                                         __func__, l, i, bi->BSSID.octet[0],
@@ -1670,7 +1672,7 @@ int dhd_iscan_request(void *dhdp, u16 action)
         char buf[WLC_IOCTL_SMLEN];
 
         memset(&params, 0, sizeof(wl_iscan_params_t));
-        memcpy(&params.params.bssid, &ether_bcast, ETHER_ADDR_LEN);
+        memcpy(&params.params.bssid, &ether_bcast, ETH_ALEN);
 
         params.params.bss_type = DOT11_BSSTYPE_ANY;
         params.params.scan_type = DOT11_SCANTYPE_ACTIVE;
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index f647034f36d6..c3f18bb3b27c 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linuxver.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 
@@ -24,8 +24,8 @@
 #include <wlioctl.h>
 #include <wl_iw.h>
 
-#define WL_ERROR(x) printf x
-#define WL_TRACE(x)
+#define WL_ERROR(fmt, args...) printk(fmt, ##args)
+#define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
 
 #ifdef CUSTOMER_HW
 extern void bcm_wlan_power_off(int);
@@ -67,13 +67,13 @@ int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr)
 #endif
 
         if (dhd_oob_gpio_num < 0) {
-                WL_ERROR(("%s: ERROR customer specific Host GPIO is NOT defined\n",
-                        __func__));
+                WL_ERROR("%s: ERROR customer specific Host GPIO is NOT defined\n",
+                         __func__);
                 return dhd_oob_gpio_num;
         }
 
-        WL_ERROR(("%s: customer specific Host GPIO number is (%d)\n",
-                  __func__, dhd_oob_gpio_num));
+        WL_ERROR("%s: customer specific Host GPIO number is (%d)\n",
+                 __func__, dhd_oob_gpio_num);
 
 #if defined CUSTOMER_HW
         host_oob_irq = MSM_GPIO_TO_INT(dhd_oob_gpio_num);
@@ -93,40 +93,40 @@ void dhd_customer_gpio_wlan_ctrl(int onoff)
 {
         switch (onoff) {
         case WLAN_RESET_OFF:
-                WL_TRACE(("%s: call customer specific GPIO to insert WLAN RESET\n",
-                        __func__));
+                WL_TRACE("%s: call customer specific GPIO to insert WLAN RESET\n",
+                         __func__);
 #ifdef CUSTOMER_HW
                 bcm_wlan_power_off(2);
 #endif                          /* CUSTOMER_HW */
 #ifdef CUSTOMER_HW2
                 wifi_set_power(0, 0);
 #endif
-                WL_ERROR(("=========== WLAN placed in RESET ========\n"));
+                WL_ERROR("=========== WLAN placed in RESET ========\n");
                 break;
 
         case WLAN_RESET_ON:
-                WL_TRACE(("%s: callc customer specific GPIO to remove WLAN RESET\n",
-                        __func__));
+                WL_TRACE("%s: callc customer specific GPIO to remove WLAN RESET\n",
+                         __func__);
 #ifdef CUSTOMER_HW
                 bcm_wlan_power_on(2);
 #endif                          /* CUSTOMER_HW */
 #ifdef CUSTOMER_HW2
                 wifi_set_power(1, 0);
 #endif
-                WL_ERROR(("=========== WLAN going back to live  ========\n"));
+                WL_ERROR("=========== WLAN going back to live  ========\n");
                 break;
 
         case WLAN_POWER_OFF:
-                WL_TRACE(("%s: call customer specific GPIO to turn off WL_REG_ON\n",
-                        __func__));
+                WL_TRACE("%s: call customer specific GPIO to turn off WL_REG_ON\n",
+                         __func__);
 #ifdef CUSTOMER_HW
                 bcm_wlan_power_off(1);
 #endif                          /* CUSTOMER_HW */
                 break;
 
         case WLAN_POWER_ON:
-                WL_TRACE(("%s: call customer specific GPIO to turn on WL_REG_ON\n",
-                        __func__));
+                WL_TRACE("%s: call customer specific GPIO to turn on WL_REG_ON\n",
+                         __func__);
 #ifdef CUSTOMER_HW
                 bcm_wlan_power_on(1);
 #endif                          /* CUSTOMER_HW */
@@ -140,7 +140,7 @@ void dhd_customer_gpio_wlan_ctrl(int onoff)
 /* Function to get custom MAC address */
 int dhd_custom_get_mac_address(unsigned char *buf)
 {
-        WL_TRACE(("%s Enter\n", __func__));
+        WL_TRACE("%s Enter\n", __func__);
         if (!buf)
                 return -EINVAL;
 
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 9335f02029aa..db4508378775 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
@@ -211,7 +210,7 @@ typedef struct dhd_if {
         int idx;                /* iface idx in dongle */
         int state;              /* interface state */
         uint subunit;           /* subunit */
-        u8 mac_addr[ETHER_ADDR_LEN];    /* assigned MAC address */
+        u8 mac_addr[ETH_ALEN];  /* assigned MAC address */
         bool attached;          /* Delayed attachment when unset */
         bool txflowcontrol;     /* Per interface flow control indicator */
         char name[IFNAMSIZ];    /* linux interface name */
@@ -709,7 +708,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
 
         /* Send down the multicast list first. */
 
-        buflen = sizeof("mcast_list") + sizeof(cnt) + (cnt * ETHER_ADDR_LEN);
+        buflen = sizeof("mcast_list") + sizeof(cnt) + (cnt * ETH_ALEN);
         bufp = buf = kmalloc(buflen, GFP_ATOMIC);
         if (!bufp) {
                 DHD_ERROR(("%s: out of memory for mcast_list, cnt %d\n",
@@ -727,8 +726,8 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
         netdev_for_each_mc_addr(ha, dev) {
                 if (!cnt)
                         break;
-                memcpy(bufp, ha->addr, ETHER_ADDR_LEN);
-                bufp += ETHER_ADDR_LEN;
+                memcpy(bufp, ha->addr, ETH_ALEN);
+                bufp += ETH_ALEN;
                 cnt--;
         }
 
@@ -812,7 +811,7 @@ _dhd_set_mac_address(dhd_info_t *dhd, int ifidx, struct ether_addr *addr)
 
         DHD_TRACE(("%s enter\n", __func__));
         if (!bcm_mkiovar
-            ("cur_etheraddr", (char *)addr, ETHER_ADDR_LEN, buf, 32)) {
+            ("cur_etheraddr", (char *)addr, ETH_ALEN, buf, 32)) {
                 DHD_ERROR(("%s: mkiovar failed for cur_etheraddr\n",
                            dhd_ifname(&dhd->pub, ifidx)));
                 return -1;
@@ -828,7 +827,7 @@ _dhd_set_mac_address(dhd_info_t *dhd, int ifidx, struct ether_addr *addr)
                 DHD_ERROR(("%s: set cur_etheraddr failed\n",
                            dhd_ifname(&dhd->pub, ifidx)));
         } else {
-                memcpy(dhd->iflist[ifidx]->net->dev_addr, addr, ETHER_ADDR_LEN);
+                memcpy(dhd->iflist[ifidx]->net->dev_addr, addr, ETH_ALEN);
         }
 
         return ret;
@@ -998,7 +997,7 @@ static int dhd_set_mac_address(struct net_device *dev, void *addr)
                 return -1;
 
         ASSERT(dhd->sysioc_tsk);
-        memcpy(&dhd->macvalue, sa->sa_data, ETHER_ADDR_LEN);
+        memcpy(&dhd->macvalue, sa->sa_data, ETH_ALEN);
         dhd->set_macaddress = true;
         up(&dhd->sysioc_sem);
 
@@ -1019,7 +1018,7 @@ static void dhd_set_multicast_list(struct net_device *dev)
         up(&dhd->sysioc_sem);
 }
 
-int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pktbuf)
+int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf)
 {
         int ret;
         dhd_info_t *dhd = (dhd_info_t *) (dhdp->info);
@@ -1029,13 +1028,13 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pktbuf)
                 return -ENODEV;
 
         /* Update multicast statistic */
-        if (PKTLEN(pktbuf) >= ETHER_ADDR_LEN) {
-                u8 *pktdata = (u8 *) PKTDATA(pktbuf);
+        if (pktbuf->len >= ETH_ALEN) {
+                u8 *pktdata = (u8 *) (pktbuf->data);
                 struct ether_header *eh = (struct ether_header *)pktdata;
 
-                if (ETHER_ISMULTI(eh->ether_dhost))
+                if (is_multicast_ether_addr(eh->ether_dhost))
                         dhdp->tx_multicast++;
-                if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X)
+                if (ntoh16(eh->ether_type) == ETH_P_PAE)
                         atomic_inc(&dhd->pend_8021x_cnt);
         }
 
@@ -1053,6 +1052,32 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, void *pktbuf)
         return ret;
 }
 
+static inline void *
+osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)
+{
+        struct sk_buff *nskb;
+
+        for (nskb = skb; nskb; nskb = nskb->next)
+                osh->pktalloced++;
+
+        return (void *)skb;
+}
+#define PKTFRMNATIVE(osh, skb)  \
+        osl_pkt_frmnative((osh), (struct sk_buff *)(skb))
+
+static inline struct sk_buff *
+osl_pkt_tonative(struct osl_info *osh, void *pkt)
+{
+        struct sk_buff *nskb;
+
+        for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)
+                osh->pktalloced--;
+
+        return (struct sk_buff *)pkt;
+}
+#define PKTTONATIVE(osh, pkt)   \
+        osl_pkt_tonative((osh), (pkt))
+
 static int dhd_start_xmit(struct sk_buff *skb, struct net_device *net)
 {
         int ret;
@@ -1133,13 +1158,15 @@ void dhd_txflowcontrol(dhd_pub_t *dhdp, int ifidx, bool state)
                 netif_wake_queue(net);
 }
 
-void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
+void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf,
+                  int numpkt)
 {
         dhd_info_t *dhd = (dhd_info_t *) dhdp->info;
         struct sk_buff *skb;
         unsigned char *eth;
         uint len;
-        void *data, *pnext, *save_pktbuf;
+        void *data;
+        struct sk_buff *pnext, *save_pktbuf;
         int i;
         dhd_if_t *ifp;
         wl_event_msg_t event;
@@ -1150,8 +1177,8 @@ void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
 
         for (i = 0; pktbuf && i < numpkt; i++, pktbuf = pnext) {
 
-                pnext = PKTNEXT(pktbuf);
-                PKTSETNEXT(pktbuf, NULL);
+                pnext = pktbuf->next;
+                pktbuf->next = NULL;
 
                 skb = PKTTONATIVE(dhdp->osh, pktbuf);
 
@@ -1190,7 +1217,7 @@ void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
                 /* Process special event packets and then discard them */
                 if (ntoh16(skb->protocol) == ETHER_TYPE_BRCM)
                         dhd_wl_host_event(dhd, &ifidx,
-                                          skb->mac_header,
+                                          skb_mac_header(skb),
                                           &event, &data);
 
                 ASSERT(ifidx < DHD_MAX_IFS && dhd->iflist[ifidx]);
@@ -1223,7 +1250,7 @@ void dhd_event(struct dhd_info *dhd, char *evpkt, int evlen, int ifidx)
         return;
 }
 
-void dhd_txcomplete(dhd_pub_t *dhdp, void *txp, bool success)
+void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success)
 {
         uint ifidx;
         dhd_info_t *dhd = (dhd_info_t *) (dhdp->info);
@@ -1232,10 +1259,10 @@ void dhd_txcomplete(dhd_pub_t *dhdp, void *txp, bool success)
 
         dhd_prot_hdrpull(dhdp, &ifidx, txp);
 
-        eh = (struct ether_header *)PKTDATA(txp);
+        eh = (struct ether_header *)(txp->data);
         type = ntoh16(eh->ether_type);
 
-        if (type == ETHER_TYPE_802_1X)
+        if (type == ETH_P_PAE)
                 atomic_dec(&dhd->pend_8021x_cnt);
 
 }
@@ -1621,6 +1648,51 @@ static int dhd_ethtool(dhd_info_t *dhd, void *uaddr)
         return 0;
 }
 
+static s16 linuxbcmerrormap[] = { 0,    /* 0 */
+        -EINVAL,                /* BCME_ERROR */
+        -EINVAL,                /* BCME_BADARG */
+        -EINVAL,                /* BCME_BADOPTION */
+        -EINVAL,                /* BCME_NOTUP */
+        -EINVAL,                /* BCME_NOTDOWN */
+        -EINVAL,                /* BCME_NOTAP */
+        -EINVAL,                /* BCME_NOTSTA */
+        -EINVAL,                /* BCME_BADKEYIDX */
+        -EINVAL,                /* BCME_RADIOOFF */
+        -EINVAL,                /* BCME_NOTBANDLOCKED */
+        -EINVAL,                /* BCME_NOCLK */
+        -EINVAL,                /* BCME_BADRATESET */
+        -EINVAL,                /* BCME_BADBAND */
+        -E2BIG,                 /* BCME_BUFTOOSHORT */
+        -E2BIG,                 /* BCME_BUFTOOLONG */
+        -EBUSY,                 /* BCME_BUSY */
+        -EINVAL,                /* BCME_NOTASSOCIATED */
+        -EINVAL,                /* BCME_BADSSIDLEN */
+        -EINVAL,                /* BCME_OUTOFRANGECHAN */
+        -EINVAL,                /* BCME_BADCHAN */
+        -EFAULT,                /* BCME_BADADDR */
+        -ENOMEM,                /* BCME_NORESOURCE */
+        -EOPNOTSUPP,            /* BCME_UNSUPPORTED */
+        -EMSGSIZE,              /* BCME_BADLENGTH */
+        -EINVAL,                /* BCME_NOTREADY */
+        -EPERM,                 /* BCME_NOTPERMITTED */
+        -ENOMEM,                /* BCME_NOMEM */
+        -EINVAL,                /* BCME_ASSOCIATED */
+        -ERANGE,                /* BCME_RANGE */
+        -EINVAL,                /* BCME_NOTFOUND */
+        -EINVAL,                /* BCME_WME_NOT_ENABLED */
+        -EINVAL,                /* BCME_TSPEC_NOTFOUND */
+        -EINVAL,                /* BCME_ACM_NOTSUPPORTED */
+        -EINVAL,                /* BCME_NOT_WME_ASSOCIATION */
+        -EIO,                   /* BCME_SDIO_ERROR */
+        -ENODEV,                /* BCME_DONGLE_DOWN */
+        -EINVAL,                /* BCME_VERSION */
+        -EIO,                   /* BCME_TXFAIL */
+        -EIO,                   /* BCME_RXFAIL */
+        -EINVAL,                /* BCME_NODEVICE */
+        -EINVAL,                /* BCME_NMODE_DISABLED */
+        -ENODATA,               /* BCME_NONRESIDENT */
+};
+
 static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
 {
         dhd_info_t *dhd = *(dhd_info_t **) netdev_priv(net);
@@ -1742,7 +1814,12 @@ done:
         if (buf)
                 kfree(buf);
 
-        return OSL_ERROR(bcmerror);
+        if (bcmerror > 0)
+                bcmerror = 0;
+        else if (bcmerror < BCME_LAST)
+                bcmerror = BCME_ERROR;
+
+        return linuxbcmerrormap[-bcmerror];
 }
 
 static int dhd_stop(struct net_device *net)
@@ -1789,7 +1866,7 @@ static int dhd_open(struct net_device *net)
                 }
                 atomic_set(&dhd->pend_8021x_cnt, 0);
 
-                memcpy(net->dev_addr, dhd->pub.mac.octet, ETHER_ADDR_LEN);
+                memcpy(net->dev_addr, dhd->pub.mac.octet, ETH_ALEN);
 
 #ifdef TOE
                 /* Get current TOE mode from dongle */
@@ -1814,12 +1891,12 @@ static int dhd_open(struct net_device *net)
         return ret;
 }
 
-osl_t *dhd_osl_attach(void *pdev, uint bustype)
+struct osl_info *dhd_osl_attach(void *pdev, uint bustype)
 {
-        return osl_attach(pdev, bustype, true);
+        return osl_attach(pdev, bustype);
 }
 
-void dhd_osl_detach(osl_t *osh)
+void dhd_osl_detach(struct osl_info *osh)
 {
         osl_detach(osh);
 }
@@ -1845,7 +1922,7 @@ dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name,
         dhd->iflist[ifidx] = ifp;
         strlcpy(ifp->name, name, IFNAMSIZ);
         if (mac_addr != NULL)
-                memcpy(&ifp->mac_addr, mac_addr, ETHER_ADDR_LEN);
+                memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);
 
         if (handle == NULL) {
                 ifp->state = WLC_E_IF_ADD;
@@ -1877,7 +1954,8 @@ void dhd_del_if(dhd_info_t *dhd, int ifidx)
         up(&dhd->sysioc_sem);
 }
 
-dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
+dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
+                        uint bus_hdrlen)
 {
         dhd_info_t *dhd = NULL;
         struct net_device *net;
@@ -2199,19 +2277,11 @@ static struct net_device_ops dhd_ops_pri = {
         .ndo_set_multicast_list = dhd_set_multicast_list
 };
 
-static struct net_device_ops dhd_ops_virt = {
-        .ndo_get_stats = dhd_get_stats,
-        .ndo_do_ioctl = dhd_ioctl_entry,
-        .ndo_start_xmit = dhd_start_xmit,
-        .ndo_set_mac_address = dhd_set_mac_address,
-        .ndo_set_multicast_list = dhd_set_multicast_list
-};
-
 int dhd_net_attach(dhd_pub_t *dhdp, int ifidx)
 {
         dhd_info_t *dhd = (dhd_info_t *) dhdp->info;
         struct net_device *net;
-        u8 temp_addr[ETHER_ADDR_LEN] = {
+        u8 temp_addr[ETH_ALEN] = {
                 0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};
 
         DHD_TRACE(("%s: ifidx %d\n", __func__, ifidx));
@@ -2229,7 +2299,7 @@ int dhd_net_attach(dhd_pub_t *dhdp, int ifidx)
          */
         if (ifidx != 0) {
                 /* for virtual interfaces use the primary MAC  */
-                memcpy(temp_addr, dhd->pub.mac.octet, ETHER_ADDR_LEN);
+                memcpy(temp_addr, dhd->pub.mac.octet, ETH_ALEN);
 
         }
 
@@ -2257,7 +2327,7 @@ int dhd_net_attach(dhd_pub_t *dhdp, int ifidx)
 
         dhd->pub.rxsz = net->mtu + net->hard_header_len + dhd->pub.hdrlen;
 
-        memcpy(net->dev_addr, temp_addr, ETHER_ADDR_LEN);
+        memcpy(net->dev_addr, temp_addr, ETH_ALEN);
 
         if (register_netdev(net) != 0) {
                 DHD_ERROR(("%s: couldn't register the net device\n",
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c
index bf8df9801030..c66f1c2941e2 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
-#include <linuxver.h>
 
 int setScheduler(struct task_struct *p, int policy, struct sched_param *param)
 {
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_proto.h b/drivers/staging/brcm80211/brcmfmac/dhd_proto.h
index cc42fa4a9140..a5309e27b65b 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_proto.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_proto.h
@@ -46,15 +46,16 @@ extern int dhd_prot_init(dhd_pub_t *dhdp);
 /* Stop protocol: sync w/dongle state. */
 extern void dhd_prot_stop(dhd_pub_t *dhdp);
 
-extern bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 *fcbits);
+extern bool dhd_proto_fcinfo(dhd_pub_t *dhd, struct sk_buff *pktbuf,
+                             u8 *fcbits);
 
 /* Add any protocol-specific data header.
  * Caller must reserve prot_hdrlen prepend space.
  */
-extern void dhd_prot_hdrpush(dhd_pub_t *, int ifidx, void *txp);
+extern void dhd_prot_hdrpush(dhd_pub_t *, int ifidx, struct sk_buff *txp);
 
 /* Remove any protocol-specific data header. */
-extern int dhd_prot_hdrpull(dhd_pub_t *, int *ifidx, void *rxp);
+extern int dhd_prot_hdrpull(dhd_pub_t *, int *ifidx, struct sk_buff *rxp);
 
 /* Use protocol to issue ioctl to dongle */
 extern int dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc,
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index b2281d9dfdcf..3edce44978a1 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -16,6 +16,7 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmsdh.h>
 
@@ -143,7 +144,7 @@
  * bufpool was present for gspi bus.
  */
 #define PKTFREE2()              if ((bus->bus != SPI_BUS) || bus->usebufpool) \
-                                        PKTFREE(bus->dhd->osh, pkt, false);
+                                                        pkt_buf_free_skb(bus->dhd->osh, pkt, false);
 DHD_SPINWAIT_SLEEP_INIT(sdioh_spinwait_sleep);
 extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf,
                             uint len);
@@ -202,8 +203,8 @@ typedef struct dhd_bus {
         u8 rx_seq;              /* Receive sequence number (expected) */
         bool rxskip;            /* Skip receive (awaiting NAK ACK) */
 
-        void *glomd;            /* Packet containing glomming descriptor */
-        void *glom;             /* Packet chain for glommed superframe */
+        struct sk_buff *glomd;  /* Packet containing glomming descriptor */
+        struct sk_buff *glom;   /* Packet chain for glommed superframe */
         uint glomerr;           /* Glom packet read errors */
 
         u8 *rxbuf;              /* Buffer for receiving control packets */
@@ -356,16 +357,16 @@ extern void bcmsdh_enable_hw_oob_intr(void *sdh, bool enable);
 #if defined(OOB_INTR_ONLY) && defined(SDIO_ISR_THREAD)
 #error OOB_INTR_ONLY is NOT working with SDIO_ISR_THREAD
 #endif  /* defined(OOB_INTR_ONLY) && defined(SDIO_ISR_THREAD) */
-#define PKTALIGN(osh, p, len, align)                                    \
+#define PKTALIGN(_osh, _p, _len, _align)                                \
         do {                                                            \
                 uint datalign;                                          \
-                datalign = (unsigned long)PKTDATA((p));                 \
-                datalign = roundup(datalign, (align)) - datalign;       \
-                ASSERT(datalign < (align));                             \
-                ASSERT(PKTLEN((p)) >= ((len) + datalign));      \
+                datalign = (unsigned long)((_p)->data);                 \
+                datalign = roundup(datalign, (_align)) - datalign;      \
+                ASSERT(datalign < (_align));                            \
+                ASSERT((_p)->len >= ((_len) + datalign));               \
                 if (datalign)                                           \
-                        PKTPULL((p), datalign);                 \
-                PKTSETLEN((p), (len));                          \
+                        skb_pull((_p), datalign);                       \
+                __skb_trim((_p), (_len));                               \
         } while (0)
 
 /* Limit on rounding up frames */
@@ -430,27 +431,30 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus);
 #endif                          /* DHD_DEBUG  */
 static int dhdsdio_download_state(dhd_bus_t *bus, bool enter);
 
-static void dhdsdio_release(dhd_bus_t *bus, osl_t *osh);
-static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh);
+static void dhdsdio_release(dhd_bus_t *bus, struct osl_info *osh);
+static void dhdsdio_release_malloc(dhd_bus_t *bus, struct osl_info *osh);
 static void dhdsdio_disconnect(void *ptr);
 static bool dhdsdio_chipmatch(u16 chipid);
-static bool dhdsdio_probe_attach(dhd_bus_t *bus, osl_t *osh, void *sdh,
-                                 void *regsva, u16 devid);
-static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh);
-static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh);
-static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t * osh);
+static bool dhdsdio_probe_attach(dhd_bus_t *bus, struct osl_info *osh,
+                                 void *sdh, void *regsva, u16 devid);
+static bool dhdsdio_probe_malloc(dhd_bus_t *bus, struct osl_info *osh,
+                                 void *sdh);
+static bool dhdsdio_probe_init(dhd_bus_t *bus, struct osl_info *osh, void *sdh);
+static void dhdsdio_release_dongle(dhd_bus_t *bus, struct osl_info * osh);
 
 static uint process_nvram_vars(char *varbuf, uint len);
 
 static void dhd_dongle_setmemsize(struct dhd_bus *bus, int mem_size);
 static int dhd_bcmsdh_recv_buf(dhd_bus_t *bus, u32 addr, uint fn,
-                               uint flags, u8 *buf, uint nbytes, void *pkt,
-                               bcmsdh_cmplt_fn_t complete, void *handle);
+                               uint flags, u8 *buf, uint nbytes,
+                               struct sk_buff *pkt, bcmsdh_cmplt_fn_t complete,
+                               void *handle);
 static int dhd_bcmsdh_send_buf(dhd_bus_t *bus, u32 addr, uint fn,
-                               uint flags, u8 *buf, uint nbytes, void *pkt,
-                               bcmsdh_cmplt_fn_t complete, void *handle);
+                               uint flags, u8 *buf, uint nbytes,
+                               struct sk_buff *pkt, bcmsdh_cmplt_fn_t complete,
+                               void *handle);
 
-static bool dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh,
+static bool dhdsdio_download_firmware(struct dhd_bus *bus, struct osl_info *osh,
                                       void *sdh);
 static int _dhdsdio_download_firmware(struct dhd_bus *bus);
 
@@ -900,16 +904,17 @@ void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable)
 
 /* Writes a HW/SW header into the packet and sends it. */
 /* Assumes: (a) header space already there, (b) caller holds lock */
-static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
+static int dhdsdio_txpkt(dhd_bus_t *bus, struct sk_buff *pkt, uint chan,
+                         bool free_pkt)
 {
         int ret;
-        osl_t *osh;
+        struct osl_info *osh;
         u8 *frame;
         u16 len, pad = 0;
         u32 swheader;
         uint retries = 0;
         bcmsdh_info_t *sdh;
-        void *new;
+        struct sk_buff *new;
         int i;
 
         DHD_TRACE(("%s: Enter\n", __func__));
@@ -922,46 +927,46 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
                 goto done;
         }
 
-        frame = (u8 *) PKTDATA(pkt);
+        frame = (u8 *) (pkt->data);
 
         /* Add alignment padding, allocate new packet if needed */
         pad = ((unsigned long)frame % DHD_SDALIGN);
         if (pad) {
-                if (PKTHEADROOM(pkt) < pad) {
+                if (skb_headroom(pkt) < pad) {
                         DHD_INFO(("%s: insufficient headroom %d for %d pad\n",
-                                  __func__, (int)PKTHEADROOM(pkt), pad));
+                                  __func__, skb_headroom(pkt), pad));
                         bus->dhd->tx_realloc++;
-                        new = PKTGET(osh, (PKTLEN(pkt) + DHD_SDALIGN), true);
+                        new = pkt_buf_get_skb(osh, (pkt->len + DHD_SDALIGN));
                         if (!new) {
                                 DHD_ERROR(("%s: couldn't allocate new %d-byte "
                                         "packet\n",
-                                        __func__, PKTLEN(pkt) + DHD_SDALIGN));
+                                        __func__, pkt->len + DHD_SDALIGN));
                                 ret = BCME_NOMEM;
                                 goto done;
                         }
 
-                        PKTALIGN(osh, new, PKTLEN(pkt), DHD_SDALIGN);
-                        bcopy(PKTDATA(pkt), PKTDATA(new), PKTLEN(pkt));
+                        PKTALIGN(osh, new, pkt->len, DHD_SDALIGN);
+                        bcopy(pkt->data, new->data, pkt->len);
                         if (free_pkt)
-                                PKTFREE(osh, pkt, true);
+                                pkt_buf_free_skb(osh, pkt, true);
                         /* free the pkt if canned one is not used */
                         free_pkt = true;
                         pkt = new;
-                        frame = (u8 *) PKTDATA(pkt);
+                        frame = (u8 *) (pkt->data);
                         ASSERT(((unsigned long)frame % DHD_SDALIGN) == 0);
                         pad = 0;
                 } else {
-                        PKTPUSH(pkt, pad);
-                        frame = (u8 *) PKTDATA(pkt);
+                        skb_push(pkt, pad);
+                        frame = (u8 *) (pkt->data);
 
-                        ASSERT((pad + SDPCM_HDRLEN) <= (int)PKTLEN(pkt));
-                        bzero(frame, pad + SDPCM_HDRLEN);
+                        ASSERT((pad + SDPCM_HDRLEN) <= (int)(pkt->len));
+                        memset(frame, 0, pad + SDPCM_HDRLEN);
                 }
         }
         ASSERT(pad < DHD_SDALIGN);
 
         /* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */
-        len = (u16) PKTLEN(pkt);
+        len = (u16) (pkt->len);
         *(u16 *) frame = htol16(len);
         *(((u16 *) frame) + 1) = htol16(~len);
 
@@ -974,7 +979,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
         htol32_ua_store(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
 
 #ifdef DHD_DEBUG
-        tx_packets[PKTPRIO(pkt)]++;
+        tx_packets[pkt->priority]++;
         if (DHD_BYTES_ON() &&
             (((DHD_CTL_ON() && (chan == SDPCM_CONTROL_CHANNEL)) ||
               (DHD_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
@@ -989,7 +994,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
                 u16 pad = bus->blocksize - (len % bus->blocksize);
                 if ((pad <= bus->roundup) && (pad < bus->blocksize))
 #ifdef NOTUSED
-                        if (pad <= PKTTAILROOM(pkt))
+                        if (pad <= skb_tailroom(pkt))
 #endif                          /* NOTUSED */
                                 len += pad;
         } else if (len % DHD_SDALIGN) {
@@ -999,7 +1004,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
         /* Some controllers have trouble with odd bytes -- round to even */
         if (forcealign && (len & (ALIGNMENT - 1))) {
 #ifdef NOTUSED
-                if (PKTTAILROOM(pkt))
+                if (skb_tailroom(pkt))
 #endif
                         len = roundup(len, ALIGNMENT);
 #ifdef NOTUSED
@@ -1050,34 +1055,34 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
 
 done:
         /* restore pkt buffer pointer before calling tx complete routine */
-        PKTPULL(pkt, SDPCM_HDRLEN + pad);
+        skb_pull(pkt, SDPCM_HDRLEN + pad);
         dhd_os_sdunlock(bus->dhd);
         dhd_txcomplete(bus->dhd, pkt, ret != 0);
         dhd_os_sdlock(bus->dhd);
 
         if (free_pkt)
-                PKTFREE(osh, pkt, true);
+                pkt_buf_free_skb(osh, pkt, true);
 
         return ret;
 }
 
-int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
+int dhd_bus_txdata(struct dhd_bus *bus, struct sk_buff *pkt)
 {
         int ret = BCME_ERROR;
-        osl_t *osh;
+        struct osl_info *osh;
         uint datalen, prec;
 
         DHD_TRACE(("%s: Enter\n", __func__));
 
         osh = bus->dhd->osh;
-        datalen = PKTLEN(pkt);
+        datalen = pkt->len;
 
 #ifdef SDTEST
         /* Push the test header if doing loopback */
         if (bus->ext_loop) {
                 u8 *data;
-                PKTPUSH(pkt, SDPCM_TEST_HDRLEN);
-                data = PKTDATA(pkt);
+                skb_push(pkt, SDPCM_TEST_HDRLEN);
+                data = pkt->data;
                 *data++ = SDPCM_TEST_ECHOREQ;
                 *data++ = (u8) bus->loopid++;
                 *data++ = (datalen >> 0);
@@ -1087,10 +1092,10 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 #endif                          /* SDTEST */
 
         /* Add space for the header */
-        PKTPUSH(pkt, SDPCM_HDRLEN);
-        ASSERT(IS_ALIGNED((unsigned long)PKTDATA(pkt), 2));
+        skb_push(pkt, SDPCM_HDRLEN);
+        ASSERT(IS_ALIGNED((unsigned long)(pkt->data), 2));
 
-        prec = PRIO2PREC((PKTPRIO(pkt) & PRIOMASK));
+        prec = PRIO2PREC((pkt->priority & PRIOMASK));
 
         /* Check for existing queue, current flow-control,
                          pending event, or pending clock */
@@ -1105,9 +1110,9 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
                 /* Priority based enq */
                 dhd_os_sdlock_txq(bus->dhd);
                 if (dhd_prec_enq(bus->dhd, &bus->txq, pkt, prec) == false) {
-                        PKTPULL(pkt, SDPCM_HDRLEN);
+                        skb_pull(pkt, SDPCM_HDRLEN);
                         dhd_txcomplete(bus->dhd, pkt, false);
-                        PKTFREE(osh, pkt, true);
+                        pkt_buf_free_skb(osh, pkt, true);
                         DHD_ERROR(("%s: out of bus->txq !!!\n", __func__));
                         ret = BCME_NORESOURCE;
                 } else {
@@ -1162,7 +1167,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 
 static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
 {
-        void *pkt;
+        struct sk_buff *pkt;
         u32 intstatus = 0;
         uint retries = 0;
         int ret = 0, prec_out;
@@ -1186,7 +1191,7 @@ static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
                         break;
                 }
                 dhd_os_sdunlock_txq(bus->dhd);
-                datalen = PKTLEN(pkt) - SDPCM_HDRLEN;
+                datalen = pkt->len - SDPCM_HDRLEN;
 
 #ifndef SDTEST
                 ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
@@ -1247,7 +1252,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
                         frame -= doff;
                         len += doff;
                         msglen += doff;
-                        bzero(frame, doff + SDPCM_HDRLEN);
+                        memset(frame, 0, doff + SDPCM_HDRLEN);
                 }
                 ASSERT(doff < DHD_SDALIGN);
         }
@@ -2531,7 +2536,7 @@ static int dhdsdio_write_vars(dhd_bus_t *bus)
                 if (!vbuffer)
                         return BCME_NOMEM;
 
-                bzero(vbuffer, varsize);
+                memset(vbuffer, 0, varsize);
                 bcopy(bus->vars, vbuffer, bus->varsz);
 
                 /* Write the vars list */
@@ -2823,7 +2828,7 @@ exit:
 
 void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
 {
-        osl_t *osh = bus->dhd->osh;
+        struct osl_info *osh = bus->dhd->osh;
         u32 local_hostintmask;
         u8 saveclk;
         uint retries;
@@ -2877,10 +2882,10 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
 
         /* Clear any held glomming stuff */
         if (bus->glomd)
-                PKTFREE(osh, bus->glomd, false);
+                pkt_buf_free_skb(osh, bus->glomd, false);
 
         if (bus->glom)
-                PKTFREE(osh, bus->glom, false);
+                pkt_buf_free_skb(osh, bus->glom, false);
 
         bus->glom = bus->glomd = NULL;
 
@@ -3178,8 +3183,8 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
         u8 *dptr, num = 0;
 
         u16 sublen, check;
-        void *pfirst, *plast, *pnext, *save_pfirst;
-        osl_t *osh = bus->dhd->osh;
+        struct sk_buff *pfirst, *plast, *pnext, *save_pfirst;
+        struct osl_info *osh = bus->dhd->osh;
 
         int errcode;
         u8 chan, seq, doff, sfdoff;
@@ -3199,8 +3204,8 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                 dhd_os_sdlock_rxq(bus->dhd);
 
                 pfirst = plast = pnext = NULL;
-                dlen = (u16) PKTLEN(bus->glomd);
-                dptr = PKTDATA(bus->glomd);
+                dlen = (u16) (bus->glomd->len);
+                dptr = bus->glomd->data;
                 if (!dlen || (dlen & 1)) {
                         DHD_ERROR(("%s: bad glomd len(%d), ignore descriptor\n",
                         __func__, dlen));
@@ -3235,19 +3240,19 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                         }
 
                         /* Allocate/chain packet for next subframe */
-                        pnext = PKTGET(osh, sublen + DHD_SDALIGN, false);
+                        pnext = pkt_buf_get_skb(osh, sublen + DHD_SDALIGN);
                         if (pnext == NULL) {
-                                DHD_ERROR(("%s: PKTGET failed, num %d len %d\n",
+                                DHD_ERROR(("%s: pkt_buf_get_skb failed, num %d len %d\n",
                                            __func__, num, sublen));
                                 break;
                         }
-                        ASSERT(!PKTLINK(pnext));
+                        ASSERT(!(pnext->prev));
                         if (!pfirst) {
                                 ASSERT(!plast);
                                 pfirst = plast = pnext;
                         } else {
                                 ASSERT(plast);
-                                PKTSETNEXT(plast, pnext);
+                                plast->next = pnext;
                                 plast = pnext;
                         }
 
@@ -3271,13 +3276,13 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                         pfirst = pnext = NULL;
                 } else {
                         if (pfirst)
-                                PKTFREE(osh, pfirst, false);
+                                pkt_buf_free_skb(osh, pfirst, false);
                         bus->glom = NULL;
                         num = 0;
                 }
 
                 /* Done with descriptor packet */
-                PKTFREE(osh, bus->glomd, false);
+                pkt_buf_free_skb(osh, bus->glomd, false);
                 bus->glomd = NULL;
                 bus->nextlen = 0;
 
@@ -3290,10 +3295,10 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                 if (DHD_GLOM_ON()) {
                         DHD_GLOM(("%s: try superframe read, packet chain:\n",
                                 __func__));
-                        for (pnext = bus->glom; pnext; pnext = PKTNEXT(pnext)) {
+                        for (pnext = bus->glom; pnext; pnext = pnext->next) {
                                 DHD_GLOM(("    %p: %p len 0x%04x (%d)\n",
-                                          pnext, (u8 *) PKTDATA(pnext),
-                                          PKTLEN(pnext), PKTLEN(pnext)));
+                                          pnext, (u8 *) (pnext->data),
+                                          pnext->len, pnext->len));
                         }
                 }
 
@@ -3309,7 +3314,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                                       bcmsdh_cur_sbwad
                                                       (bus->sdh), SDIO_FUNC_2,
                                                       F2SYNC,
-                                                      (u8 *) PKTDATA(pfirst),
+                                                      (u8 *) pfirst->data,
                                                       dlen, pfirst, NULL, NULL);
                 } else if (bus->dataptr) {
                         errcode = dhd_bcmsdh_recv_buf(bus,
@@ -3346,7 +3351,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                 bus->glomerr = 0;
                                 dhdsdio_rxfail(bus, true, false);
                                 dhd_os_sdlock_rxq(bus->dhd);
-                                PKTFREE(osh, bus->glom, false);
+                                pkt_buf_free_skb(osh, bus->glom, false);
                                 dhd_os_sdunlock_rxq(bus->dhd);
                                 bus->rxglomfail++;
                                 bus->glom = NULL;
@@ -3355,13 +3360,13 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                 }
 #ifdef DHD_DEBUG
                 if (DHD_GLOM_ON()) {
-                        prhex("SUPERFRAME", PKTDATA(pfirst),
-                              min_t(int, PKTLEN(pfirst), 48));
+                        prhex("SUPERFRAME", pfirst->data,
+                              min_t(int, pfirst->len, 48));
                 }
 #endif
 
                 /* Validate the superframe header */
-                dptr = (u8 *) PKTDATA(pfirst);
+                dptr = (u8 *) (pfirst->data);
                 sublen = ltoh16_ua(dptr);
                 check = ltoh16_ua(dptr + sizeof(u16));
 
@@ -3399,11 +3404,11 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                    __func__));
                         errcode = -1;
                 } else if ((doff < SDPCM_HDRLEN) ||
-                           (doff > (PKTLEN(pfirst) - SDPCM_HDRLEN))) {
+                           (doff > (pfirst->len - SDPCM_HDRLEN))) {
                         DHD_ERROR(("%s (superframe): Bad data offset %d: HW %d "
                                 "pkt %d min %d\n",
                                 __func__, doff, sublen,
-                                PKTLEN(pfirst), SDPCM_HDRLEN));
+                                pfirst->len, SDPCM_HDRLEN));
                         errcode = -1;
                 }
 
@@ -3424,14 +3429,14 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                 bus->tx_max = txmax;
 
                 /* Remove superframe header, remember offset */
-                PKTPULL(pfirst, doff);
+                skb_pull(pfirst, doff);
                 sfdoff = doff;
 
                 /* Validate all the subframe headers */
                 for (num = 0, pnext = pfirst; pnext && !errcode;
-                     num++, pnext = PKTNEXT(pnext)) {
-                        dptr = (u8 *) PKTDATA(pnext);
-                        dlen = (u16) PKTLEN(pnext);
+                     num++, pnext = pnext->next) {
+                        dptr = (u8 *) (pnext->data);
+                        dlen = (u16) (pnext->len);
                         sublen = ltoh16_ua(dptr);
                         check = ltoh16_ua(dptr + sizeof(u16));
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
@@ -3469,13 +3474,13 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                  a couple retries */
                         if (bus->glomerr++ < 3) {
                                 /* Restore superframe header space */
-                                PKTPUSH(pfirst, sfdoff);
+                                skb_push(pfirst, sfdoff);
                                 dhdsdio_rxfail(bus, true, true);
                         } else {
                                 bus->glomerr = 0;
                                 dhdsdio_rxfail(bus, true, false);
                                 dhd_os_sdlock_rxq(bus->dhd);
-                                PKTFREE(osh, bus->glom, false);
+                                pkt_buf_free_skb(osh, bus->glom, false);
                                 dhd_os_sdunlock_rxq(bus->dhd);
                                 bus->rxglomfail++;
                                 bus->glom = NULL;
@@ -3491,10 +3496,10 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 
                 dhd_os_sdlock_rxq(bus->dhd);
                 for (num = 0; pfirst; rxseq++, pfirst = pnext) {
-                        pnext = PKTNEXT(pfirst);
-                        PKTSETNEXT(pfirst, NULL);
+                        pnext = pfirst->next;
+                        pfirst->next = NULL;
 
-                        dptr = (u8 *) PKTDATA(pfirst);
+                        dptr = (u8 *) (pfirst->data);
                         sublen = ltoh16_ua(dptr);
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
                         seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]);
@@ -3502,8 +3507,8 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 
                         DHD_GLOM(("%s: Get subframe %d, %p(%p/%d), sublen %d "
                                 "chan %d seq %d\n",
-                                __func__, num, pfirst, PKTDATA(pfirst),
-                                PKTLEN(pfirst), sublen, chan, seq));
+                                __func__, num, pfirst, pfirst->data,
+                                pfirst->len, sublen, chan, seq));
 
                         ASSERT((chan == SDPCM_DATA_CHANNEL)
                                || (chan == SDPCM_EVENT_CHANNEL));
@@ -3519,13 +3524,13 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                 prhex("Rx Subframe Data", dptr, dlen);
 #endif
 
-                        PKTSETLEN(pfirst, sublen);
-                        PKTPULL(pfirst, doff);
+                        __skb_trim(pfirst, sublen);
+                        skb_pull(pfirst, doff);
 
-                        if (PKTLEN(pfirst) == 0) {
-                                PKTFREE(bus->dhd->osh, pfirst, false);
+                        if (pfirst->len == 0) {
+                                pkt_buf_free_skb(bus->dhd->osh, pfirst, false);
                                 if (plast) {
-                                        PKTSETNEXT(plast, pnext);
+                                        plast->next = pnext;
                                 } else {
                                         ASSERT(save_pfirst == pfirst);
                                         save_pfirst = pnext;
@@ -3536,9 +3541,9 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                                 DHD_ERROR(("%s: rx protocol error\n",
                                            __func__));
                                 bus->dhd->rx_errors++;
-                                PKTFREE(osh, pfirst, false);
+                                pkt_buf_free_skb(osh, pfirst, false);
                                 if (plast) {
-                                        PKTSETNEXT(plast, pnext);
+                                        plast->next = pnext;
                                 } else {
                                         ASSERT(save_pfirst == pfirst);
                                         save_pfirst = pnext;
@@ -3548,7 +3553,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 
                         /* this packet will go up, link back into
                                  chain and count it */
-                        PKTSETNEXT(pfirst, pnext);
+                        pfirst->next = pnext;
                         plast = pfirst;
                         num++;
 
@@ -3556,11 +3561,11 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
                         if (DHD_GLOM_ON()) {
                                 DHD_GLOM(("%s subframe %d to stack, %p(%p/%d) "
                                 "nxt/lnk %p/%p\n",
-                                __func__, num, pfirst, PKTDATA(pfirst),
-                                PKTLEN(pfirst), PKTNEXT(pfirst),
-                                PKTLINK(pfirst)));
-                                prhex("", (u8 *) PKTDATA(pfirst),
-                                      min_t(int, PKTLEN(pfirst), 32));
+                                __func__, num, pfirst, pfirst->data,
+                                pfirst->len, pfirst->next,
+                                pfirst->prev));
+                                prhex("", (u8 *) pfirst->data,
+                                      min_t(int, pfirst->len, 32));
                         }
 #endif                          /* DHD_DEBUG */
                 }
@@ -3580,7 +3585,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 /* Return true if there may be more frames to read */
 static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 {
-        osl_t *osh = bus->dhd->osh;
+        struct osl_info *osh = bus->dhd->osh;
         bcmsdh_info_t *sdh = bus->sdh;
 
         u16 len, check; /* Extracted hardware header fields */
@@ -3588,7 +3593,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
         u8 fcbits;              /* Extracted fcbits from software header */
         u8 delta;
 
-        void *pkt;              /* Packet for event or data frames */
+        struct sk_buff *pkt;            /* Packet for event or data frames */
         u16 pad;                /* Number of pad bytes to read */
         u16 rdlen;              /* Total number of bytes to read */
         u8 rxseq;               /* Next sequence number to expect */
@@ -3675,7 +3680,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                          */
                         /* Allocate a packet buffer */
                         dhd_os_sdlock_rxq(bus->dhd);
-                        pkt = PKTGET(osh, rdlen + DHD_SDALIGN, false);
+                        pkt = pkt_buf_get_skb(osh, rdlen + DHD_SDALIGN);
                         if (!pkt) {
                                 if (bus->bus == SPI_BUS) {
                                         bus->usebufpool = false;
@@ -3721,7 +3726,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                                 } else {
                                         /* Give up on data,
                                         request rtx of events */
-                                        DHD_ERROR(("%s (nextlen): PKTGET failed: len %d rdlen %d " "expected rxseq %d\n",
+                                        DHD_ERROR(("%s (nextlen): pkt_buf_get_skb failed: len %d rdlen %d " "expected rxseq %d\n",
                                                 __func__, len, rdlen, rxseq));
                                         /* Just go try again w/normal
                                         header read */
@@ -3732,9 +3737,9 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                                 if (bus->bus == SPI_BUS)
                                         bus->usebufpool = true;
 
-                                ASSERT(!PKTLINK(pkt));
+                                ASSERT(!(pkt->prev));
                                 PKTALIGN(osh, pkt, rdlen, DHD_SDALIGN);
-                                rxbuf = (u8 *) PKTDATA(pkt);
+                                rxbuf = (u8 *) (pkt->data);
                                 /* Read the entire frame */
                                 sdret =
                                     dhd_bcmsdh_recv_buf(bus,
@@ -3748,7 +3753,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                                 if (sdret < 0) {
                                         DHD_ERROR(("%s (nextlen): read %d bytes failed: %d\n",
                                                 __func__, rdlen, sdret));
-                                        PKTFREE(bus->dhd->osh, pkt, false);
+                                        pkt_buf_free_skb(bus->dhd->osh, pkt, false);
                                         bus->dhd->rx_errors++;
                                         dhd_os_sdunlock_rxq(bus->dhd);
                                         /* Force retry w/normal header read.
@@ -3896,7 +3901,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                                                              doff);
                                         if (bus->usebufpool) {
                                                 dhd_os_sdlock_rxq(bus->dhd);
-                                                PKTFREE(bus->dhd->osh, pkt,
+                                                pkt_buf_free_skb(bus->dhd->osh, pkt,
                                                         false);
                                                 dhd_os_sdunlock_rxq(bus->dhd);
                                         }
@@ -4086,10 +4091,10 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                 }
 
                 dhd_os_sdlock_rxq(bus->dhd);
-                pkt = PKTGET(osh, (rdlen + firstread + DHD_SDALIGN), false);
+                pkt = pkt_buf_get_skb(osh, (rdlen + firstread + DHD_SDALIGN));
                 if (!pkt) {
                         /* Give up on data, request rtx of events */
-                        DHD_ERROR(("%s: PKTGET failed: rdlen %d chan %d\n",
+                        DHD_ERROR(("%s: pkt_buf_get_skb failed: rdlen %d chan %d\n",
                                    __func__, rdlen, chan));
                         bus->dhd->rx_dropped++;
                         dhd_os_sdunlock_rxq(bus->dhd);
@@ -4098,17 +4103,17 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                 }
                 dhd_os_sdunlock_rxq(bus->dhd);
 
-                ASSERT(!PKTLINK(pkt));
+                ASSERT(!(pkt->prev));
 
                 /* Leave room for what we already read, and align remainder */
-                ASSERT(firstread < (PKTLEN(pkt)));
-                PKTPULL(pkt, firstread);
+                ASSERT(firstread < pkt->len);
+                skb_pull(pkt, firstread);
                 PKTALIGN(osh, pkt, rdlen, DHD_SDALIGN);
 
                 /* Read the remaining frame data */
                 sdret =
                     dhd_bcmsdh_recv_buf(bus, bcmsdh_cur_sbwad(sdh), SDIO_FUNC_2,
-                                        F2SYNC, ((u8 *) PKTDATA(pkt)), rdlen,
+                                        F2SYNC, ((u8 *) (pkt->data)), rdlen,
                                         pkt, NULL, NULL);
                 bus->f2rxdata++;
                 ASSERT(sdret != BCME_PENDING);
@@ -4122,7 +4127,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                                        ? "data" : "test")),
                                    sdret));
                         dhd_os_sdlock_rxq(bus->dhd);
-                        PKTFREE(bus->dhd->osh, pkt, false);
+                        pkt_buf_free_skb(bus->dhd->osh, pkt, false);
                         dhd_os_sdunlock_rxq(bus->dhd);
                         bus->dhd->rx_errors++;
                         dhdsdio_rxfail(bus, true, RETRYCHAN(chan));
@@ -4130,12 +4135,12 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
                 }
 
                 /* Copy the already-read portion */
-                PKTPUSH(pkt, firstread);
-                bcopy(bus->rxhdr, PKTDATA(pkt), firstread);
+                skb_push(pkt, firstread);
+                bcopy(bus->rxhdr, pkt->data, firstread);
 
 #ifdef DHD_DEBUG
                 if (DHD_BYTES_ON() && DHD_DATA_ON())
-                        prhex("Rx Data", PKTDATA(pkt), len);
+                        prhex("Rx Data", pkt->data, len);
 #endif
 
 deliver:
@@ -4146,12 +4151,12 @@ deliver:
                                         __func__, len));
 #ifdef DHD_DEBUG
                                 if (DHD_GLOM_ON()) {
-                                        prhex("Glom Data", PKTDATA(pkt), len);
+                                        prhex("Glom Data", pkt->data, len);
                                 }
 #endif
-                                PKTSETLEN(pkt, len);
+                                __skb_trim(pkt, len);
                                 ASSERT(doff == SDPCM_HDRLEN);
-                                PKTPULL(pkt, SDPCM_HDRLEN);
+                                skb_pull(pkt, SDPCM_HDRLEN);
                                 bus->glomd = pkt;
                         } else {
                                 DHD_ERROR(("%s: glom superframe w/o "
@@ -4162,8 +4167,8 @@ deliver:
                 }
 
                 /* Fill in packet len and prio, deliver upward */
-                PKTSETLEN(pkt, len);
-                PKTPULL(pkt, doff);
+                __skb_trim(pkt, len);
+                skb_pull(pkt, doff);
 
 #ifdef SDTEST
                 /* Test channel packets are processed separately */
@@ -4173,15 +4178,15 @@ deliver:
                 }
 #endif                          /* SDTEST */
 
-                if (PKTLEN(pkt) == 0) {
+                if (pkt->len == 0) {
                         dhd_os_sdlock_rxq(bus->dhd);
-                        PKTFREE(bus->dhd->osh, pkt, false);
+                        pkt_buf_free_skb(bus->dhd->osh, pkt, false);
                         dhd_os_sdunlock_rxq(bus->dhd);
                         continue;
                 } else if (dhd_prot_hdrpull(bus->dhd, &ifidx, pkt) != 0) {
                         DHD_ERROR(("%s: rx protocol error\n", __func__));
                         dhd_os_sdlock_rxq(bus->dhd);
-                        PKTFREE(bus->dhd->osh, pkt, false);
+                        pkt_buf_free_skb(bus->dhd->osh, pkt, false);
                         dhd_os_sdunlock_rxq(bus->dhd);
                         bus->dhd->rx_errors++;
                         continue;
@@ -4626,11 +4631,11 @@ static void dhdsdio_pktgen_init(dhd_bus_t *bus)
 
 static void dhdsdio_pktgen(dhd_bus_t *bus)
 {
-        void *pkt;
+        struct sk_buff *pkt;
         u8 *data;
         uint pktcount;
         uint fillbyte;
-        osl_t *osh = bus->dhd->osh;
+        struct osl_info *osh = bus->dhd->osh;
         u16 len;
 
         /* Display current count if appropriate */
@@ -4658,16 +4663,16 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 
                 /* Allocate an appropriate-sized packet */
                 len = bus->pktgen_len;
-                pkt = PKTGET(osh,
+                pkt = pkt_buf_get_skb(osh,
                         (len + SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN),
                         true);
                 if (!pkt) {
-                        DHD_ERROR(("%s: PKTGET failed!\n", __func__));
+                        DHD_ERROR(("%s: pkt_buf_get_skb failed!\n", __func__));
                         break;
                 }
                 PKTALIGN(osh, pkt, (len + SDPCM_HDRLEN + SDPCM_TEST_HDRLEN),
                          DHD_SDALIGN);
-                data = (u8 *) PKTDATA(pkt) + SDPCM_HDRLEN;
+                data = (u8 *) (pkt->data) + SDPCM_HDRLEN;
 
                 /* Write test header cmd and extra based on mode */
                 switch (bus->pktgen_mode) {
@@ -4689,7 +4694,7 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
                 default:
                         DHD_ERROR(("Unrecognized pktgen mode %d\n",
                                    bus->pktgen_mode));
-                        PKTFREE(osh, pkt, true);
+                        pkt_buf_free_skb(osh, pkt, true);
                         bus->pktgen_count = 0;
                         return;
                 }
@@ -4706,9 +4711,9 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 
 #ifdef DHD_DEBUG
                 if (DHD_BYTES_ON() && DHD_DATA_ON()) {
-                        data = (u8 *) PKTDATA(pkt) + SDPCM_HDRLEN;
+                        data = (u8 *) (pkt->data) + SDPCM_HDRLEN;
                         prhex("dhdsdio_pktgen: Tx Data", data,
-                              PKTLEN(pkt) - SDPCM_HDRLEN);
+                              pkt->len - SDPCM_HDRLEN);
                 }
 #endif
 
@@ -4733,19 +4738,19 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 
 static void dhdsdio_sdtest_set(dhd_bus_t *bus, bool start)
 {
-        void *pkt;
+        struct sk_buff *pkt;
         u8 *data;
-        osl_t *osh = bus->dhd->osh;
+        struct osl_info *osh = bus->dhd->osh;
 
         /* Allocate the packet */
-        pkt = PKTGET(osh, SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN,
+        pkt = pkt_buf_get_skb(osh, SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN,
                         true);
         if (!pkt) {
-                DHD_ERROR(("%s: PKTGET failed!\n", __func__));
+                DHD_ERROR(("%s: pkt_buf_get_skb failed!\n", __func__));
                 return;
         }
         PKTALIGN(osh, pkt, (SDPCM_HDRLEN + SDPCM_TEST_HDRLEN), DHD_SDALIGN);
-        data = (u8 *) PKTDATA(pkt) + SDPCM_HDRLEN;
+        data = (u8 *) (pkt->data) + SDPCM_HDRLEN;
 
         /* Fill in the test header */
         *data++ = SDPCM_TEST_SEND;
@@ -4758,9 +4763,9 @@ static void dhdsdio_sdtest_set(dhd_bus_t *bus, bool start)
                 bus->pktgen_fail++;
 }
 
-static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
+static void dhdsdio_testrcv(dhd_bus_t *bus, struct sk_buff *pkt, uint seq)
 {
-        osl_t *osh = bus->dhd->osh;
+        struct osl_info *osh = bus->dhd->osh;
         u8 *data;
         uint pktlen;
 
@@ -4770,16 +4775,16 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
         u16 offset;
 
         /* Check for min length */
-        pktlen = PKTLEN(pkt);
+        pktlen = pkt->len;
         if (pktlen < SDPCM_TEST_HDRLEN) {
                 DHD_ERROR(("dhdsdio_restrcv: toss runt frame, pktlen %d\n",
                            pktlen));
-                PKTFREE(osh, pkt, false);
+                pkt_buf_free_skb(osh, pkt, false);
                 return;
         }
 
         /* Extract header fields */
-        data = PKTDATA(pkt);
+        data = pkt->data;
         cmd = *data++;
         extra = *data++;
         len = *data++;
@@ -4792,7 +4797,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
                         DHD_ERROR(("dhdsdio_testrcv: frame length mismatch, "
                                 "pktlen %d seq %d" " cmd %d extra %d len %d\n",
                                 pktlen, seq, cmd, extra, len));
-                        PKTFREE(osh, pkt, false);
+                        pkt_buf_free_skb(osh, pkt, false);
                         return;
                 }
         }
@@ -4802,19 +4807,19 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
         case SDPCM_TEST_ECHOREQ:
                 /* Rx->Tx turnaround ok (even on NDIS w/current
                          implementation) */
-                *(u8 *) (PKTDATA(pkt)) = SDPCM_TEST_ECHORSP;
+                *(u8 *) (pkt->data) = SDPCM_TEST_ECHORSP;
                 if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, true) == 0) {
                         bus->pktgen_sent++;
                 } else {
                         bus->pktgen_fail++;
-                        PKTFREE(osh, pkt, false);
+                        pkt_buf_free_skb(osh, pkt, false);
                 }
                 bus->pktgen_rcvd++;
                 break;
 
         case SDPCM_TEST_ECHORSP:
                 if (bus->ext_loop) {
-                        PKTFREE(osh, pkt, false);
+                        pkt_buf_free_skb(osh, pkt, false);
                         bus->pktgen_rcvd++;
                         break;
                 }
@@ -4827,12 +4832,12 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
                                 break;
                         }
                 }
-                PKTFREE(osh, pkt, false);
+                pkt_buf_free_skb(osh, pkt, false);
                 bus->pktgen_rcvd++;
                 break;
 
         case SDPCM_TEST_DISCARD:
-                PKTFREE(osh, pkt, false);
+                pkt_buf_free_skb(osh, pkt, false);
                 bus->pktgen_rcvd++;
                 break;
 
@@ -4842,7 +4847,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
                 DHD_INFO(("dhdsdio_testrcv: unsupported or unknown command, "
                         "pktlen %d seq %d" " cmd %d extra %d len %d\n",
                         pktlen, seq, cmd, extra, len));
-                PKTFREE(osh, pkt, false);
+                pkt_buf_free_skb(osh, pkt, false);
                 break;
         }
 
@@ -4960,7 +4965,7 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen)
         dhd_bus_t *bus = dhdp->bus;
         u32 addr, val;
         int rv;
-        void *pkt;
+        struct sk_buff *pkt;
 
         /* Address could be zero if CONSOLE := 0 in dongle Makefile */
         if (bus->console_addr == 0)
@@ -5003,7 +5008,7 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen)
         /* Bump dongle by sending an empty event pkt.
          * sdpcm_sendup (RX) checks for virtual console input.
          */
-        pkt = PKTGET(bus->dhd->osh, 4 + SDPCM_RESERVE, true);
+        pkt = pkt_buf_get_skb(bus->dhd->osh, 4 + SDPCM_RESERVE);
         if ((pkt != NULL) && bus->clkstate == CLK_AVAIL)
                 dhdsdio_txpkt(bus, pkt, SDPCM_EVENT_CHANNEL, true);
 
@@ -5061,7 +5066,7 @@ static bool dhdsdio_chipmatch(u16 chipid)
 
 static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no,
                            u16 slot, u16 func, uint bustype, void *regsva,
-                           osl_t *osh, void *sdh)
+                           struct osl_info *osh, void *sdh)
 {
         int ret;
         dhd_bus_t *bus;
@@ -5220,8 +5225,8 @@ fail:
 }
 
 static bool
-dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva,
-                     u16 devid)
+dhdsdio_probe_attach(struct dhd_bus *bus, struct osl_info *osh, void *sdh,
+                        void *regsva, u16 devid)
 {
         u8 clkctl = 0;
         int err = 0;
@@ -5280,7 +5285,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva,
                                         "failed\n", fn));
                                 break;
                         }
-                        bzero(cis[fn], SBSDIO_CIS_SIZE_LIMIT);
+                        memset(cis[fn], 0, SBSDIO_CIS_SIZE_LIMIT);
 
                         err = bcmsdh_cis_read(sdh, fn, cis[fn],
                                                 SBSDIO_CIS_SIZE_LIMIT);
@@ -5378,7 +5383,8 @@ fail:
         return false;
 }
 
-static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh)
+static bool dhdsdio_probe_malloc(dhd_bus_t *bus, struct osl_info *osh,
+                                 void *sdh)
 {
         DHD_TRACE(("%s: Enter\n", __func__));
 
@@ -5419,7 +5425,7 @@ fail:
         return false;
 }
 
-static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh)
+static bool dhdsdio_probe_init(dhd_bus_t *bus, struct osl_info *osh, void *sdh)
 {
         s32 fnum;
 
@@ -5496,7 +5502,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh)
 }
 
 bool
-dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh,
+dhd_bus_download_firmware(struct dhd_bus *bus, struct osl_info *osh,
                           char *fw_path, char *nv_path)
 {
         bool ret;
@@ -5509,7 +5515,7 @@ dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh,
 }
 
 static bool
-dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh)
+dhdsdio_download_firmware(struct dhd_bus *bus, struct osl_info *osh, void *sdh)
 {
         bool ret;
 
@@ -5524,7 +5530,7 @@ dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh)
 }
 
 /* Detach and free everything */
-static void dhdsdio_release(dhd_bus_t *bus, osl_t *osh)
+static void dhdsdio_release(dhd_bus_t *bus, struct osl_info *osh)
 {
         DHD_TRACE(("%s: Enter\n", __func__));
 
@@ -5554,7 +5560,7 @@ static void dhdsdio_release(dhd_bus_t *bus, osl_t *osh)
         DHD_TRACE(("%s: Disconnected\n", __func__));
 }
 
-static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh)
+static void dhdsdio_release_malloc(dhd_bus_t *bus, struct osl_info *osh)
 {
         DHD_TRACE(("%s: Enter\n", __func__));
 
@@ -5573,7 +5579,7 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh)
         }
 }
 
-static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t *osh)
+static void dhdsdio_release_dongle(dhd_bus_t *bus, struct osl_info *osh)
 {
         DHD_TRACE(("%s: Enter\n", __func__));
 
@@ -5986,7 +5992,7 @@ err:
 
 static int
 dhd_bcmsdh_recv_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags,
-                    u8 *buf, uint nbytes, void *pkt,
+                    u8 *buf, uint nbytes, struct sk_buff *pkt,
                     bcmsdh_cmplt_fn_t complete, void *handle)
 {
         int status;
@@ -6000,7 +6006,7 @@ dhd_bcmsdh_recv_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags,
 
 static int
 dhd_bcmsdh_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags,
-                    u8 *buf, uint nbytes, void *pkt,
+                    u8 *buf, uint nbytes, struct sk_buff *pkt,
                     bcmsdh_cmplt_fn_t complete, void *handle)
 {
         return bcmsdh_send_buf
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index ea0825238d53..991463f4a7f4 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,7 +16,6 @@
 
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
-#include <linuxver.h>
 #include <osl.h>
 
 #include <bcmutils.h>
@@ -30,10 +29,6 @@
 #include <dhdioctl.h>
 #include <wlioctl.h>
 
-#include <proto/ethernet.h>
-#include <dngl_stats.h>
-#include <dhd.h>
-
 #include <linux/kthread.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
@@ -342,7 +337,7 @@ static void wl_debugfs_remove_netdev(struct wl_priv *wl);
         struct wl_iface *ci;                                            \
         if (unlikely(!(wl_cfg80211_dev &&                               \
                 (ci = wl_get_drvdata(wl_cfg80211_dev))))) {             \
-                WL_ERR(("wl_cfg80211_dev is unavailable\n"));           \
+                WL_ERR("wl_cfg80211_dev is unavailable\n");             \
                 BUG();                                                  \
         }                                                               \
         ci_to_wl(ci);                                                   \
@@ -352,8 +347,8 @@ static void wl_debugfs_remove_netdev(struct wl_priv *wl);
 do {                                                                    \
         struct wl_priv *wl = wiphy_to_wl(wiphy);                        \
         if (unlikely(!test_bit(WL_STATUS_READY, &wl->status))) {        \
-                WL_INFO(("device is not ready : status (%d)\n",         \
-                        (int)wl->status));                              \
+                WL_INFO("device is not ready : status (%d)\n",          \
+                        (int)wl->status);                               \
                 return -EIO;                                            \
         }                                                               \
 } while (0)
@@ -618,8 +613,8 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
         switch (type) {
         case NL80211_IFTYPE_MONITOR:
         case NL80211_IFTYPE_WDS:
-                WL_ERR(("type (%d) : currently we do not support this type\n",
-                        type));
+                WL_ERR("type (%d) : currently we do not support this type\n",
+                       type);
                 return -EOPNOTSUPP;
         case NL80211_IFTYPE_ADHOC:
                 wl->conf->mode = WL_MODE_IBSS;
@@ -635,15 +630,15 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
         ap = htod32(ap);
         wdev = ndev->ieee80211_ptr;
         wdev->iftype = type;
-        WL_DBG(("%s : ap (%d), infra (%d)\n", ndev->name, ap, infra));
+        WL_DBG("%s : ap (%d), infra (%d)\n", ndev->name, ap, infra);
         err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_INFRA error (%d)\n", err));
+                WL_ERR("WLC_SET_INFRA error (%d)\n", err);
                 return err;
         }
         err = wl_dev_ioctl(ndev, WLC_SET_AP, &ap, sizeof(ap));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_AP error (%d)\n", err));
+                WL_ERR("WLC_SET_AP error (%d)\n", err);
                 return err;
         }
 
@@ -653,7 +648,7 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
 
 static void wl_iscan_prep(struct wl_scan_params *params, struct wlc_ssid *ssid)
 {
-        memcpy(&params->bssid, &ether_bcast, ETHER_ADDR_LEN);
+        memcpy(&params->bssid, &ether_bcast, ETH_ALEN);
         params->bss_type = DOT11_BSSTYPE_ANY;
         params->scan_type = 0;
         params->nprobes = -1;
@@ -705,7 +700,7 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action)
 
         if (ssid && ssid->SSID_len)
                 params_size += sizeof(struct wlc_ssid);
-        params = (struct wl_iscan_params *)kzalloc(params_size, GFP_KERNEL);
+        params = kzalloc(params_size, GFP_KERNEL);
         if (unlikely(!params))
                 return -ENOMEM;
         memset(params, 0, params_size);
@@ -722,9 +717,9 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action)
                                 iscan->ioctl_buf, WLC_IOCTL_SMLEN);
         if (unlikely(err)) {
                 if (err == -EBUSY) {
-                        WL_INFO(("system busy : iscan canceled\n"));
+                        WL_INFO("system busy : iscan canceled\n");
                 } else {
-                        WL_ERR(("error (%d)\n", err));
+                        WL_ERR("error (%d)\n", err);
                 }
         }
         kfree(params);
@@ -748,7 +743,7 @@ static s32 wl_do_iscan(struct wl_priv *wl)
         err = wl_dev_ioctl(wl_to_ndev(wl), WLC_SET_PASSIVE_SCAN,
                         &passive_scan, sizeof(passive_scan));
         if (unlikely(err)) {
-                WL_DBG(("error (%d)\n", err));
+                WL_DBG("error (%d)\n", err);
                 return err;
         }
         wl_set_mpc(ndev, 0);
@@ -774,12 +769,12 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
         s32 err = 0;
 
         if (unlikely(test_bit(WL_STATUS_SCANNING, &wl->status))) {
-                WL_ERR(("Scanning already : status (%d)\n", (int)wl->status));
+                WL_ERR("Scanning already : status (%d)\n", (int)wl->status);
                 return -EAGAIN;
         }
         if (unlikely(test_bit(WL_STATUS_SCAN_ABORTING, &wl->status))) {
-                WL_ERR(("Scanning being aborted : status (%d)\n",
-                        (int)wl->status));
+                WL_ERR("Scanning being aborted : status (%d)\n",
+                       (int)wl->status);
                 return -EAGAIN;
         }
 
@@ -811,26 +806,26 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
                 else
                         goto scan_out;
         } else {
-                WL_DBG(("ssid \"%s\", ssid_len (%d)\n",
-                        ssids->ssid, ssids->ssid_len));
+                WL_DBG("ssid \"%s\", ssid_len (%d)\n",
+                       ssids->ssid, ssids->ssid_len);
                 memset(&sr->ssid, 0, sizeof(sr->ssid));
                 sr->ssid.SSID_len =
                             min_t(u8, sizeof(sr->ssid.SSID), ssids->ssid_len);
                 if (sr->ssid.SSID_len) {
                         memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len);
                         sr->ssid.SSID_len = htod32(sr->ssid.SSID_len);
-                        WL_DBG(("Specific scan ssid=\"%s\" len=%d\n",
-                                        sr->ssid.SSID, sr->ssid.SSID_len));
+                        WL_DBG("Specific scan ssid=\"%s\" len=%d\n",
+                               sr->ssid.SSID, sr->ssid.SSID_len);
                         spec_scan = true;
                 } else {
-                        WL_DBG(("Broadcast scan\n"));
+                        WL_DBG("Broadcast scan\n");
                 }
-                WL_DBG(("sr->ssid.SSID_len (%d)\n", sr->ssid.SSID_len));
+                WL_DBG("sr->ssid.SSID_len (%d)\n", sr->ssid.SSID_len);
                 passive_scan = wl->active_scan ? 0 : 1;
                 err = wl_dev_ioctl(ndev, WLC_SET_PASSIVE_SCAN,
                                 &passive_scan, sizeof(passive_scan));
                 if (unlikely(err)) {
-                        WL_ERR(("WLC_SET_PASSIVE_SCAN error (%d)\n", err));
+                        WL_ERR("WLC_SET_PASSIVE_SCAN error (%d)\n", err);
                         goto scan_out;
                 }
                 wl_set_mpc(ndev, 0);
@@ -838,10 +833,10 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
                                 sizeof(sr->ssid));
                 if (err) {
                         if (err == -EBUSY) {
-                                WL_INFO(("system busy : scan for \"%s\" "
-                                        "canceled\n", sr->ssid.SSID));
+                                WL_INFO("system busy : scan for \"%s\" canceled\n",
+                                        sr->ssid.SSID);
                         } else {
-                                WL_ERR(("WLC_SCAN error (%d)\n", err));
+                                WL_ERR("WLC_SCAN error (%d)\n", err);
                         }
                         wl_set_mpc(ndev, 1);
                         goto scan_out;
@@ -865,7 +860,7 @@ wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
         CHECK_SYS_UP();
         err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
         if (unlikely(err)) {
-                WL_DBG(("scan error (%d)\n", err));
+                WL_DBG("scan error (%d)\n", err);
                 return err;
         }
 
@@ -884,7 +879,7 @@ static s32 wl_dev_intvar_set(struct net_device *dev, s8 *name, s32 val)
 
         err = wl_dev_ioctl(dev, WLC_SET_VAR, buf, len);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
         }
 
         return err;
@@ -907,7 +902,7 @@ wl_dev_intvar_get(struct net_device *dev, s8 *name, s32 *retval)
         BUG_ON(unlikely(!len));
         err = wl_dev_ioctl(dev, WLC_GET_VAR, &var, len);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
         }
         *retval = dtoh32(var.val);
 
@@ -920,7 +915,7 @@ static s32 wl_set_rts(struct net_device *dev, u32 rts_threshold)
 
         err = wl_dev_intvar_set(dev, "rtsthresh", rts_threshold);
         if (unlikely(err)) {
-                WL_ERR(("Error (%d)\n", err));
+                WL_ERR("Error (%d)\n", err);
                 return err;
         }
         return err;
@@ -932,7 +927,7 @@ static s32 wl_set_frag(struct net_device *dev, u32 frag_threshold)
 
         err = wl_dev_intvar_set(dev, "fragthresh", frag_threshold);
         if (unlikely(err)) {
-                WL_ERR(("Error (%d)\n", err));
+                WL_ERR("Error (%d)\n", err);
                 return err;
         }
         return err;
@@ -946,7 +941,7 @@ static s32 wl_set_retry(struct net_device *dev, u32 retry, bool l)
         retry = htod32(retry);
         err = wl_dev_ioctl(dev, cmd, &retry, sizeof(retry));
         if (unlikely(err)) {
-                WL_ERR(("cmd (%d) , error (%d)\n", cmd, err));
+                WL_ERR("cmd (%d) , error (%d)\n", cmd, err);
                 return err;
         }
         return err;
@@ -1006,7 +1001,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
 
         CHECK_SYS_UP();
         if (params->bssid) {
-                WL_ERR(("Invalid bssid\n"));
+                WL_ERR("Invalid bssid\n");
                 return -EOPNOTSUPP;
         }
         bss = cfg80211_get_ibss(wiphy, NULL, params->ssid, params->ssid_len);
@@ -1032,7 +1027,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
         }
         if (bss) {
                 wl->ibss_starter = false;
-                WL_DBG(("Found IBSS\n"));
+                WL_DBG("Found IBSS\n");
         } else {
                 wl->ibss_starter = true;
         }
@@ -1049,14 +1044,14 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
         join_params.ssid.SSID_len = htod32(params->ssid_len);
         if (params->bssid)
                 memcpy(&join_params.params.bssid, params->bssid,
-                       ETHER_ADDR_LEN);
+                       ETH_ALEN);
         else
-                memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
+                memset(&join_params.params.bssid, 0, ETH_ALEN);
 
         err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params,
                         sizeof(join_params));
         if (unlikely(err)) {
-                WL_ERR(("Error (%d)\n", err));
+                WL_ERR("Error (%d)\n", err);
                 return err;
         }
         return err;
@@ -1087,10 +1082,10 @@ wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme)
                 val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;
         else
                 val = WPA_AUTH_DISABLED;
-        WL_DBG(("setting wpa_auth to 0x%0x\n", val));
+        WL_DBG("setting wpa_auth to 0x%0x\n", val);
         err = wl_dev_intvar_set(dev, "wpa_auth", val);
         if (unlikely(err)) {
-                WL_ERR(("set wpa_auth failed (%d)\n", err));
+                WL_ERR("set wpa_auth failed (%d)\n", err);
                 return err;
         }
         sec = wl_read_prof(wl, WL_PROF_SEC);
@@ -1109,27 +1104,27 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
         switch (sme->auth_type) {
         case NL80211_AUTHTYPE_OPEN_SYSTEM:
                 val = 0;
-                WL_DBG(("open system\n"));
+                WL_DBG("open system\n");
                 break;
         case NL80211_AUTHTYPE_SHARED_KEY:
                 val = 1;
-                WL_DBG(("shared key\n"));
+                WL_DBG("shared key\n");
                 break;
         case NL80211_AUTHTYPE_AUTOMATIC:
                 val = 2;
-                WL_DBG(("automatic\n"));
+                WL_DBG("automatic\n");
                 break;
         case NL80211_AUTHTYPE_NETWORK_EAP:
-                WL_DBG(("network eap\n"));
+                WL_DBG("network eap\n");
         default:
                 val = 2;
-                WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
+                WL_ERR("invalid auth type (%d)\n", sme->auth_type);
                 break;
         }
 
         err = wl_dev_intvar_set(dev, "auth", val);
         if (unlikely(err)) {
-                WL_ERR(("set auth failed (%d)\n", err));
+                WL_ERR("set auth failed (%d)\n", err);
                 return err;
         }
         sec = wl_read_prof(wl, WL_PROF_SEC);
@@ -1162,8 +1157,8 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme)
                         pval = AES_ENABLED;
                         break;
                 default:
-                        WL_ERR(("invalid cipher pairwise (%d)\n",
-                                sme->crypto.ciphers_pairwise[0]));
+                        WL_ERR("invalid cipher pairwise (%d)\n",
+                               sme->crypto.ciphers_pairwise[0]);
                         return -EINVAL;
                 }
         }
@@ -1183,16 +1178,16 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme)
                         gval = AES_ENABLED;
                         break;
                 default:
-                        WL_ERR(("invalid cipher group (%d)\n",
-                                sme->crypto.cipher_group));
+                        WL_ERR("invalid cipher group (%d)\n",
+                               sme->crypto.cipher_group);
                         return -EINVAL;
                 }
         }
 
-        WL_DBG(("pval (%d) gval (%d)\n", pval, gval));
+        WL_DBG("pval (%d) gval (%d)\n", pval, gval);
         err = wl_dev_intvar_set(dev, "wsec", pval | gval);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
 
@@ -1214,7 +1209,7 @@ wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme)
         if (sme->crypto.n_akm_suites) {
                 err = wl_dev_intvar_get(dev, "wpa_auth", &val);
                 if (unlikely(err)) {
-                        WL_ERR(("could not get wpa_auth (%d)\n", err));
+                        WL_ERR("could not get wpa_auth (%d)\n", err);
                         return err;
                 }
                 if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
@@ -1226,8 +1221,8 @@ wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme)
                                 val = WPA_AUTH_PSK;
                                 break;
                         default:
-                                WL_ERR(("invalid cipher group (%d)\n",
-                                        sme->crypto.cipher_group));
+                                WL_ERR("invalid cipher group (%d)\n",
+                                       sme->crypto.cipher_group);
                                 return -EINVAL;
                         }
                 } else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
@@ -1239,16 +1234,16 @@ wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme)
                                 val = WPA2_AUTH_PSK;
                                 break;
                         default:
-                                WL_ERR(("invalid cipher group (%d)\n",
-                                        sme->crypto.cipher_group));
+                                WL_ERR("invalid cipher group (%d)\n",
+                                       sme->crypto.cipher_group);
                                 return -EINVAL;
                         }
                 }
 
-                WL_DBG(("setting wpa_auth to %d\n", val));
+                WL_DBG("setting wpa_auth to %d\n", val);
                 err = wl_dev_intvar_set(dev, "wpa_auth", val);
                 if (unlikely(err)) {
-                        WL_ERR(("could not set wpa_auth (%d)\n", err));
+                        WL_ERR("could not set wpa_auth (%d)\n", err);
                         return err;
                 }
         }
@@ -1268,11 +1263,11 @@ wl_set_set_sharedkey(struct net_device *dev,
         s32 val;
         s32 err = 0;
 
-        WL_DBG(("key len (%d)\n", sme->key_len));
+        WL_DBG("key len (%d)\n", sme->key_len);
         if (sme->key_len) {
                 sec = wl_read_prof(wl, WL_PROF_SEC);
-                WL_DBG(("wpa_versions 0x%x cipher_pairwise 0x%x\n",
-                        sec->wpa_versions, sec->cipher_pairwise));
+                WL_DBG("wpa_versions 0x%x cipher_pairwise 0x%x\n",
+                       sec->wpa_versions, sec->cipher_pairwise);
                 if (!
                     (sec->wpa_versions & (NL80211_WPA_VERSION_1 |
                                           NL80211_WPA_VERSION_2))
@@ -1282,7 +1277,7 @@ wl_set_set_sharedkey(struct net_device *dev,
                         key.len = (u32) sme->key_len;
                         key.index = (u32) sme->key_idx;
                         if (unlikely(key.len > sizeof(key.data))) {
-                                WL_ERR(("Too long key length (%u)\n", key.len));
+                                WL_ERR("Too long key length (%u)\n", key.len);
                                 return -EINVAL;
                         }
                         memcpy(key.data, sme->key, key.len);
@@ -1295,27 +1290,27 @@ wl_set_set_sharedkey(struct net_device *dev,
                                 key.algo = CRYPTO_ALGO_WEP128;
                                 break;
                         default:
-                                WL_ERR(("Invalid algorithm (%d)\n",
-                                        sme->crypto.ciphers_pairwise[0]));
+                                WL_ERR("Invalid algorithm (%d)\n",
+                                       sme->crypto.ciphers_pairwise[0]);
                                 return -EINVAL;
                         }
                         /* Set the new key/index */
-                        WL_DBG(("key length (%d) key index (%d) algo (%d)\n",
-                                key.len, key.index, key.algo));
-                        WL_DBG(("key \"%s\"\n", key.data));
+                        WL_DBG("key length (%d) key index (%d) algo (%d)\n",
+                               key.len, key.index, key.algo);
+                        WL_DBG("key \"%s\"\n", key.data);
                         swap_key_from_BE(&key);
                         err = wl_dev_ioctl(dev, WLC_SET_KEY, &key,
                                         sizeof(key));
                         if (unlikely(err)) {
-                                WL_ERR(("WLC_SET_KEY error (%d)\n", err));
+                                WL_ERR("WLC_SET_KEY error (%d)\n", err);
                                 return err;
                         }
                         if (sec->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) {
-                                WL_DBG(("set auth_type to shared key\n"));
+                                WL_DBG("set auth_type to shared key\n");
                                 val = 1;        /* shared key */
                                 err = wl_dev_intvar_set(dev, "auth", val);
                                 if (unlikely(err)) {
-                                        WL_ERR(("set auth failed (%d)\n", err));
+                                        WL_ERR("set auth failed (%d)\n", err);
                                         return err;
                                 }
                         }
@@ -1337,15 +1332,15 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 
         CHECK_SYS_UP();
         if (unlikely(!sme->ssid)) {
-                WL_ERR(("Invalid ssid\n"));
+                WL_ERR("Invalid ssid\n");
                 return -EOPNOTSUPP;
         }
         if (chan) {
                 wl->channel = ieee80211_frequency_to_channel(chan->center_freq);
-                WL_DBG(("channel (%d), center_req (%d)\n", wl->channel,
-                        chan->center_freq));
+                WL_DBG("channel (%d), center_req (%d)\n",
+                       wl->channel, chan->center_freq);
         }
-        WL_DBG(("ie (%p), ie_len (%zd)\n", sme->ie, sme->ie_len));
+        WL_DBG("ie (%p), ie_len (%zd)\n", sme->ie, sme->ie_len);
         err = wl_set_wpa_version(dev, sme);
         if (unlikely(err))
                 return err;
@@ -1378,18 +1373,18 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
         memcpy(&join_params.ssid.SSID, sme->ssid, join_params.ssid.SSID_len);
         join_params.ssid.SSID_len = htod32(join_params.ssid.SSID_len);
         wl_update_prof(wl, NULL, &join_params.ssid, WL_PROF_SSID);
-        memcpy(&join_params.params.bssid, &ether_bcast, ETHER_ADDR_LEN);
+        memcpy(&join_params.params.bssid, &ether_bcast, ETH_ALEN);
 
         wl_ch_to_chanspec(wl->channel, &join_params, &join_params_size);
-        WL_DBG(("join_param_size %d\n", join_params_size));
+        WL_DBG("join_param_size %d\n", join_params_size);
 
         if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {
-                WL_DBG(("ssid \"%s\", len (%d)\n", join_params.ssid.SSID,
-                        join_params.ssid.SSID_len));
+                WL_DBG("ssid \"%s\", len (%d)\n",
+                       join_params.ssid.SSID, join_params.ssid.SSID_len);
         }
         err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
         set_bit(WL_STATUS_CONNECTING, &wl->status);
@@ -1406,17 +1401,17 @@ wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
         bool act = false;
         s32 err = 0;
 
-        WL_DBG(("Reason %d\n", reason_code));
+        WL_DBG("Reason %d\n", reason_code);
         CHECK_SYS_UP();
         act = *(bool *) wl_read_prof(wl, WL_PROF_ACT);
         if (likely(act)) {
                 scbval.val = reason_code;
-                memcpy(&scbval.ea, &wl->bssid, ETHER_ADDR_LEN);
+                memcpy(&scbval.ea, &wl->bssid, ETH_ALEN);
                 scbval.val = htod32(scbval.val);
                 err = wl_dev_ioctl(dev, WLC_DISASSOC, &scbval,
                                 sizeof(scb_val_t));
                 if (unlikely(err)) {
-                        WL_ERR(("error (%d)\n", err));
+                        WL_ERR("error (%d)\n", err);
                         return err;
                 }
         }
@@ -1441,13 +1436,13 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy,
                 break;
         case NL80211_TX_POWER_LIMITED:
                 if (dbm < 0) {
-                        WL_ERR(("TX_POWER_LIMITTED - dbm is negative\n"));
+                        WL_ERR("TX_POWER_LIMITED - dbm is negative\n");
                         return -EINVAL;
                 }
                 break;
         case NL80211_TX_POWER_FIXED:
                 if (dbm < 0) {
-                        WL_ERR(("TX_POWER_FIXED - dbm is negative..\n"));
+                        WL_ERR("TX_POWER_FIXED - dbm is negative\n");
                         return -EINVAL;
                 }
                 break;
@@ -1457,7 +1452,7 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy,
         disable = htod32(disable);
         err = wl_dev_ioctl(ndev, WLC_SET_RADIO, &disable, sizeof(disable));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_RADIO error (%d)\n", err));
+                WL_ERR("WLC_SET_RADIO error (%d)\n", err);
                 return err;
         }
 
@@ -1468,7 +1463,7 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy,
         err = wl_dev_intvar_set(ndev, "qtxpower",
                         (s32) (bcm_mw_to_qdbm(txpwrmw)));
         if (unlikely(err)) {
-                WL_ERR(("qtxpower error (%d)\n", err));
+                WL_ERR("qtxpower error (%d)\n", err);
                 return err;
         }
         wl->conf->tx_power = dbm;
@@ -1487,7 +1482,7 @@ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)
         CHECK_SYS_UP();
         err = wl_dev_intvar_get(ndev, "qtxpower", &txpwrdbm);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
         result = (u8) (txpwrdbm & ~WL_TXPWR_OVERRIDE);
@@ -1504,12 +1499,12 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev,
         s32 wsec;
         s32 err = 0;
 
-        WL_DBG(("key index (%d)\n", key_idx));
+        WL_DBG("key index (%d)\n", key_idx);
         CHECK_SYS_UP();
 
         err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec));
         if (unlikely(err)) {
-                WL_ERR(("WLC_GET_WSEC error (%d)\n", err));
+                WL_ERR("WLC_GET_WSEC error (%d)\n", err);
                 return err;
         }
         wsec = dtoh32(wsec);
@@ -1520,7 +1515,7 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev,
                 err = wl_dev_ioctl(dev, WLC_SET_KEY_PRIMARY, &index,
                                 sizeof(index));
                 if (unlikely(err)) {
-                        WL_ERR(("error (%d)\n", err));
+                        WL_ERR("error (%d)\n", err);
                 }
         }
         return err;
@@ -1537,8 +1532,8 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
         key.index = (u32) key_idx;
         /* Instead of bcast for ea address for default wep keys,
                  driver needs it to be Null */
-        if (!ETHER_ISMULTI(mac_addr))
-                memcpy((char *)&key.ea, (void *)mac_addr, ETHER_ADDR_LEN);
+        if (!is_multicast_ether_addr(mac_addr))
+                memcpy((char *)&key.ea, (void *)mac_addr, ETH_ALEN);
         key.len = (u32) params->key_len;
         /* check for key index change */
         if (key.len == 0) {
@@ -1546,16 +1541,16 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
                 swap_key_from_BE(&key);
                 err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
                 if (unlikely(err)) {
-                        WL_ERR(("key delete error (%d)\n", err));
+                        WL_ERR("key delete error (%d)\n", err);
                         return err;
                 }
         } else {
                 if (key.len > sizeof(key.data)) {
-                        WL_ERR(("Invalid key length (%d)\n", key.len));
+                        WL_ERR("Invalid key length (%d)\n", key.len);
                         return -EINVAL;
                 }
 
-                WL_DBG(("Setting the key index %d\n", key.index));
+                WL_DBG("Setting the key index %d\n", key.index);
                 memcpy(key.data, params->key, key.len);
 
                 if (params->cipher == WLAN_CIPHER_SUITE_TKIP) {
@@ -1579,26 +1574,26 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
                 switch (params->cipher) {
                 case WLAN_CIPHER_SUITE_WEP40:
                         key.algo = CRYPTO_ALGO_WEP1;
-                        WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_WEP40\n");
                         break;
                 case WLAN_CIPHER_SUITE_WEP104:
                         key.algo = CRYPTO_ALGO_WEP128;
-                        WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_WEP104\n");
                         break;
                 case WLAN_CIPHER_SUITE_TKIP:
                         key.algo = CRYPTO_ALGO_TKIP;
-                        WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_TKIP\n");
                         break;
                 case WLAN_CIPHER_SUITE_AES_CMAC:
                         key.algo = CRYPTO_ALGO_AES_CCM;
-                        WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_AES_CMAC\n");
                         break;
                 case WLAN_CIPHER_SUITE_CCMP:
                         key.algo = CRYPTO_ALGO_AES_CCM;
-                        WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_CCMP\n");
                         break;
                 default:
-                        WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
+                        WL_ERR("Invalid cipher (0x%x)\n", params->cipher);
                         return -EINVAL;
                 }
                 swap_key_from_BE(&key);
@@ -1606,7 +1601,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
                 dhd_wait_pend8021x(dev);
                 err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
                 if (unlikely(err)) {
-                        WL_ERR(("WLC_SET_KEY error (%d)\n", err));
+                        WL_ERR("WLC_SET_KEY error (%d)\n", err);
                         return err;
                 }
         }
@@ -1623,7 +1618,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         s32 wsec;
         s32 err = 0;
 
-        WL_DBG(("key index (%d)\n", key_idx));
+        WL_DBG("key index (%d)\n", key_idx);
         CHECK_SYS_UP();
 
         if (mac_addr)
@@ -1634,7 +1629,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         key.index = (u32) key_idx;
 
         if (unlikely(key.len > sizeof(key.data))) {
-                WL_ERR(("Too long key length (%u)\n", key.len));
+                WL_ERR("Too long key length (%u)\n", key.len);
                 return -EINVAL;
         }
         memcpy(key.data, params->key, key.len);
@@ -1643,26 +1638,26 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
                 key.algo = CRYPTO_ALGO_WEP1;
-                WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_WEP40\n");
                 break;
         case WLAN_CIPHER_SUITE_WEP104:
                 key.algo = CRYPTO_ALGO_WEP128;
-                WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_WEP104\n");
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 key.algo = CRYPTO_ALGO_TKIP;
-                WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_TKIP\n");
                 break;
         case WLAN_CIPHER_SUITE_AES_CMAC:
                 key.algo = CRYPTO_ALGO_AES_CCM;
-                WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_AES_CMAC\n");
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key.algo = CRYPTO_ALGO_AES_CCM;
-                WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_CCMP\n");
                 break;
         default:
-                WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
+                WL_ERR("Invalid cipher (0x%x)\n", params->cipher);
                 return -EINVAL;
         }
 
@@ -1670,21 +1665,21 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         swap_key_from_BE(&key);
         err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_KEY error (%d)\n", err));
+                WL_ERR("WLC_SET_KEY error (%d)\n", err);
                 return err;
         }
 
         val = WEP_ENABLED;
         err = wl_dev_intvar_get(dev, "wsec", &wsec);
         if (unlikely(err)) {
-                WL_ERR(("get wsec error (%d)\n", err));
+                WL_ERR("get wsec error (%d)\n", err);
                 return err;
         }
         wsec &= ~(WEP_ENABLED);
         wsec |= val;
         err = wl_dev_intvar_set(dev, "wsec", wsec);
         if (unlikely(err)) {
-                WL_ERR(("set wsec error (%d)\n", err));
+                WL_ERR("set wsec error (%d)\n", err);
                 return err;
         }
 
@@ -1692,7 +1687,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
         val = htod32(val);
         err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_AUTH error (%d)\n", err));
+                WL_ERR("WLC_SET_AUTH error (%d)\n", err);
                 return err;
         }
         return err;
@@ -1714,7 +1709,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
         key.flags = WL_PRIMARY_KEY;
         key.algo = CRYPTO_ALGO_OFF;
 
-        WL_DBG(("key index (%d)\n", key_idx));
+        WL_DBG("key index (%d)\n", key_idx);
         /* Set the new key/index */
         swap_key_from_BE(&key);
         err = wl_dev_ioctl(dev, WLC_SET_KEY, &key, sizeof(key));
@@ -1722,10 +1717,10 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
                 if (err == -EINVAL) {
                         if (key.index >= DOT11_MAX_DEFAULT_KEYS) {
                                 /* we ignore this key index in this case */
-                                WL_DBG(("invalid key index (%d)\n", key_idx));
+                                WL_DBG("invalid key index (%d)\n", key_idx);
                         }
                 } else {
-                        WL_ERR(("WLC_SET_KEY error (%d)\n", err));
+                        WL_ERR("WLC_SET_KEY error (%d)\n", err);
                 }
                 return err;
         }
@@ -1733,14 +1728,14 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
         val = 0;
         err = wl_dev_intvar_get(dev, "wsec", &wsec);
         if (unlikely(err)) {
-                WL_ERR(("get wsec error (%d)\n", err));
+                WL_ERR("get wsec error (%d)\n", err);
                 return err;
         }
         wsec &= ~(WEP_ENABLED);
         wsec |= val;
         err = wl_dev_intvar_set(dev, "wsec", wsec);
         if (unlikely(err)) {
-                WL_ERR(("set wsec error (%d)\n", err));
+                WL_ERR("set wsec error (%d)\n", err);
                 return err;
         }
 
@@ -1748,7 +1743,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
         val = htod32(val);
         err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_AUTH error (%d)\n", err));
+                WL_ERR("WLC_SET_AUTH error (%d)\n", err);
                 return err;
         }
         return err;
@@ -1766,7 +1761,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
         s32 wsec;
         s32 err = 0;
 
-        WL_DBG(("key index (%d)\n", key_idx));
+        WL_DBG("key index (%d)\n", key_idx);
         CHECK_SYS_UP();
 
         memset(&key, 0, sizeof(key));
@@ -1778,7 +1773,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
 
         err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec));
         if (unlikely(err)) {
-                WL_ERR(("WLC_GET_WSEC error (%d)\n", err));
+                WL_ERR("WLC_GET_WSEC error (%d)\n", err);
                 return err;
         }
         wsec = dtoh32(wsec);
@@ -1787,22 +1782,22 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
                 sec = wl_read_prof(wl, WL_PROF_SEC);
                 if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP40) {
                         params.cipher = WLAN_CIPHER_SUITE_WEP40;
-                        WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_WEP40\n");
                 } else if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP104) {
                         params.cipher = WLAN_CIPHER_SUITE_WEP104;
-                        WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
+                        WL_DBG("WLAN_CIPHER_SUITE_WEP104\n");
                 }
                 break;
         case TKIP_ENABLED:
                 params.cipher = WLAN_CIPHER_SUITE_TKIP;
-                WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_TKIP\n");
                 break;
         case AES_ENABLED:
                 params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
-                WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
+                WL_DBG("WLAN_CIPHER_SUITE_AES_CMAC\n");
                 break;
         default:
-                WL_ERR(("Invalid algo (0x%x)\n", wsec));
+                WL_ERR("Invalid algo (0x%x)\n", wsec);
                 return -EINVAL;
         }
 
@@ -1814,7 +1809,7 @@ static s32
 wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,
                                     struct net_device *dev, u8 key_idx)
 {
-        WL_INFO(("Not supported\n"));
+        WL_INFO("Not supported\n");
         CHECK_SYS_UP();
         return -EOPNOTSUPP;
 }
@@ -1831,20 +1826,20 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
 
         CHECK_SYS_UP();
         if (unlikely
-            (memcmp(mac, wl_read_prof(wl, WL_PROF_BSSID), ETHER_ADDR_LEN))) {
-                WL_ERR(("Wrong Mac address\n"));
+            (memcmp(mac, wl_read_prof(wl, WL_PROF_BSSID), ETH_ALEN))) {
+                WL_ERR("Wrong Mac address\n");
                 return -ENOENT;
         }
 
         /* Report the current tx rate */
         err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));
         if (err) {
-                WL_ERR(("Could not get rate (%d)\n", err));
+                WL_ERR("Could not get rate (%d)\n", err);
         } else {
                 rate = dtoh32(rate);
                 sinfo->filled |= STATION_INFO_TX_BITRATE;
                 sinfo->txrate.legacy = rate * 5;
-                WL_DBG(("Rate %d Mbps\n", (rate / 2)));
+                WL_DBG("Rate %d Mbps\n", rate / 2);
         }
 
         if (test_bit(WL_STATUS_CONNECTED, &wl->status)) {
@@ -1852,13 +1847,13 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                 err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val,
                                 sizeof(scb_val_t));
                 if (unlikely(err)) {
-                        WL_ERR(("Could not get rssi (%d)\n", err));
+                        WL_ERR("Could not get rssi (%d)\n", err);
                         return err;
                 }
                 rssi = dtoh32(scb_val.val);
                 sinfo->filled |= STATION_INFO_SIGNAL;
                 sinfo->signal = rssi;
-                WL_DBG(("RSSI %d dBm\n", rssi));
+                WL_DBG("RSSI %d dBm\n", rssi);
         }
 
         return err;
@@ -1874,13 +1869,13 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
         CHECK_SYS_UP();
         pm = enabled ? PM_FAST : PM_OFF;
         pm = htod32(pm);
-        WL_DBG(("power save %s\n", (pm ? "enabled" : "disabled")));
+        WL_DBG("power save %s\n", (pm ? "enabled" : "disabled"));
         err = wl_dev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
         if (unlikely(err)) {
                 if (err == -ENODEV)
-                        WL_DBG(("net_device is not ready yet\n"));
+                        WL_DBG("net_device is not ready yet\n");
                 else
-                        WL_ERR(("error (%d)\n", err));
+                        WL_ERR("error (%d)\n", err);
                 return err;
         }
         return err;
@@ -1932,7 +1927,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
         err = wl_dev_ioctl(dev, WLC_GET_CURR_RATESET, &rateset,
                         sizeof(rateset));
         if (unlikely(err)) {
-                WL_ERR(("could not get current rateset (%d)\n", err));
+                WL_ERR("could not get current rateset (%d)\n", err);
                 return err;
         }
 
@@ -1952,7 +1947,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
                 rate = val / 500000;
         }
 
-        WL_DBG(("rate %d mbps\n", (rate / 2)));
+        WL_DBG("rate %d mbps\n", rate / 2);
 
         /*
          *
@@ -1962,7 +1957,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
         err_bg = wl_dev_intvar_set(dev, "bg_rate", rate);
         err_a = wl_dev_intvar_set(dev, "a_rate", rate);
         if (unlikely(err_bg && err_a)) {
-                WL_ERR(("could not set fixed rate (%d) (%d)\n", err_bg, err_a));
+                WL_ERR("could not set fixed rate (%d) (%d)\n", err_bg, err_a);
                 return err_bg | err_a;
         }
 
@@ -2007,12 +2002,12 @@ wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list,
 {
         int i, j;
 
-        WL_DBG(("No of elements %d\n", pmk_list->pmkids.npmkid));
+        WL_DBG("No of elements %d\n", pmk_list->pmkids.npmkid);
         for (i = 0; i < pmk_list->pmkids.npmkid; i++) {
-                WL_DBG(("PMKID[%d]: %pM =\n", i,
-                        &pmk_list->pmkids.pmkid[i].BSSID));
+                WL_DBG("PMKID[%d]: %pM =\n", i,
+                       &pmk_list->pmkids.pmkid[i].BSSID);
                 for (j = 0; j < WPA2_PMKID_LEN; j++) {
-                        WL_DBG(("%02x\n", pmk_list->pmkids.pmkid[i].PMKID[j]));
+                        WL_DBG("%02x\n", pmk_list->pmkids.pmkid[i].PMKID[j]);
                 }
         }
         if (likely(!err)) {
@@ -2034,11 +2029,11 @@ wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
         CHECK_SYS_UP();
         for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++)
                 if (!memcmp(pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID,
-                            ETHER_ADDR_LEN))
+                            ETH_ALEN))
                         break;
         if (i < WL_NUM_PMKIDS_MAX) {
                 memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID, pmksa->bssid,
-                       ETHER_ADDR_LEN);
+                       ETH_ALEN);
                 memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID, pmksa->pmkid,
                        WPA2_PMKID_LEN);
                 if (i == wl->pmk_list->pmkids.npmkid)
@@ -2046,12 +2041,12 @@ wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
         } else {
                 err = -EINVAL;
         }
-        WL_DBG(("set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n",
-                &wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].BSSID));
+        WL_DBG("set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n",
+               &wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].BSSID);
         for (i = 0; i < WPA2_PMKID_LEN; i++) {
-                WL_DBG(("%02x\n",
-                        wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].
-                        PMKID[i]));
+                WL_DBG("%02x\n",
+                       wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid].
+                       PMKID[i]);
         }
 
         err = wl_update_pmklist(dev, wl->pmk_list, err);
@@ -2069,19 +2064,19 @@ wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
         int i;
 
         CHECK_SYS_UP();
-        memcpy(&pmkid.pmkid[0].BSSID, pmksa->bssid, ETHER_ADDR_LEN);
+        memcpy(&pmkid.pmkid[0].BSSID, pmksa->bssid, ETH_ALEN);
         memcpy(&pmkid.pmkid[0].PMKID, pmksa->pmkid, WPA2_PMKID_LEN);
 
-        WL_DBG(("del_pmksa,IW_PMKSA_REMOVE - PMKID: %pM =\n",
-                &pmkid.pmkid[0].BSSID));
+        WL_DBG("del_pmksa,IW_PMKSA_REMOVE - PMKID: %pM =\n",
+               &pmkid.pmkid[0].BSSID);
         for (i = 0; i < WPA2_PMKID_LEN; i++) {
-                WL_DBG(("%02x\n", pmkid.pmkid[0].PMKID[i]));
+                WL_DBG("%02x\n", pmkid.pmkid[0].PMKID[i]);
         }
 
         for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++)
                 if (!memcmp
                     (pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID,
-                     ETHER_ADDR_LEN))
+                     ETH_ALEN))
                         break;
 
         if ((wl->pmk_list->pmkids.npmkid > 0)
@@ -2090,7 +2085,7 @@ wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
                 for (; i < (wl->pmk_list->pmkids.npmkid - 1); i++) {
                         memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID,
                                &wl->pmk_list->pmkids.pmkid[i + 1].BSSID,
-                               ETHER_ADDR_LEN);
+                               ETH_ALEN);
                         memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID,
                                &wl->pmk_list->pmkids.pmkid[i + 1].PMKID,
                                WPA2_PMKID_LEN);
@@ -2168,13 +2163,13 @@ static struct wireless_dev *wl_alloc_wdev(s32 sizeof_iface,
 
         wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
         if (unlikely(!wdev)) {
-                WL_ERR(("Could not allocate wireless device\n"));
+                WL_ERR("Could not allocate wireless device\n");
                 return ERR_PTR(-ENOMEM);
         }
         wdev->wiphy =
             wiphy_new(&wl_cfg80211_ops, sizeof(struct wl_priv) + sizeof_iface);
         if (unlikely(!wdev->wiphy)) {
-                WL_ERR(("Couldn not allocate wiphy device\n"));
+                WL_ERR("Couldn not allocate wiphy device\n");
                 err = -ENOMEM;
                 goto wiphy_new_out;
         }
@@ -2204,7 +2199,7 @@ static struct wireless_dev *wl_alloc_wdev(s32 sizeof_iface,
 #endif                          /* !WL_POWERSAVE_DISABLED */
         err = wiphy_register(wdev->wiphy);
         if (unlikely(err < 0)) {
-                WL_ERR(("Couldn not register wiphy device (%d)\n", err));
+                WL_ERR("Couldn not register wiphy device (%d)\n", err);
                 goto wiphy_register_out;
         }
         return wdev;
@@ -2223,7 +2218,7 @@ static void wl_free_wdev(struct wl_priv *wl)
         struct wireless_dev *wdev = wl_to_wdev(wl);
 
         if (unlikely(!wdev)) {
-                WL_ERR(("wdev is invalid\n"));
+                WL_ERR("wdev is invalid\n");
                 return;
         }
         wiphy_unregister(wdev->wiphy);
@@ -2241,11 +2236,11 @@ static s32 wl_inform_bss(struct wl_priv *wl)
 
         bss_list = wl->bss_list;
         if (unlikely(bss_list->version != WL_BSS_INFO_VERSION)) {
-                WL_ERR(("Version %d != WL_BSS_INFO_VERSION\n",
-                        bss_list->version));
+                WL_ERR("Version %d != WL_BSS_INFO_VERSION\n",
+                       bss_list->version);
                 return -EOPNOTSUPP;
         }
-        WL_DBG(("scanned AP count (%d)\n", bss_list->count));
+        WL_DBG("scanned AP count (%d)\n", bss_list->count);
         bi = next_bss(bss_list, bi);
         for_each_bss(bss_list, bi, i) {
                 err = wl_inform_single_bss(wl, bi);
@@ -2270,14 +2265,14 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
         s32 err = 0;
 
         if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) {
-                WL_DBG(("Beacon is larger than buffer. Discarding\n"));
+                WL_DBG("Beacon is larger than buffer. Discarding\n");
                 return err;
         }
         notif_bss_info =
             kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) +
                     WL_BSS_INFO_MAX, GFP_KERNEL);
         if (unlikely(!notif_bss_info)) {
-                WL_ERR(("notif_bss_info alloc failed\n"));
+                WL_ERR("notif_bss_info alloc failed\n");
                 return -ENOMEM;
         }
         mgmt = (struct ieee80211_mgmt *)notif_bss_info->frame_buf;
@@ -2289,7 +2284,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
         else
                 band = wiphy->bands[IEEE80211_BAND_5GHZ];
         notif_bss_info->rssi = bi->RSSI;
-        memcpy(mgmt->bssid, &bi->BSSID, ETHER_ADDR_LEN);
+        memcpy(mgmt->bssid, &bi->BSSID, ETH_ALEN);
         mgmt_type = wl->active_scan ?
                 IEEE80211_STYPE_PROBE_RESP : IEEE80211_STYPE_BEACON;
         if (!memcmp(bi->SSID, sr->ssid.SSID, bi->SSID_len)) {
@@ -2321,17 +2316,17 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
         freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
         channel = ieee80211_get_channel(wiphy, freq);
 
-        WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
-                bi->SSID,
-                notif_bss_info->rssi, notif_bss_info->channel,
-                mgmt->u.beacon.capab_info, &bi->BSSID));
+        WL_DBG("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
+               bi->SSID,
+               notif_bss_info->rssi, notif_bss_info->channel,
+               mgmt->u.beacon.capab_info, &bi->BSSID);
 
         signal = notif_bss_info->rssi * 100;
         if (unlikely(!cfg80211_inform_bss_frame(wiphy, channel, mgmt,
                                                 le16_to_cpu
                                                 (notif_bss_info->frame_len),
                                                 signal, GFP_KERNEL))) {
-                WL_ERR(("cfg80211_inform_bss_frame error\n"));
+                WL_ERR("cfg80211_inform_bss_frame error\n");
                 kfree(notif_bss_info);
                 return -EINVAL;
         }
@@ -2399,12 +2394,12 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev,
                 if (wl_is_ibssmode(wl)) {
                         cfg80211_ibss_joined(ndev, (s8 *)&e->addr,
                                              GFP_KERNEL);
-                        WL_DBG(("joined in IBSS network\n"));
+                        WL_DBG("joined in IBSS network\n");
                 } else {
                         wl_bss_connect_done(wl, ndev, e, data, true);
-                        WL_DBG(("joined in BSS network \"%s\"\n",
-                                ((struct wlc_ssid *)
-                                 wl_read_prof(wl, WL_PROF_SSID))->SSID));
+                        WL_DBG("joined in BSS network \"%s\"\n",
+                               ((struct wlc_ssid *)
+                                wl_read_prof(wl, WL_PROF_SSID))->SSID);
                 }
                 act = true;
                 wl_update_prof(wl, e, &act, WL_PROF_ACT);
@@ -2459,7 +2454,7 @@ wl_dev_bufvar_get(struct net_device *dev, s8 *name, s8 *buf,
         err = wl_dev_ioctl(dev, WLC_GET_VAR, (void *)wl->ioctl_buf,
                         WL_IOCTL_LEN_MAX);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
         memcpy(buf, wl->ioctl_buf, buf_len);
@@ -2479,7 +2474,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl)
         err = wl_dev_bufvar_get(ndev, "assoc_info", wl->extra_buf,
                                 WL_ASSOC_INFO_MAX);
         if (unlikely(err)) {
-                WL_ERR(("could not get assoc info (%d)\n", err));
+                WL_ERR("could not get assoc info (%d)\n", err);
                 return err;
         }
         assoc_info = (struct wl_assoc_ielen *)wl->extra_buf;
@@ -2489,7 +2484,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl)
                 err = wl_dev_bufvar_get(ndev, "assoc_req_ies", wl->extra_buf,
                                         WL_ASSOC_INFO_MAX);
                 if (unlikely(err)) {
-                        WL_ERR(("could not get assoc req (%d)\n", err));
+                        WL_ERR("could not get assoc req (%d)\n", err);
                         return err;
                 }
                 conn_info->req_ie_len = req_len;
@@ -2503,7 +2498,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl)
                 err = wl_dev_bufvar_get(ndev, "assoc_resp_ies", wl->extra_buf,
                                         WL_ASSOC_INFO_MAX);
                 if (unlikely(err)) {
-                        WL_ERR(("could not get assoc resp (%d)\n", err));
+                        WL_ERR("could not get assoc resp (%d)\n", err);
                         return err;
                 }
                 conn_info->resp_ie_len = resp_len;
@@ -2513,8 +2508,8 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl)
                 conn_info->resp_ie_len = 0;
                 conn_info->resp_ie = NULL;
         }
-        WL_DBG(("req len (%d) resp len (%d)\n", conn_info->req_ie_len,
-                conn_info->resp_ie_len));
+        WL_DBG("req len (%d) resp len (%d)\n",
+               conn_info->req_ie_len, conn_info->resp_ie_len);
 
         return err;
 }
@@ -2547,8 +2542,8 @@ static void wl_ch_to_chanspec(int ch, struct wl_join_params *join_params,
                 join_params->params.chanspec_num =
                         htod32(join_params->params.chanspec_num);
 
-                WL_DBG(("join_params->params.chanspec_list[0]= %#X, channel %d, chanspec %#X\n",
-                        join_params->params.chanspec_list[0], ch, chanspec));
+                WL_DBG("join_params->params.chanspec_list[0]= %#X, channel %d, chanspec %#X\n",
+                       join_params->params.chanspec_list[0], ch, chanspec);
         }
 }
 
@@ -2575,16 +2570,16 @@ static s32 wl_update_bss_info(struct wl_priv *wl)
 
         rtnl_lock();
         if (unlikely(!bss)) {
-                WL_DBG(("Could not find the AP\n"));
+                WL_DBG("Could not find the AP\n");
                 *(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX);
                 err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_BSS_INFO,
                                 wl->extra_buf, WL_EXTRA_BUF_MAX);
                 if (unlikely(err)) {
-                        WL_ERR(("Could not get bss info %d\n", err));
+                        WL_ERR("Could not get bss info %d\n", err);
                         goto update_bss_info_out;
                 }
                 bi = (struct wl_bss_info *)(wl->extra_buf + 4);
-                if (unlikely(memcmp(&bi->BSSID, &wl->bssid, ETHER_ADDR_LEN))) {
+                if (unlikely(memcmp(&bi->BSSID, &wl->bssid, ETH_ALEN))) {
                         err = -EIO;
                         goto update_bss_info_out;
                 }
@@ -2596,7 +2591,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl)
                 ie_len = bi->ie_length;
                 beacon_interval = cpu_to_le16(bi->beacon_period);
         } else {
-                WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
+                WL_DBG("Found the AP in the list - BSSID %pM\n", bss->bssid);
                 ie = bss->information_elements;
                 ie_len = bss->len_information_elements;
                 beacon_interval = bss->beacon_interval;
@@ -2615,7 +2610,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl)
                 err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_DTIMPRD,
                         &dtim_period, sizeof(dtim_period));
                 if (unlikely(err)) {
-                        WL_ERR(("WLC_GET_DTIMPRD error (%d)\n", err));
+                        WL_ERR("WLC_GET_DTIMPRD error (%d)\n", err);
                         goto update_bss_info_out;
                 }
         }
@@ -2636,13 +2631,13 @@ wl_bss_roaming_done(struct wl_priv *wl, struct net_device *ndev,
         s32 err = 0;
 
         wl_get_assoc_ies(wl);
-        memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+        memcpy(&wl->bssid, &e->addr, ETH_ALEN);
         wl_update_bss_info(wl);
         cfg80211_roamed(ndev,
                         (u8 *)&wl->bssid,
                         conn_info->req_ie, conn_info->req_ie_len,
                         conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
-        WL_DBG(("Report roaming result\n"));
+        WL_DBG("Report roaming result\n");
 
         set_bit(WL_STATUS_CONNECTED, &wl->status);
 
@@ -2657,7 +2652,7 @@ wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev,
         s32 err = 0;
 
         wl_get_assoc_ies(wl);
-        memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+        memcpy(&wl->bssid, &e->addr, ETH_ALEN);
         wl_update_bss_info(wl);
         if (test_and_clear_bit(WL_STATUS_CONNECTING, &wl->status)) {
                 cfg80211_connect_result(ndev,
@@ -2668,15 +2663,15 @@ wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev,
                                         conn_info->resp_ie_len,
                                         completed ? WLAN_STATUS_SUCCESS : WLAN_STATUS_AUTH_TIMEOUT,
                                         GFP_KERNEL);
-                WL_DBG(("Report connect result - connection %s\n",
-                        completed ? "succeeded" : "failed"));
+                WL_DBG("Report connect result - connection %s\n",
+                       completed ? "succeeded" : "failed");
         } else {
                 cfg80211_roamed(ndev,
                                 (u8 *)&wl->bssid,
                                 conn_info->req_ie, conn_info->req_ie_len,
                                 conn_info->resp_ie, conn_info->resp_ie_len,
                                 GFP_KERNEL);
-                WL_DBG(("Report roaming result\n"));
+                WL_DBG("Report roaming result\n");
         }
         set_bit(WL_STATUS_CONNECTED, &wl->status);
 
@@ -2716,7 +2711,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
                 return wl_wakeup_iscan(wl_to_iscan(wl));
 
         if (unlikely(!test_and_clear_bit(WL_STATUS_SCANNING, &wl->status))) {
-                WL_ERR(("Scan complete while device not scanning\n"));
+                WL_ERR("Scan complete while device not scanning\n");
                 return -EINVAL;
         }
         if (unlikely(!wl->scan_request)) {
@@ -2725,14 +2720,14 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
         err = wl_dev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform,
                         sizeof(channel_inform));
         if (unlikely(err)) {
-                WL_ERR(("scan busy (%d)\n", err));
+                WL_ERR("scan busy (%d)\n", err);
                 goto scan_done_out;
         }
         channel_inform.scan_channel = dtoh32(channel_inform.scan_channel);
         if (unlikely(channel_inform.scan_channel)) {
 
-                WL_DBG(("channel_inform.scan_channel (%d)\n",
-                        channel_inform.scan_channel));
+                WL_DBG("channel_inform.scan_channel (%d)\n",
+                       channel_inform.scan_channel);
         }
         wl->bss_list = wl->scan_results;
         bss_list = wl->bss_list;
@@ -2740,7 +2735,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
         bss_list->buflen = htod32(len);
         err = wl_dev_ioctl(ndev, WLC_SCAN_RESULTS, bss_list, len);
         if (unlikely(err)) {
-                WL_ERR(("%s Scan_results error (%d)\n", ndev->name, err));
+                WL_ERR("%s Scan_results error (%d)\n", ndev->name, err);
                 err = -EINVAL;
                 goto scan_done_out;
         }
@@ -2794,55 +2789,54 @@ static void wl_init_eloop_handler(struct wl_event_loop *el)
 
 static s32 wl_init_priv_mem(struct wl_priv *wl)
 {
-        wl->scan_results = (void *)kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL);
+        wl->scan_results = kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL);
         if (unlikely(!wl->scan_results)) {
-                WL_ERR(("Scan results alloc failed\n"));
+                WL_ERR("Scan results alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->conf = (void *)kzalloc(sizeof(*wl->conf), GFP_KERNEL);
+        wl->conf = kzalloc(sizeof(*wl->conf), GFP_KERNEL);
         if (unlikely(!wl->conf)) {
-                WL_ERR(("wl_conf alloc failed\n"));
+                WL_ERR("wl_conf alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->profile = (void *)kzalloc(sizeof(*wl->profile), GFP_KERNEL);
+        wl->profile = kzalloc(sizeof(*wl->profile), GFP_KERNEL);
         if (unlikely(!wl->profile)) {
-                WL_ERR(("wl_profile alloc failed\n"));
+                WL_ERR("wl_profile alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->bss_info = (void *)kzalloc(WL_BSS_INFO_MAX, GFP_KERNEL);
+        wl->bss_info = kzalloc(WL_BSS_INFO_MAX, GFP_KERNEL);
         if (unlikely(!wl->bss_info)) {
-                WL_ERR(("Bss information alloc failed\n"));
+                WL_ERR("Bss information alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->scan_req_int =
-            (void *)kzalloc(sizeof(*wl->scan_req_int), GFP_KERNEL);
+        wl->scan_req_int = kzalloc(sizeof(*wl->scan_req_int), GFP_KERNEL);
         if (unlikely(!wl->scan_req_int)) {
-                WL_ERR(("Scan req alloc failed\n"));
+                WL_ERR("Scan req alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->ioctl_buf = (void *)kzalloc(WL_IOCTL_LEN_MAX, GFP_KERNEL);
+        wl->ioctl_buf = kzalloc(WL_IOCTL_LEN_MAX, GFP_KERNEL);
         if (unlikely(!wl->ioctl_buf)) {
-                WL_ERR(("Ioctl buf alloc failed\n"));
+                WL_ERR("Ioctl buf alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->extra_buf = (void *)kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
+        wl->extra_buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
         if (unlikely(!wl->extra_buf)) {
-                WL_ERR(("Extra buf alloc failed\n"));
+                WL_ERR("Extra buf alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->iscan = (void *)kzalloc(sizeof(*wl->iscan), GFP_KERNEL);
+        wl->iscan = kzalloc(sizeof(*wl->iscan), GFP_KERNEL);
         if (unlikely(!wl->iscan)) {
-                WL_ERR(("Iscan buf alloc failed\n"));
+                WL_ERR("Iscan buf alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->fw = (void *)kzalloc(sizeof(*wl->fw), GFP_KERNEL);
+        wl->fw = kzalloc(sizeof(*wl->fw), GFP_KERNEL);
         if (unlikely(!wl->fw)) {
-                WL_ERR(("fw object alloc failed\n"));
+                WL_ERR("fw object alloc failed\n");
                 goto init_priv_mem_out;
         }
-        wl->pmk_list = (void *)kzalloc(sizeof(*wl->pmk_list), GFP_KERNEL);
+        wl->pmk_list = kzalloc(sizeof(*wl->pmk_list), GFP_KERNEL);
         if (unlikely(!wl->pmk_list)) {
-                WL_ERR(("pmk list alloc failed\n"));
+                WL_ERR("pmk list alloc failed\n");
                 goto init_priv_mem_out;
         }
 
@@ -2884,7 +2878,7 @@ static s32 wl_create_event_handler(struct wl_priv *wl)
         wl->event_tsk = kthread_run(wl_event_handler, wl, "wl_event_handler");
         if (IS_ERR(wl->event_tsk)) {
                 wl->event_tsk = NULL;
-                WL_ERR(("failed to create event thread\n"));
+                WL_ERR("failed to create event thread\n");
                 return -ENOMEM;
         }
         return 0;
@@ -2917,7 +2911,7 @@ static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted)
         struct net_device *ndev = wl_to_ndev(wl);
 
         if (unlikely(!test_and_clear_bit(WL_STATUS_SCANNING, &wl->status))) {
-                WL_ERR(("Scan complete while device not scanning\n"));
+                WL_ERR("Scan complete while device not scanning\n");
                 return;
         }
         if (likely(wl->scan_request)) {
@@ -2931,7 +2925,7 @@ static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted)
 static s32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan)
 {
         if (likely(iscan->state != WL_ISCAN_STATE_IDLE)) {
-                WL_DBG(("wake up iscan\n"));
+                WL_DBG("wake up iscan\n");
                 up(&iscan->sync);
                 return 0;
         }
@@ -2961,14 +2955,14 @@ wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status,
                                 WL_ISCAN_RESULTS_FIXED_SIZE, iscan->scan_buf,
                                 WL_ISCAN_BUF_MAX);
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
         results->buflen = dtoh32(results->buflen);
         results->version = dtoh32(results->version);
         results->count = dtoh32(results->count);
-        WL_DBG(("results->count = %d\n", results->count));
-        WL_DBG(("results->buflen = %d\n", results->buflen));
+        WL_DBG("results->count = %d\n", results->count);
+        WL_DBG("results->buflen = %d\n", results->buflen);
         *status = dtoh32(list_buf->status);
         *bss_list = results;
 
@@ -3053,7 +3047,7 @@ static s32 wl_iscan_thread(void *data)
                 err = wl_get_iscan_results(iscan, &status, &wl->bss_list);
                 if (unlikely(err)) {
                         status = WL_SCAN_RESULTS_ABORTED;
-                        WL_ERR(("Abort iscan\n"));
+                        WL_ERR("Abort iscan\n");
                 }
                 rtnl_unlock();
                 el->handler[status] (wl);
@@ -3062,7 +3056,7 @@ static s32 wl_iscan_thread(void *data)
                 del_timer_sync(&iscan->timer);
                 iscan->timer_on = 0;
         }
-        WL_DBG(("%s was terminated\n", __func__));
+        WL_DBG("%s was terminated\n", __func__);
 
         return 0;
 }
@@ -3073,7 +3067,7 @@ static void wl_iscan_timer(unsigned long data)
 
         if (iscan) {
                 iscan->timer_on = 0;
-                WL_DBG(("timer expired\n"));
+                WL_DBG("timer expired\n");
                 wl_wakeup_iscan(iscan);
         }
 }
@@ -3088,7 +3082,7 @@ static s32 wl_invoke_iscan(struct wl_priv *wl)
                 sema_init(&iscan->sync, 0);
                 iscan->tsk = kthread_run(wl_iscan_thread, iscan, "wl_iscan");
                 if (IS_ERR(iscan->tsk)) {
-                        WL_ERR(("Could not create iscan thread\n"));
+                        WL_ERR("Could not create iscan thread\n");
                         iscan->tsk = NULL;
                         return -ENOMEM;
                 }
@@ -3123,7 +3117,7 @@ static s32 wl_init_iscan(struct wl_priv *wl)
                 sema_init(&iscan->sync, 0);
                 iscan->tsk = kthread_run(wl_iscan_thread, iscan, "wl_iscan");
                 if (IS_ERR(iscan->tsk)) {
-                        WL_ERR(("Could not create iscan thread\n"));
+                        WL_ERR("Could not create iscan thread\n");
                         iscan->tsk = NULL;
                         return -ENOMEM;
                 }
@@ -3192,17 +3186,17 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data)
         s32 err = 0;
 
         if (unlikely(!ndev)) {
-                WL_ERR(("ndev is invaild\n"));
+                WL_ERR("ndev is invalid\n");
                 return -ENODEV;
         }
         wl_cfg80211_dev = kzalloc(sizeof(struct wl_dev), GFP_KERNEL);
         if (unlikely(!wl_cfg80211_dev)) {
-                WL_ERR(("wl_cfg80211_dev is invalid\n"));
+                WL_ERR("wl_cfg80211_dev is invalid\n");
                 return -ENOMEM;
         }
-        WL_DBG(("func %p\n", wl_cfg80211_get_sdio_func()));
+        WL_DBG("func %p\n", wl_cfg80211_get_sdio_func());
         wdev = wl_alloc_wdev(sizeof(struct wl_iface), &wl_cfg80211_get_sdio_func()->dev);
-        if (unlikely(IS_ERR(wdev)))
+        if (IS_ERR(wdev))
                 return -ENOMEM;
 
         wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS);
@@ -3216,7 +3210,7 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data)
         wdev->netdev = ndev;
         err = wl_init_priv(wl);
         if (unlikely(err)) {
-                WL_ERR(("Failed to init iwm_priv (%d)\n", err));
+                WL_ERR("Failed to init iwm_priv (%d)\n", err);
                 goto cfg80211_attach_out;
         }
         wl_set_drvdata(wl_cfg80211_dev, ci);
@@ -3261,19 +3255,19 @@ static s32 wl_event_handler(void *data)
                         break;
                 e = wl_deq_event(wl);
                 if (unlikely(!e)) {
-                        WL_ERR(("eqeue empty..\n"));
+                        WL_ERR("event queue empty...\n");
                         BUG();
                 }
-                WL_DBG(("event type (%d)\n", e->etype));
+                WL_DBG("event type (%d)\n", e->etype);
                 if (wl->el.handler[e->etype]) {
                         wl->el.handler[e->etype] (wl, wl_to_ndev(wl), &e->emsg,
                                                   e->edata);
                 } else {
-                        WL_DBG(("Unknown Event (%d): ignoring\n", e->etype));
+                        WL_DBG("Unknown Event (%d): ignoring\n", e->etype);
                 }
                 wl_put_event(e);
         }
-        WL_DBG(("%s was terminated\n", __func__));
+        WL_DBG("%s was terminated\n", __func__);
         return 0;
 }
 
@@ -3286,7 +3280,7 @@ wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data)
         s8 *estr = (event_type <= sizeof(wl_dbg_estr) / WL_DBG_ESTR_MAX - 1) ?
             wl_dbg_estr[event_type] : (s8 *) "Unknown";
 #endif                          /* (WL_DBG_LEVEL > 0) */
-        WL_DBG(("event_type (%d):" "WLC_E_" "%s\n", event_type, estr));
+        WL_DBG("event_type (%d):" "WLC_E_" "%s\n", event_type, estr);
         if (likely(!wl_enq_event(wl, event_type, e, data)))
                 wl_wakeup_event(wl);
 }
@@ -3341,7 +3335,7 @@ wl_enq_event(struct wl_priv *wl, u32 event, const wl_event_msg_t *msg,
 
         e = kzalloc(sizeof(struct wl_event_q), GFP_KERNEL);
         if (unlikely(!e)) {
-                WL_ERR(("event alloc failed\n"));
+                WL_ERR("event alloc failed\n");
                 return -ENOMEM;
         }
 
@@ -3385,8 +3379,8 @@ static s32 wl_dongle_mode(struct net_device *ndev, s32 iftype)
         switch (iftype) {
         case NL80211_IFTYPE_MONITOR:
         case NL80211_IFTYPE_WDS:
-                WL_ERR(("type (%d) : currently we do not support this mode\n",
-                        iftype));
+                WL_ERR("type (%d) : currently we do not support this mode\n",
+                       iftype);
                 err = -EINVAL;
                 return err;
         case NL80211_IFTYPE_ADHOC:
@@ -3396,20 +3390,20 @@ static s32 wl_dongle_mode(struct net_device *ndev, s32 iftype)
                 break;
         default:
                 err = -EINVAL;
-                WL_ERR(("invalid type (%d)\n", iftype));
+                WL_ERR("invalid type (%d)\n", iftype);
                 return err;
         }
         infra = htod32(infra);
         ap = htod32(ap);
-        WL_DBG(("%s ap (%d), infra (%d)\n", ndev->name, ap, infra));
+        WL_DBG("%s ap (%d), infra (%d)\n", ndev->name, ap, infra);
         err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_INFRA error (%d)\n", err));
+                WL_ERR("WLC_SET_INFRA error (%d)\n", err);
                 return err;
         }
         err = wl_dev_ioctl(ndev, WLC_SET_AP, &ap, sizeof(ap));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_AP error (%d)\n", err));
+                WL_ERR("WLC_SET_AP error (%d)\n", err);
                 return err;
         }
 
@@ -3431,7 +3425,7 @@ static s32 wl_dongle_up(struct net_device *ndev, u32 up)
 
         err = wl_dev_ioctl(ndev, WLC_UP, &up, sizeof(up));
         if (unlikely(err)) {
-                WL_ERR(("WLC_UP error (%d)\n", err));
+                WL_ERR("WLC_UP error (%d)\n", err);
         }
         return err;
 }
@@ -3442,7 +3436,7 @@ static s32 wl_dongle_power(struct net_device *ndev, u32 power_mode)
 
         err = wl_dev_ioctl(ndev, WLC_SET_PM, &power_mode, sizeof(power_mode));
         if (unlikely(err)) {
-                WL_ERR(("WLC_SET_PM error (%d)\n", err));
+                WL_ERR("WLC_SET_PM error (%d)\n", err);
         }
         return err;
 }
@@ -3459,14 +3453,14 @@ wl_dongle_glom(struct net_device *ndev, u32 glom, u32 dongle_align)
                     sizeof(iovbuf));
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (unlikely(err)) {
-                WL_ERR(("txglomalign error (%d)\n", err));
+                WL_ERR("txglomalign error (%d)\n", err);
                 goto dongle_glom_out;
         }
         /* disable glom option per default */
         bcm_mkiovar("bus:txglom", (char *)&glom, 4, iovbuf, sizeof(iovbuf));
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (unlikely(err)) {
-                WL_ERR(("txglom error (%d)\n", err));
+                WL_ERR("txglom error (%d)\n", err);
                 goto dongle_glom_out;
         }
 dongle_glom_out:
@@ -3487,7 +3481,7 @@ wl_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout)
                             sizeof(iovbuf));
                 err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
                 if (unlikely(err)) {
-                        WL_ERR(("bcn_timeout error (%d)\n", err));
+                        WL_ERR("bcn_timeout error (%d)\n", err);
                         goto dongle_rom_out;
                 }
         }
@@ -3496,7 +3490,7 @@ wl_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout)
         bcm_mkiovar("roam_off", (char *)&roamvar, 4, iovbuf, sizeof(iovbuf));
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (unlikely(err)) {
-                WL_ERR(("roam_off error (%d)\n", err));
+                WL_ERR("roam_off error (%d)\n", err);
                 goto dongle_rom_out;
         }
 dongle_rom_out:
@@ -3516,7 +3510,7 @@ static s32 wl_dongle_eventmsg(struct net_device *ndev)
                     sizeof(iovbuf));
         err = wl_dev_ioctl(ndev, WLC_GET_VAR, iovbuf, sizeof(iovbuf));
         if (unlikely(err)) {
-                WL_ERR(("Get event_msgs error (%d)\n", err));
+                WL_ERR("Get event_msgs error (%d)\n", err);
                 goto dongle_eventmsg_out;
         }
         memcpy(eventmask, iovbuf, WL_EVENTING_MASK_LEN);
@@ -3544,7 +3538,7 @@ static s32 wl_dongle_eventmsg(struct net_device *ndev)
                     sizeof(iovbuf));
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (unlikely(err)) {
-                WL_ERR(("Set event_msgs error (%d)\n", err));
+                WL_ERR("Set event_msgs error (%d)\n", err);
                 goto dongle_eventmsg_out;
         }
 
@@ -3562,9 +3556,9 @@ wl_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
                         sizeof(scan_assoc_time));
         if (err) {
                 if (err == -EOPNOTSUPP) {
-                        WL_INFO(("Scan assoc time is not supported\n"));
+                        WL_INFO("Scan assoc time is not supported\n");
                 } else {
-                        WL_ERR(("Scan assoc time error (%d)\n", err));
+                        WL_ERR("Scan assoc time error (%d)\n", err);
                 }
                 goto dongle_scantime_out;
         }
@@ -3572,9 +3566,9 @@ wl_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
                         sizeof(scan_unassoc_time));
         if (err) {
                 if (err == -EOPNOTSUPP) {
-                        WL_INFO(("Scan unassoc time is not supported\n"));
+                        WL_INFO("Scan unassoc time is not supported\n");
                 } else {
-                        WL_ERR(("Scan unassoc time error (%d)\n", err));
+                        WL_ERR("Scan unassoc time error (%d)\n", err);
                 }
                 goto dongle_scantime_out;
         }
@@ -3595,9 +3589,9 @@ wl_dongle_offload(struct net_device *ndev, s32 arpoe, s32 arp_ol)
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (err) {
                 if (err == -EOPNOTSUPP)
-                        WL_INFO(("arpoe is not supported\n"));
+                        WL_INFO("arpoe is not supported\n");
                 else
-                        WL_ERR(("arpoe error (%d)\n", err));
+                        WL_ERR("arpoe error (%d)\n", err);
 
                 goto dongle_offload_out;
         }
@@ -3605,9 +3599,9 @@ wl_dongle_offload(struct net_device *ndev, s32 arpoe, s32 arp_ol)
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (err) {
                 if (err == -EOPNOTSUPP)
-                        WL_INFO(("arp_ol is not supported\n"));
+                        WL_INFO("arp_ol is not supported\n");
                 else
-                        WL_ERR(("arp_ol error (%d)\n", err));
+                        WL_ERR("arp_ol error (%d)\n", err);
 
                 goto dongle_offload_out;
         }
@@ -3620,12 +3614,12 @@ static s32 wl_pattern_atoh(s8 *src, s8 *dst)
 {
         int i;
         if (strncmp(src, "0x", 2) != 0 && strncmp(src, "0X", 2) != 0) {
-                WL_ERR(("Mask invalid format. Needs to start with 0x\n"));
+                WL_ERR("Mask invalid format. Needs to start with 0x\n");
                 return -1;
         }
         src = src + 2;          /* Skip past 0x */
         if (strlen(src) % 2 != 0) {
-                WL_ERR(("Mask invalid format. Needs to be of even length\n"));
+                WL_ERR("Mask invalid format. Needs to be of even length\n");
                 return -1;
         }
         for (i = 0; *src != '\0'; i++) {
@@ -3684,7 +3678,7 @@ static s32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode)
                                               mask_and_pattern[mask_size]));
 
         if (mask_size != pattern_size) {
-                WL_ERR(("Mask and pattern not the same size\n"));
+                WL_ERR("Mask and pattern not the same size\n");
                 err = -EINVAL;
                 goto dongle_filter_out;
         }
@@ -3704,9 +3698,9 @@ static s32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode)
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, buf, buf_len);
         if (err) {
                 if (err == -EOPNOTSUPP) {
-                        WL_INFO(("filter not supported\n"));
+                        WL_INFO("filter not supported\n");
                 } else {
-                        WL_ERR(("filter (%d)\n", err));
+                        WL_ERR("filter (%d)\n", err);
                 }
                 goto dongle_filter_out;
         }
@@ -3717,9 +3711,9 @@ static s32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode)
         err = wl_dev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf));
         if (err) {
                 if (err == -EOPNOTSUPP) {
-                        WL_INFO(("filter_mode not supported\n"));
+                        WL_INFO("filter_mode not supported\n");
                 } else {
-                        WL_ERR(("filter_mode (%d)\n", err));
+                        WL_ERR("filter_mode (%d)\n", err);
                 }
                 goto dongle_filter_out;
         }
@@ -3800,12 +3794,12 @@ static s32 wl_update_wiphybands(struct wl_priv *wl)
         err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_PHYLIST, &phy_list,
                         sizeof(phy_list));
         if (unlikely(err)) {
-                WL_ERR(("error (%d)\n", err));
+                WL_ERR("error (%d)\n", err);
                 return err;
         }
 
         phy = ((char *)&phy_list)[1];
-        WL_DBG(("%c phy\n", phy));
+        WL_DBG("%c phy\n", phy);
         if (phy == 'n' || phy == 'a') {
                 wiphy = wl_to_wiphy(wl);
                 wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
@@ -3911,7 +3905,7 @@ static void *wl_read_prof(struct wl_priv *wl, s32 item)
         case WL_PROF_SSID:
                 return &wl->profile->ssid;
         }
-        WL_ERR(("invalid item (%d)\n", item));
+        WL_ERR("invalid item (%d)\n", item);
         return NULL;
 }
 
@@ -3932,9 +3926,9 @@ wl_update_prof(struct wl_priv *wl, const wl_event_msg_t *e, void *data,
                 break;
         case WL_PROF_BSSID:
                 if (data)
-                        memcpy(wl->profile->bssid, data, ETHER_ADDR_LEN);
+                        memcpy(wl->profile->bssid, data, ETH_ALEN);
                 else
-                        memset(wl->profile->bssid, 0, ETHER_ADDR_LEN);
+                        memset(wl->profile->bssid, 0, ETH_ALEN);
                 break;
         case WL_PROF_SEC:
                 memcpy(&wl->profile->sec, data, sizeof(wl->profile->sec));
@@ -3949,7 +3943,7 @@ wl_update_prof(struct wl_priv *wl, const wl_event_msg_t *e, void *data,
                 wl->profile->dtim_period = *(u8 *)data;
                 break;
         default:
-                WL_ERR(("unsupported item (%d)\n", item));
+                WL_ERR("unsupported item (%d)\n", item);
                 err = -EOPNOTSUPP;
                 break;
         }
@@ -3991,7 +3985,7 @@ static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v)
         s32 err = 0;
 
         if (unlikely(ie->offset + l + 2 > WL_TLV_INFO_MAX)) {
-                WL_ERR(("ei crosses buffer boundary\n"));
+                WL_ERR("ei crosses buffer boundary\n");
                 return -ENOSPC;
         }
         ie->buf[ie->offset] = t;
@@ -4008,7 +4002,7 @@ static s32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size)
         s32 err = 0;
 
         if (unlikely(ie->offset + ie_size > WL_TLV_INFO_MAX)) {
-                WL_ERR(("ei_stream crosses buffer boundary\n"));
+                WL_ERR("ei_stream crosses buffer boundary\n");
                 return -ENOSPC;
         }
         memcpy(&ie->buf[ie->offset], ie_stream, ie_size);
@@ -4023,7 +4017,7 @@ static s32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size)
         s32 err = 0;
 
         if (unlikely(ie->offset > dst_size)) {
-                WL_ERR(("dst_size is not enough\n"));
+                WL_ERR("dst_size is not enough\n");
                 return -ENOSPC;
         }
         memcpy(dst, &ie->buf[0], ie->offset);
@@ -4123,37 +4117,37 @@ void *wl_cfg80211_request_fw(s8 *file_name)
         const struct firmware *fw_entry = NULL;
         s32 err = 0;
 
-        WL_DBG(("file name : \"%s\"\n", file_name));
+        WL_DBG("file name : \"%s\"\n", file_name);
         wl = WL_PRIV_GET();
 
         if (!test_bit(WL_FW_LOADING_DONE, &wl->fw->status)) {
                 err = request_firmware(&wl->fw->fw_entry, file_name,
                                 &wl_cfg80211_get_sdio_func()->dev);
                 if (unlikely(err)) {
-                        WL_ERR(("Could not download fw (%d)\n", err));
+                        WL_ERR("Could not download fw (%d)\n", err);
                         goto req_fw_out;
                 }
                 set_bit(WL_FW_LOADING_DONE, &wl->fw->status);
                 fw_entry = wl->fw->fw_entry;
                 if (fw_entry) {
-                        WL_DBG(("fw size (%zd), data (%p)\n", fw_entry->size,
-                                fw_entry->data));
+                        WL_DBG("fw size (%zd), data (%p)\n",
+                               fw_entry->size, fw_entry->data);
                 }
         } else if (!test_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status)) {
                 err = request_firmware(&wl->fw->fw_entry, file_name,
                                 &wl_cfg80211_get_sdio_func()->dev);
                 if (unlikely(err)) {
-                        WL_ERR(("Could not download nvram (%d)\n", err));
+                        WL_ERR("Could not download nvram (%d)\n", err);
                         goto req_fw_out;
                 }
                 set_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status);
                 fw_entry = wl->fw->fw_entry;
                 if (fw_entry) {
-                        WL_DBG(("nvram size (%zd), data (%p)\n", fw_entry->size,
-                                fw_entry->data));
+                        WL_DBG("nvram size (%zd), data (%p)\n",
+                               fw_entry->size, fw_entry->data);
                 }
         } else {
-                WL_DBG(("Downloading already done. Nothing to do more\n"));
+                WL_DBG("Downloading already done. Nothing to do more\n");
                 err = -EPERM;
         }
 
@@ -4189,10 +4183,10 @@ static void wl_set_mpc(struct net_device *ndev, int mpc)
 
         err = wl_dev_intvar_set(ndev, "mpc", mpc);
         if (unlikely(err)) {
-                WL_ERR(("fail to set mpc\n"));
+                WL_ERR("fail to set mpc\n");
                 return;
         }
-        WL_DBG(("MPC : %d\n", mpc));
+        WL_DBG("MPC : %d\n", mpc);
 }
 
 static int wl_debugfs_add_netdev_params(struct wl_priv *wl)
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
index 770e63f0c8ef..482691be210a 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -54,34 +54,36 @@ struct wl_ibss;
 
 #define WL_DBG_LEVEL 1          /* 0 invalidates all debug messages.
                                  default is 1 */
-#define WL_ERR(args)                                                                    \
-do {                                                                            \
-        if (wl_dbg_level & WL_DBG_ERR) {                                \
-                if (net_ratelimit()) {                                          \
-                        printk(KERN_ERR "ERROR @%s : ", __func__);      \
-                        printk args;                                            \
-                }                                                               \
-        }                                                                       \
+#define WL_ERR(fmt, args...)                                    \
+do {                                                            \
+        if (wl_dbg_level & WL_DBG_ERR) {                        \
+                if (net_ratelimit()) {                          \
+                        printk(KERN_ERR "ERROR @%s : " fmt,     \
+                               __func__, ##args);               \
+                }                                               \
+        }                                                       \
 } while (0)
-#define WL_INFO(args)                                                                   \
-do {                                                                            \
-        if (wl_dbg_level & WL_DBG_INFO) {                               \
-                if (net_ratelimit()) {                                          \
-                        printk(KERN_ERR "INFO @%s : ", __func__);       \
-                        printk args;                                            \
-                }                                                               \
-        }                                                                       \
+
+#define WL_INFO(fmt, args...)                                   \
+do {                                                            \
+        if (wl_dbg_level & WL_DBG_INFO) {                       \
+                if (net_ratelimit()) {                          \
+                        printk(KERN_ERR "INFO @%s : " fmt,      \
+                               __func__, ##args);               \
+                }                                               \
+        }                                                       \
 } while (0)
+
 #if (WL_DBG_LEVEL > 0)
-#define WL_DBG(args)                                                            \
-do {                                                                    \
+#define WL_DBG(fmt, args...)                                    \
+do {                                                            \
         if (wl_dbg_level & WL_DBG_DBG) {                        \
-                printk(KERN_ERR "DEBUG @%s :", __func__);       \
-                printk args;                                                    \
-        }                                                                       \
+                printk(KERN_ERR "DEBUG @%s :" fmt,              \
+                       __func__, ##args);                       \
+        }                                                       \
 } while (0)
 #else                           /* !(WL_DBG_LEVEL > 0) */
-#define WL_DBG(args)
+#define WL_DBG(fmt, args...) noprintk(fmt, ##args)
 #endif                          /* (WL_DBG_LEVEL > 0) */
 
 #define WL_SCAN_RETRY_MAX       3       /* used for ibss scan */
@@ -237,7 +239,7 @@ struct wl_ibss {
 struct wl_profile {
         u32 mode;
         struct wlc_ssid ssid;
-        u8 bssid[ETHER_ADDR_LEN];
+        u8 bssid[ETH_ALEN];
         u16 beacon_interval;
         u8 dtim_period;
         struct wl_security sec;
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 979a494fda59..db6e68eab290 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -15,8 +15,9 @@
  */
 
 #include <linux/kthread.h>
+#include <linux/semaphore.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <wlioctl.h>
 
@@ -31,20 +32,18 @@
 #include <dhd.h>
 #include <dhdioctl.h>
 
-typedef void wlc_info_t;
-typedef void wl_info_t;
 typedef const struct si_pub si_t;
 #include <wlioctl.h>
 
 #include <proto/ethernet.h>
 #include <dngl_stats.h>
 #include <dhd.h>
-#define WL_ERROR(x) printf x
-#define WL_TRACE(x)
-#define WL_ASSOC(x)
-#define WL_INFORM(x)
-#define WL_WSEC(x)
-#define WL_SCAN(x)
+
+#define WL_ERROR(fmt, args...)  printk(fmt, ##args)
+#define WL_TRACE(fmt, args...)  no_printk(fmt, ##args)
+#define WL_INFORM(fmt, args...) no_printk(fmt, ##args)
+#define WL_WSEC(fmt, args...)   no_printk(fmt, ##args)
+#define WL_SCAN(fmt, args...)   no_printk(fmt, ##args)
 
 #include <wl_iw.h>
 
@@ -187,12 +186,12 @@ static int dev_wlc_ioctl(struct net_device *dev, int cmd, void *arg, int len)
         int ret = -EINVAL;
 
         if (!dev) {
-                WL_ERROR(("%s: dev is null\n", __func__));
+                WL_ERROR("%s: dev is null\n", __func__);
                 return ret;
         }
 
-        WL_INFORM(("\n%s, PID:%x: send Local IOCTL -> dhd: cmd:0x%x, buf:%p, "
-                "len:%d ,\n", __func__, current->pid, cmd, arg, len));
+        WL_INFORM("\n%s, PID:%x: send Local IOCTL -> dhd: cmd:0x%x, buf:%p, len:%d\n",
+                  __func__, current->pid, cmd, arg, len);
 
         if (g_onoff == G_WLAN_SET_ON) {
                 memset(&ioc, 0, sizeof(ioc));
@@ -205,7 +204,7 @@ static int dev_wlc_ioctl(struct net_device *dev, int cmd, void *arg, int len)
 
                 ret = dev_open(dev);
                 if (ret) {
-                        WL_ERROR(("%s: Error dev_open: %d\n", __func__, ret));
+                        WL_ERROR("%s: Error dev_open: %d\n", __func__, ret);
                         return ret;
                 }
 
@@ -214,7 +213,7 @@ static int dev_wlc_ioctl(struct net_device *dev, int cmd, void *arg, int len)
                 ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
                 set_fs(fs);
         } else {
-                WL_TRACE(("%s: call after driver stop : ignored\n", __func__));
+                WL_TRACE("%s: call after driver stop : ignored\n", __func__);
         }
         return ret;
 }
@@ -335,7 +334,7 @@ wl_iw_config_commit(struct net_device *dev,
         int error;
         struct sockaddr bssid;
 
-        WL_TRACE(("%s: SIOCSIWCOMMIT\n", dev->name));
+        WL_TRACE("%s: SIOCSIWCOMMIT\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
         if (error)
@@ -346,11 +345,11 @@ wl_iw_config_commit(struct net_device *dev,
         if (!ssid.SSID_len)
                 return 0;
 
-        bzero(&bssid, sizeof(struct sockaddr));
-        error = dev_wlc_ioctl(dev, WLC_REASSOC, &bssid, ETHER_ADDR_LEN);
+        memset(&bssid, 0, sizeof(struct sockaddr));
+        error = dev_wlc_ioctl(dev, WLC_REASSOC, &bssid, ETH_ALEN);
         if (error) {
-                WL_ERROR(("%s: WLC_REASSOC to %s failed \n", __func__,
-                          ssid.SSID));
+                WL_ERROR("%s: WLC_REASSOC to %s failed\n",
+                         __func__, ssid.SSID);
                 return error;
         }
 
@@ -361,7 +360,7 @@ static int
 wl_iw_get_name(struct net_device *dev,
                struct iw_request_info *info, char *cwrq, char *extra)
 {
-        WL_TRACE(("%s: SIOCGIWNAME\n", dev->name));
+        WL_TRACE("%s: SIOCGIWNAME\n", dev->name);
 
         strcpy(cwrq, "IEEE 802.11-DS");
 
@@ -375,7 +374,7 @@ wl_iw_set_freq(struct net_device *dev,
         int error, chan;
         uint sf = 0;
 
-        WL_TRACE(("\n %s %s: SIOCSIWFREQ\n", __func__, dev->name));
+        WL_TRACE("\n %s %s: SIOCSIWFREQ\n", __func__, dev->name);
 
         if (fwrq->e == 0 && fwrq->m < MAXCHANNEL) {
                 chan = fwrq->m;
@@ -410,7 +409,7 @@ wl_iw_get_freq(struct net_device *dev,
         channel_info_t ci;
         int error;
 
-        WL_TRACE(("%s: SIOCGIWFREQ\n", dev->name));
+        WL_TRACE("%s: SIOCGIWFREQ\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_CHANNEL, &ci, sizeof(ci));
         if (error)
@@ -427,7 +426,7 @@ wl_iw_set_mode(struct net_device *dev,
 {
         int infra = 0, ap = 0, error = 0;
 
-        WL_TRACE(("%s: SIOCSIWMODE\n", dev->name));
+        WL_TRACE("%s: SIOCSIWMODE\n", dev->name);
 
         switch (*uwrq) {
         case IW_MODE_MASTER:
@@ -462,7 +461,7 @@ wl_iw_get_mode(struct net_device *dev,
 {
         int error, infra = 0, ap = 0;
 
-        WL_TRACE(("%s: SIOCGIWMODE\n", dev->name));
+        WL_TRACE("%s: SIOCGIWMODE\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_INFRA, &infra, sizeof(infra));
         if (error)
@@ -501,14 +500,14 @@ wl_iw_get_range(struct net_device *dev,
         {30, 60, 90, 120, 180, 240, 270, 300}
         };
 
-        WL_TRACE(("%s: SIOCGIWRANGE\n", dev->name));
+        WL_TRACE("%s: SIOCGIWRANGE\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
 
         channels = kmalloc((MAXCHANNEL + 1) * 4, GFP_KERNEL);
         if (!channels) {
-                WL_ERROR(("Could not alloc channels\n"));
+                WL_ERROR("Could not alloc channels\n");
                 return -ENOMEM;
         }
         list = (wl_u32_list_t *) channels;
@@ -684,14 +683,14 @@ wl_iw_set_spy(struct net_device *dev,
         struct sockaddr *addr = (struct sockaddr *)extra;
         int i;
 
-        WL_TRACE(("%s: SIOCSIWSPY\n", dev->name));
+        WL_TRACE("%s: SIOCSIWSPY\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
 
         iw->spy_num = min_t(int, ARRAY_SIZE(iw->spy_addr), dwrq->length);
         for (i = 0; i < iw->spy_num; i++)
-                memcpy(&iw->spy_addr[i], addr[i].sa_data, ETHER_ADDR_LEN);
+                memcpy(&iw->spy_addr[i], addr[i].sa_data, ETH_ALEN);
         memset(iw->spy_qual, 0, sizeof(iw->spy_qual));
 
         return 0;
@@ -706,14 +705,14 @@ wl_iw_get_spy(struct net_device *dev,
         struct iw_quality *qual = (struct iw_quality *)&addr[iw->spy_num];
         int i;
 
-        WL_TRACE(("%s: SIOCGIWSPY\n", dev->name));
+        WL_TRACE("%s: SIOCGIWSPY\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
 
         dwrq->length = iw->spy_num;
         for (i = 0; i < iw->spy_num; i++) {
-                memcpy(addr[i].sa_data, &iw->spy_addr[i], ETHER_ADDR_LEN);
+                memcpy(addr[i].sa_data, &iw->spy_addr[i], ETH_ALEN);
                 addr[i].sa_family = AF_UNIX;
                 memcpy(&qual[i], &iw->spy_qual[i], sizeof(struct iw_quality));
                 iw->spy_qual[i].updated = 0;
@@ -751,8 +750,8 @@ wl_iw_ch_to_chanspec(int ch, wl_join_params_t *join_params,
                 join_params->params.chanspec_num =
                     htod32(join_params->params.chanspec_num);
 
-                WL_TRACE(("%s  join_params->params.chanspec_list[0]= %X\n",
-                          __func__, join_params->params.chanspec_list[0]));
+                WL_TRACE("%s  join_params->params.chanspec_list[0]= %X\n",
+                         __func__, join_params->params.chanspec_list[0]);
         }
         return 1;
 }
@@ -765,16 +764,17 @@ wl_iw_set_wap(struct net_device *dev,
         wl_join_params_t join_params;
         int join_params_size;
 
-        WL_TRACE(("%s: SIOCSIWAP\n", dev->name));
+        WL_TRACE("%s: SIOCSIWAP\n", dev->name);
 
         if (awrq->sa_family != ARPHRD_ETHER) {
-                WL_ERROR(("Invalid Header...sa_family\n"));
+                WL_ERROR("Invalid Header...sa_family\n");
                 return -EINVAL;
         }
 
-        if (ETHER_ISBCAST(awrq->sa_data) || ETHER_ISNULLADDR(awrq->sa_data)) {
+        if (is_broadcast_ether_addr(awrq->sa_data) ||
+            is_zero_ether_addr(awrq->sa_data)) {
                 scb_val_t scbval;
-                bzero(&scbval, sizeof(scb_val_t));
+                memset(&scbval, 0, sizeof(scb_val_t));
                 (void)dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval,
                                     sizeof(scb_val_t));
                 return 0;
@@ -785,23 +785,23 @@ wl_iw_set_wap(struct net_device *dev,
 
         memcpy(join_params.ssid.SSID, g_ssid.SSID, g_ssid.SSID_len);
         join_params.ssid.SSID_len = htod32(g_ssid.SSID_len);
-        memcpy(&join_params.params.bssid, awrq->sa_data, ETHER_ADDR_LEN);
+        memcpy(&join_params.params.bssid, awrq->sa_data, ETH_ALEN);
 
-        WL_TRACE(("%s  target_channel=%d\n", __func__,
-                  g_wl_iw_params.target_channel));
+        WL_TRACE("%s  target_channel=%d\n",
+                 __func__, g_wl_iw_params.target_channel);
         wl_iw_ch_to_chanspec(g_wl_iw_params.target_channel, &join_params,
                              &join_params_size);
 
         error = dev_wlc_ioctl(dev, WLC_SET_SSID, &join_params,
                                 join_params_size);
         if (error) {
-                WL_ERROR(("%s Invalid ioctl data=%d\n", __func__, error));
+                WL_ERROR("%s Invalid ioctl data=%d\n", __func__, error);
         }
 
         if (g_ssid.SSID_len) {
-                WL_TRACE(("%s: join SSID=%s BSSID=%pM ch=%d\n",
-                          __func__, g_ssid.SSID, awrq->sa_data,
-                          g_wl_iw_params.target_channel));
+                WL_TRACE("%s: join SSID=%s BSSID=%pM ch=%d\n",
+                         __func__, g_ssid.SSID, awrq->sa_data,
+                         g_wl_iw_params.target_channel);
         }
 
         memset(&g_ssid, 0, sizeof(g_ssid));
@@ -812,12 +812,12 @@ static int
 wl_iw_get_wap(struct net_device *dev,
               struct iw_request_info *info, struct sockaddr *awrq, char *extra)
 {
-        WL_TRACE(("%s: SIOCGIWAP\n", dev->name));
+        WL_TRACE("%s: SIOCGIWAP\n", dev->name);
 
         awrq->sa_family = ARPHRD_ETHER;
-        memset(awrq->sa_data, 0, ETHER_ADDR_LEN);
+        memset(awrq->sa_data, 0, ETH_ALEN);
 
-        (void)dev_wlc_ioctl(dev, WLC_GET_BSSID, awrq->sa_data, ETHER_ADDR_LEN);
+        (void)dev_wlc_ioctl(dev, WLC_GET_BSSID, awrq->sa_data, ETH_ALEN);
 
         return 0;
 }
@@ -831,16 +831,16 @@ wl_iw_mlme(struct net_device *dev,
         scb_val_t scbval;
         int error = -EINVAL;
 
-        WL_TRACE(("%s: SIOCSIWMLME DISASSOC/DEAUTH\n", dev->name));
+        WL_TRACE("%s: SIOCSIWMLME DISASSOC/DEAUTH\n", dev->name);
 
         mlme = (struct iw_mlme *)extra;
         if (mlme == NULL) {
-                WL_ERROR(("Invalid ioctl data.\n"));
+                WL_ERROR("Invalid ioctl data\n");
                 return error;
         }
 
         scbval.val = mlme->reason_code;
-        bcopy(&mlme->addr.sa_data, &scbval.ea, ETHER_ADDR_LEN);
+        bcopy(&mlme->addr.sa_data, &scbval.ea, ETH_ALEN);
 
         if (mlme->cmd == IW_MLME_DISASSOC) {
                 scbval.val = htod32(scbval.val);
@@ -853,7 +853,7 @@ wl_iw_mlme(struct net_device *dev,
                     dev_wlc_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON,
                                   &scbval, sizeof(scb_val_t));
         } else {
-                WL_ERROR(("Invalid ioctl data.\n"));
+                WL_ERROR("Invalid ioctl data\n");
                 return error;
         }
 
@@ -874,7 +874,7 @@ wl_iw_get_aplist(struct net_device *dev,
         int error, i;
         uint buflen = dwrq->length;
 
-        WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
+        WL_TRACE("%s: SIOCGIWAPLIST\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
@@ -886,7 +886,7 @@ wl_iw_get_aplist(struct net_device *dev,
         list->buflen = htod32(buflen);
         error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, buflen);
         if (error) {
-                WL_ERROR(("%d: Scan results error %d\n", __LINE__, error));
+                WL_ERROR("%d: Scan results error %d\n", __LINE__, error);
                 kfree(list);
                 return error;
         }
@@ -894,8 +894,8 @@ wl_iw_get_aplist(struct net_device *dev,
         list->version = dtoh32(list->version);
         list->count = dtoh32(list->count);
         if (list->version != WL_BSS_INFO_VERSION) {
-                WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n",
-                          __func__, list->version));
+                WL_ERROR("%s : list->version %d != WL_BSS_INFO_VERSION\n",
+                         __func__, list->version);
                 kfree(list);
                 return -EINVAL;
         }
@@ -911,7 +911,7 @@ wl_iw_get_aplist(struct net_device *dev,
                 if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
                         continue;
 
-                memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETHER_ADDR_LEN);
+                memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETH_ALEN);
                 addr[dwrq->length].sa_family = ARPHRD_ETHER;
                 qual[dwrq->length].qual = rssi_to_qual(dtoh16(bi->RSSI));
                 qual[dwrq->length].level = 0x100 + dtoh16(bi->RSSI);
@@ -952,13 +952,13 @@ wl_iw_iscan_get_aplist(struct net_device *dev,
         wl_bss_info_t *bi = NULL;
         int i;
 
-        WL_TRACE(("%s: SIOCGIWAPLIST\n", dev->name));
+        WL_TRACE("%s: SIOCGIWAPLIST\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
 
         if ((!iscan) || (!iscan->sysioc_tsk)) {
-                WL_ERROR(("%s error\n", __func__));
+                WL_ERROR("%s error\n", __func__);
                 return 0;
         }
 
@@ -966,9 +966,8 @@ wl_iw_iscan_get_aplist(struct net_device *dev,
         while (buf) {
                 list = &((wl_iscan_results_t *) buf->iscan_buf)->results;
                 if (list->version != WL_BSS_INFO_VERSION) {
-                        WL_ERROR(("%s : list->version %d != "
-                                "WL_BSS_INFO_VERSION\n",
-                                __func__, list->version));
+                        WL_ERROR("%s : list->version %d != WL_BSS_INFO_VERSION\n",
+                                 __func__, list->version);
                         return -EINVAL;
                 }
 
@@ -985,7 +984,7 @@ wl_iw_iscan_get_aplist(struct net_device *dev,
                                 continue;
 
                         memcpy(addr[dwrq->length].sa_data, &bi->BSSID,
-                               ETHER_ADDR_LEN);
+                               ETH_ALEN);
                         addr[dwrq->length].sa_family = ARPHRD_ETHER;
                         qual[dwrq->length].qual =
                             rssi_to_qual(dtoh16(bi->RSSI));
@@ -1016,7 +1015,7 @@ static int wl_iw_iscan_prep(wl_scan_params_t *params, wlc_ssid_t *ssid)
 {
         int err = 0;
 
-        memcpy(&params->bssid, &ether_bcast, ETHER_ADDR_LEN);
+        memcpy(&params->bssid, &ether_bcast, ETH_ALEN);
         params->bss_type = DOT11_BSSTYPE_ANY;
         params->scan_type = 0;
         params->nprobes = -1;
@@ -1043,15 +1042,15 @@ static int wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, u16 action)
         iscan->iscan_ex_params_p->action = htod16(action);
         iscan->iscan_ex_params_p->scan_duration = htod16(0);
 
-        WL_SCAN(("%s : nprobes=%d\n", __func__,
-                 iscan->iscan_ex_params_p->params.nprobes));
-        WL_SCAN(("active_time=%d\n",
-                 iscan->iscan_ex_params_p->params.active_time));
-        WL_SCAN(("passive_time=%d\n",
-                 iscan->iscan_ex_params_p->params.passive_time));
-        WL_SCAN(("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time));
-        WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
-        WL_SCAN(("bss_type=%d\n", iscan->iscan_ex_params_p->params.bss_type));
+        WL_SCAN("%s : nprobes=%d\n",
+                __func__, iscan->iscan_ex_params_p->params.nprobes);
+        WL_SCAN("active_time=%d\n",
+                 iscan->iscan_ex_params_p->params.active_time);
+        WL_SCAN("passive_time=%d\n",
+                 iscan->iscan_ex_params_p->params.passive_time);
+        WL_SCAN("home_time=%d\n", iscan->iscan_ex_params_p->params.home_time);
+        WL_SCAN("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type);
+        WL_SCAN("bss_type=%d\n", iscan->iscan_ex_params_p->params.bss_type);
 
         (void)dev_iw_iovar_setbuf(iscan->dev, "iscan", iscan->iscan_ex_params_p,
                                   iscan->iscan_ex_param_size, iscan->ioctlbuf,
@@ -1066,7 +1065,7 @@ static void wl_iw_timerfunc(unsigned long data)
         if (iscan) {
                 iscan->timer_on = 0;
                 if (iscan->iscan_state != ISCAN_STATE_IDLE) {
-                        WL_TRACE(("timer trigger\n"));
+                        WL_TRACE("timer trigger\n");
                         up(&iscan->sysioc_sem);
                 }
         }
@@ -1101,8 +1100,8 @@ static u32 wl_iw_iscan_get(iscan_info_t *iscan)
         } else {
                 buf = kmalloc(sizeof(iscan_buf_t), GFP_KERNEL);
                 if (!buf) {
-                        WL_ERROR(("%s can't alloc iscan_buf_t : going to abort "
-                                "currect iscan\n", __func__));
+                        WL_ERROR("%s can't alloc iscan_buf_t : going to abort current iscan\n",
+                                 __func__);
                         MUTEX_UNLOCK_WL_SCAN_SET();
                         return WL_SCAN_RESULTS_NO_MEM;
                 }
@@ -1135,11 +1134,11 @@ static u32 wl_iw_iscan_get(iscan_info_t *iscan)
                 results->buflen = dtoh32(results->buflen);
                 results->version = dtoh32(results->version);
                 results->count = dtoh32(results->count);
-                WL_TRACE(("results->count = %d\n", results->count));
-                WL_TRACE(("results->buflen = %d\n", results->buflen));
+                WL_TRACE("results->count = %d\n", results->count);
+                WL_TRACE("results->buflen = %d\n", results->buflen);
                 status = dtoh32(list_buf->status);
         } else {
-                WL_ERROR(("%s returns error %d\n", __func__, res));
+                WL_ERROR("%s returns error %d\n", __func__, res);
                 status = WL_SCAN_RESULTS_NO_MEM;
         }
         MUTEX_UNLOCK_WL_SCAN_SET();
@@ -1148,8 +1147,8 @@ static u32 wl_iw_iscan_get(iscan_info_t *iscan)
 
 static void wl_iw_force_specific_scan(iscan_info_t *iscan)
 {
-        WL_TRACE(("%s force Specific SCAN for %s\n", __func__,
-                  g_specific_ssid.SSID));
+        WL_TRACE("%s force Specific SCAN for %s\n",
+                 __func__, g_specific_ssid.SSID);
         rtnl_lock();
 
         (void)dev_wlc_ioctl(iscan->dev, WLC_SCAN, &g_specific_ssid,
@@ -1166,7 +1165,7 @@ static void wl_iw_send_scan_complete(iscan_info_t *iscan)
         memset(&wrqu, 0, sizeof(wrqu));
 
         wireless_send_event(iscan->dev, SIOCGIWSCAN, &wrqu, NULL);
-        WL_TRACE(("Send Event ISCAN complete\n"));
+        WL_TRACE("Send Event ISCAN complete\n");
 #endif
 }
 
@@ -1190,8 +1189,8 @@ static int _iscan_sysioc_thread(void *data)
                 status = wl_iw_iscan_get(iscan);
                 rtnl_unlock();
                 if (g_scan_specified_ssid && (iscan_pass_abort == true)) {
-                        WL_TRACE(("%s Get results from specific scan "
-                                "status = %d\n", __func__, status));
+                        WL_TRACE("%s Get results from specific scan status = %d\n",
+                                 __func__, status);
                         wl_iw_send_scan_complete(iscan);
                         iscan_pass_abort = false;
                         status = -1;
@@ -1199,7 +1198,7 @@ static int _iscan_sysioc_thread(void *data)
 
                 switch (status) {
                 case WL_SCAN_RESULTS_PARTIAL:
-                        WL_TRACE(("iscanresults incomplete\n"));
+                        WL_TRACE("iscanresults incomplete\n");
                         rtnl_lock();
                         wl_iw_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE);
                         rtnl_unlock();
@@ -1208,18 +1207,18 @@ static int _iscan_sysioc_thread(void *data)
                         iscan->timer_on = 1;
                         break;
                 case WL_SCAN_RESULTS_SUCCESS:
-                        WL_TRACE(("iscanresults complete\n"));
+                        WL_TRACE("iscanresults complete\n");
                         iscan->iscan_state = ISCAN_STATE_IDLE;
                         wl_iw_send_scan_complete(iscan);
                         break;
                 case WL_SCAN_RESULTS_PENDING:
-                        WL_TRACE(("iscanresults pending\n"));
+                        WL_TRACE("iscanresults pending\n");
                         mod_timer(&iscan->timer,
                                   jiffies + iscan->timer_ms * HZ / 1000);
                         iscan->timer_on = 1;
                         break;
                 case WL_SCAN_RESULTS_ABORTED:
-                        WL_TRACE(("iscanresults aborted\n"));
+                        WL_TRACE("iscanresults aborted\n");
                         iscan->iscan_state = ISCAN_STATE_IDLE;
                         if (g_scan_specified_ssid == 0)
                                 wl_iw_send_scan_complete(iscan);
@@ -1229,12 +1228,12 @@ static int _iscan_sysioc_thread(void *data)
                         }
                         break;
                 case WL_SCAN_RESULTS_NO_MEM:
-                        WL_TRACE(("iscanresults can't alloc memory: skip\n"));
+                        WL_TRACE("iscanresults can't alloc memory: skip\n");
                         iscan->iscan_state = ISCAN_STATE_IDLE;
                         break;
                 default:
-                        WL_TRACE(("iscanresults returned unknown status %d\n",
-                                  status));
+                        WL_TRACE("iscanresults returned unknown status %d\n",
+                                 status);
                         break;
                 }
         }
@@ -1253,11 +1252,11 @@ wl_iw_set_scan(struct net_device *dev,
                union iwreq_data *wrqu, char *extra)
 {
         int error;
-        WL_TRACE(("\n:%s dev:%s: SIOCSIWSCAN : SCAN\n", __func__, dev->name));
+        WL_TRACE("\n:%s dev:%s: SIOCSIWSCAN : SCAN\n", __func__, dev->name);
 
         g_set_essid_before_scan = false;
 #if defined(CSCAN)
-        WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __func__));
+        WL_ERROR("%s: Scan from SIOCGIWSCAN not supported\n", __func__);
         return -EINVAL;
 #endif
 
@@ -1274,9 +1273,8 @@ wl_iw_set_scan(struct net_device *dev,
                 if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
                         struct iw_scan_req *req = (struct iw_scan_req *)extra;
                         if (g_scan_specified_ssid) {
-                                WL_TRACE(("%s Specific SCAN is not done ignore "
-                                        "scan for = %s\n",
-                                        __func__, req->essid));
+                                WL_TRACE("%s Specific SCAN is not done ignore scan for = %s\n",
+                                         __func__, req->essid);
                                 return -EBUSY;
                         } else {
                                 g_specific_ssid.SSID_len = min_t(size_t,
@@ -1287,9 +1285,9 @@ wl_iw_set_scan(struct net_device *dev,
                                 g_specific_ssid.SSID_len =
                                     htod32(g_specific_ssid.SSID_len);
                                 g_scan_specified_ssid = 1;
-                                WL_TRACE(("### Specific scan ssid=%s len=%d\n",
-                                          g_specific_ssid.SSID,
-                                          g_specific_ssid.SSID_len));
+                                WL_TRACE("### Specific scan ssid=%s len=%d\n",
+                                         g_specific_ssid.SSID,
+                                         g_specific_ssid.SSID_len);
                         }
                 }
         }
@@ -1297,8 +1295,8 @@ wl_iw_set_scan(struct net_device *dev,
         error = dev_wlc_ioctl(dev, WLC_SCAN, &g_specific_ssid,
                                 sizeof(g_specific_ssid));
         if (error) {
-                WL_TRACE(("#### Set SCAN for %s failed with %d\n",
-                          g_specific_ssid.SSID, error));
+                WL_TRACE("#### Set SCAN for %s failed with %d\n",
+                         g_specific_ssid.SSID, error);
                 g_scan_specified_ssid = 0;
                 return -EBUSY;
         }
@@ -1317,7 +1315,7 @@ int wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag)
 
         wl_iw_set_event_mask(dev);
 
-        WL_TRACE(("+++: Set Broadcast ISCAN\n"));
+        WL_TRACE("+++: Set Broadcast ISCAN\n");
         memset(&ssid, 0, sizeof(ssid));
 
         iscan->list_cur = iscan->list_hdr;
@@ -1346,20 +1344,20 @@ wl_iw_iscan_set_scan(struct net_device *dev,
         wlc_ssid_t ssid;
         iscan_info_t *iscan = g_iscan;
 
-        WL_TRACE(("%s: SIOCSIWSCAN : ISCAN\n", dev->name));
+        WL_TRACE("%s: SIOCSIWSCAN : ISCAN\n", dev->name);
 
 #if defined(CSCAN)
-        WL_ERROR(("%s: Scan from SIOCGIWSCAN not supported\n", __func__));
+        WL_ERROR("%s: Scan from SIOCGIWSCAN not supported\n", __func__);
         return -EINVAL;
 #endif
 
         if (g_onoff == G_WLAN_SET_OFF) {
-                WL_TRACE(("%s: driver is not up yet after START\n", __func__));
+                WL_TRACE("%s: driver is not up yet after START\n", __func__);
                 return 0;
         }
 #ifdef PNO_SUPPORT
         if (dhd_dev_get_pno_status(dev)) {
-                WL_ERROR(("%s: Scan called when PNO is active\n", __func__));
+                WL_ERROR("%s: Scan called when PNO is active\n", __func__);
         }
 #endif
 
@@ -1367,8 +1365,8 @@ wl_iw_iscan_set_scan(struct net_device *dev,
                 return wl_iw_set_scan(dev, info, wrqu, extra);
 
         if (g_scan_specified_ssid) {
-                WL_TRACE(("%s Specific SCAN already running ignoring BC scan\n",
-                          __func__));
+                WL_TRACE("%s Specific SCAN already running ignoring BC scan\n",
+                         __func__);
                 return EBUSY;
         }
 
@@ -1386,8 +1384,8 @@ wl_iw_iscan_set_scan(struct net_device *dev,
                         g_scan_specified_ssid = 0;
 
                         if (iscan->iscan_state == ISCAN_STATE_SCANING) {
-                                WL_TRACE(("%s ISCAN already in progress \n",
-                                          __func__));
+                                WL_TRACE("%s ISCAN already in progress\n",
+                                         __func__);
                                 return 0;
                         }
                 }
@@ -1406,7 +1404,7 @@ static bool ie_is_wpa_ie(u8 **wpaie, u8 **tlvs, int *tlvs_len)
         u8 *ie = *wpaie;
 
         if ((ie[1] >= 6) &&
-            !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) {
+            !memcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) {
                 return true;
         }
 
@@ -1422,7 +1420,7 @@ static bool ie_is_wps_ie(u8 **wpsie, u8 **tlvs, int *tlvs_len)
         u8 *ie = *wpsie;
 
         if ((ie[1] >= 4) &&
-            !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) {
+            !memcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) {
                 return true;
         }
 
@@ -1501,9 +1499,8 @@ wl_iw_get_scan_prep(wl_scan_results_t *list,
 
         for (i = 0; i < list->count && i < IW_MAX_AP; i++) {
                 if (list->version != WL_BSS_INFO_VERSION) {
-                        WL_ERROR(("%s : list->version %d != "
-                                "WL_BSS_INFO_VERSION\n",
-                                __func__, list->version));
+                        WL_ERROR("%s : list->version %d != WL_BSS_INFO_VERSION\n",
+                                 __func__, list->version);
                         return ret;
                 }
 
@@ -1511,11 +1508,11 @@ wl_iw_get_scan_prep(wl_scan_results_t *list,
                                              dtoh32(bi->length)) : list->
                     bss_info;
 
-                WL_TRACE(("%s : %s\n", __func__, bi->SSID));
+                WL_TRACE("%s : %s\n", __func__, bi->SSID);
 
                 iwe.cmd = SIOCGIWAP;
                 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-                memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
+                memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETH_ALEN);
                 event =
                     IWE_STREAM_ADD_EVENT(info, event, end, &iwe,
                                          IW_EV_ADDR_LEN);
@@ -1590,11 +1587,11 @@ wl_iw_get_scan_prep(wl_scan_results_t *list,
 
         ret = event - extra;
         if (ret < 0) {
-                WL_ERROR(("==> Wrong size\n"));
+                WL_ERROR("==> Wrong size\n");
                 ret = 0;
         }
-        WL_TRACE(("%s: size=%d bytes prepared\n", __func__,
-                  (unsigned int)(event - extra)));
+        WL_TRACE("%s: size=%d bytes prepared\n",
+                 __func__, (unsigned int)(event - extra));
         return (uint)ret;
 }
 
@@ -1614,10 +1611,10 @@ wl_iw_get_scan(struct net_device *dev,
         iscan_buf_t *p_buf;
 #endif
 
-        WL_TRACE(("%s: buflen_from_user %d: \n", dev->name, buflen_from_user));
+        WL_TRACE("%s: buflen_from_user %d:\n", dev->name, buflen_from_user);
 
         if (!extra) {
-                WL_TRACE(("%s: wl_iw_get_scan return -EINVAL\n", dev->name));
+                WL_TRACE("%s: wl_iw_get_scan return -EINVAL\n", dev->name);
                 return -EINVAL;
         }
 
@@ -1631,8 +1628,8 @@ wl_iw_get_scan(struct net_device *dev,
         if (g_scan_specified_ssid) {
                 list = kmalloc(len, GFP_KERNEL);
                 if (!list) {
-                        WL_TRACE(("%s: wl_iw_get_scan return -ENOMEM\n",
-                                  dev->name));
+                        WL_TRACE("%s: wl_iw_get_scan return -ENOMEM\n",
+                                 dev->name);
                         g_scan_specified_ssid = 0;
                         return -ENOMEM;
                 }
@@ -1642,8 +1639,8 @@ wl_iw_get_scan(struct net_device *dev,
         list->buflen = htod32(len);
         error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, len);
         if (error) {
-                WL_ERROR(("%s: %s : Scan_results ERROR %d\n", dev->name,
-                          __func__, error));
+                WL_ERROR("%s: %s : Scan_results ERROR %d\n",
+                         dev->name, __func__, error);
                 dwrq->length = len;
                 if (g_scan_specified_ssid) {
                         g_scan_specified_ssid = 0;
@@ -1656,8 +1653,8 @@ wl_iw_get_scan(struct net_device *dev,
         list->count = dtoh32(list->count);
 
         if (list->version != WL_BSS_INFO_VERSION) {
-                WL_ERROR(("%s : list->version %d != WL_BSS_INFO_VERSION\n",
-                          __func__, list->version));
+                WL_ERROR("%s : list->version %d != WL_BSS_INFO_VERSION\n",
+                         __func__, list->version);
                 if (g_scan_specified_ssid) {
                         g_scan_specified_ssid = 0;
                         kfree(list);
@@ -1666,8 +1663,8 @@ wl_iw_get_scan(struct net_device *dev,
         }
 
         if (g_scan_specified_ssid) {
-                WL_TRACE(("%s: Specified scan APs in the list =%d\n",
-                          __func__, list->count));
+                WL_TRACE("%s: Specified scan APs in the list =%d\n",
+                         __func__, list->count);
                 len_ret =
                     (__u16) wl_iw_get_scan_prep(list, info, extra,
                                                 buflen_from_user);
@@ -1678,8 +1675,8 @@ wl_iw_get_scan(struct net_device *dev,
                 while (p_buf != iscan->list_cur) {
                         list_merge =
                             &((wl_iscan_results_t *) p_buf->iscan_buf)->results;
-                        WL_TRACE(("%s: Bcast APs list=%d\n", __func__,
-                                  list_merge->count));
+                        WL_TRACE("%s: Bcast APs list=%d\n",
+                                 __func__, list_merge->count);
                         if (list_merge->count > 0)
                                 len_ret +=
                                     (__u16) wl_iw_get_scan_prep(list_merge,
@@ -1689,8 +1686,8 @@ wl_iw_get_scan(struct net_device *dev,
                 }
 #else
                 list_merge = (wl_scan_results_t *) g_scan;
-                WL_TRACE(("%s: Bcast APs list=%d\n", __func__,
-                          list_merge->count));
+                WL_TRACE("%s: Bcast APs list=%d\n",
+                         __func__, list_merge->count);
                 if (list_merge->count > 0)
                         len_ret +=
                             (__u16) wl_iw_get_scan_prep(list_merge, info,
@@ -1714,8 +1711,8 @@ wl_iw_get_scan(struct net_device *dev,
         dwrq->length = len;
         dwrq->flags = 0;
 
-        WL_TRACE(("%s return to WE %d bytes APs=%d\n", __func__,
-                  dwrq->length, list->count));
+        WL_TRACE("%s return to WE %d bytes APs=%d\n",
+                 __func__, dwrq->length, list->count);
         return 0;
 }
 
@@ -1736,26 +1733,26 @@ wl_iw_iscan_get_scan(struct net_device *dev,
         u32 counter = 0;
         u8 channel;
 
-        WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __func__,
-                  dwrq->length));
+        WL_TRACE("%s %s buflen_from_user %d:\n",
+                 dev->name, __func__, dwrq->length);
 
         if (!extra) {
-                WL_TRACE(("%s: INVALID SIOCGIWSCAN GET bad parameter\n",
-                          dev->name));
+                WL_TRACE("%s: INVALID SIOCGIWSCAN GET bad parameter\n",
+                         dev->name);
                 return -EINVAL;
         }
 
         if ((!iscan) || (!iscan->sysioc_tsk)) {
-                WL_ERROR(("%ssysioc_tsk\n", __func__));
+                WL_ERROR("%ssysioc_tsk\n", __func__);
                 return wl_iw_get_scan(dev, info, dwrq, extra);
         }
 
         if (iscan->iscan_state == ISCAN_STATE_SCANING) {
-                WL_TRACE(("%s: SIOCGIWSCAN GET still scanning\n", dev->name));
+                WL_TRACE("%s: SIOCGIWSCAN GET still scanning\n", dev->name);
                 return -EAGAIN;
         }
 
-        WL_TRACE(("%s: SIOCGIWSCAN GET broadcast results\n", dev->name));
+        WL_TRACE("%s: SIOCGIWSCAN GET broadcast results\n", dev->name);
         apcnt = 0;
         p_buf = iscan->list_hdr;
         while (p_buf != iscan->list_cur) {
@@ -1764,9 +1761,8 @@ wl_iw_iscan_get_scan(struct net_device *dev,
                 counter += list->count;
 
                 if (list->version != WL_BSS_INFO_VERSION) {
-                        WL_ERROR(("%s : list->version %d != "
-                                "WL_BSS_INFO_VERSION\n",
-                                __func__, list->version));
+                        WL_ERROR("%s : list->version %d != WL_BSS_INFO_VERSION\n",
+                                 __func__, list->version);
                         return -EINVAL;
                 }
 
@@ -1779,14 +1775,14 @@ wl_iw_iscan_get_scan(struct net_device *dev,
                         ASSERT(((unsigned long)bi + dtoh32(bi->length)) <=
                                ((unsigned long)list + WLC_IW_ISCAN_MAXLEN));
 
-                        if (event + ETHER_ADDR_LEN + bi->SSID_len +
+                        if (event + ETH_ALEN + bi->SSID_len +
                             IW_EV_UINT_LEN + IW_EV_FREQ_LEN + IW_EV_QUAL_LEN >=
                             end)
                                 return -E2BIG;
                         iwe.cmd = SIOCGIWAP;
                         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                         memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID,
-                               ETHER_ADDR_LEN);
+                               ETH_ALEN);
                         event =
                             IWE_STREAM_ADD_EVENT(info, event, end, &iwe,
                                                  IW_EV_ADDR_LEN);
@@ -1876,8 +1872,8 @@ wl_iw_iscan_get_scan(struct net_device *dev,
         dwrq->length = event - extra;
         dwrq->flags = 0;
 
-        WL_TRACE(("%s return to WE %d bytes APs=%d\n", __func__,
-                  dwrq->length, counter));
+        WL_TRACE("%s return to WE %d bytes APs=%d\n",
+                 __func__, dwrq->length, counter);
 
         if (!dwrq->length)
                 return -EAGAIN;
@@ -1895,7 +1891,7 @@ wl_iw_set_essid(struct net_device *dev,
         wl_join_params_t join_params;
         int join_params_size;
 
-        WL_TRACE(("%s: SIOCSIWESSID\n", dev->name));
+        WL_TRACE("%s: SIOCSIWESSID\n", dev->name);
 
         if (g_set_essid_before_scan)
                 return -EAGAIN;
@@ -1923,7 +1919,7 @@ wl_iw_set_essid(struct net_device *dev,
 
         memcpy(&join_params.ssid.SSID, g_ssid.SSID, g_ssid.SSID_len);
         join_params.ssid.SSID_len = htod32(g_ssid.SSID_len);
-        memcpy(&join_params.params.bssid, &ether_bcast, ETHER_ADDR_LEN);
+        memcpy(&join_params.params.bssid, &ether_bcast, ETH_ALEN);
 
         wl_iw_ch_to_chanspec(g_wl_iw_params.target_channel, &join_params,
                              &join_params_size);
@@ -1931,11 +1927,11 @@ wl_iw_set_essid(struct net_device *dev,
         error = dev_wlc_ioctl(dev, WLC_SET_SSID, &join_params,
                                 join_params_size);
         if (error)
-                WL_ERROR(("Invalid ioctl data=%d\n", error));
+                WL_ERROR("Invalid ioctl data=%d\n", error);
 
         if (g_ssid.SSID_len) {
-                WL_TRACE(("%s: join SSID=%s ch=%d\n", __func__,
-                          g_ssid.SSID, g_wl_iw_params.target_channel));
+                WL_TRACE("%s: join SSID=%s ch=%d\n",
+                         __func__, g_ssid.SSID, g_wl_iw_params.target_channel);
         }
         return 0;
 }
@@ -1948,14 +1944,14 @@ wl_iw_get_essid(struct net_device *dev,
         wlc_ssid_t ssid;
         int error;
 
-        WL_TRACE(("%s: SIOCGIWESSID\n", dev->name));
+        WL_TRACE("%s: SIOCGIWESSID\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
 
         error = dev_wlc_ioctl(dev, WLC_GET_SSID, &ssid, sizeof(ssid));
         if (error) {
-                WL_ERROR(("Error getting the SSID\n"));
+                WL_ERROR("Error getting the SSID\n");
                 return error;
         }
 
@@ -1976,7 +1972,7 @@ wl_iw_set_nick(struct net_device *dev,
 {
         wl_iw_t *iw = *(wl_iw_t **) netdev_priv(dev);
 
-        WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
+        WL_TRACE("%s: SIOCSIWNICKN\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
@@ -1996,7 +1992,7 @@ wl_iw_get_nick(struct net_device *dev,
 {
         wl_iw_t *iw = *(wl_iw_t **) netdev_priv(dev);
 
-        WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
+        WL_TRACE("%s: SIOCGIWNICKN\n", dev->name);
 
         if (!extra)
                 return -EINVAL;
@@ -2014,7 +2010,7 @@ wl_iw_set_rate(struct net_device *dev,
         wl_rateset_t rateset;
         int error, rate, i, error_bg, error_a;
 
-        WL_TRACE(("%s: SIOCSIWRATE\n", dev->name));
+        WL_TRACE("%s: SIOCSIWRATE\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_CURR_RATESET, &rateset,
                                 sizeof(rateset));
@@ -2063,7 +2059,7 @@ wl_iw_get_rate(struct net_device *dev,
 {
         int error, rate;
 
-        WL_TRACE(("%s: SIOCGIWRATE\n", dev->name));
+        WL_TRACE("%s: SIOCGIWRATE\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));
         if (error)
@@ -2080,7 +2076,7 @@ wl_iw_set_rts(struct net_device *dev,
 {
         int error, rts;
 
-        WL_TRACE(("%s: SIOCSIWRTS\n", dev->name));
+        WL_TRACE("%s: SIOCSIWRTS\n", dev->name);
 
         if (vwrq->disabled)
                 rts = DOT11_DEFAULT_RTS_LEN;
@@ -2102,7 +2098,7 @@ wl_iw_get_rts(struct net_device *dev,
 {
         int error, rts;
 
-        WL_TRACE(("%s: SIOCGIWRTS\n", dev->name));
+        WL_TRACE("%s: SIOCGIWRTS\n", dev->name);
 
         error = dev_wlc_intvar_get(dev, "rtsthresh", &rts);
         if (error)
@@ -2121,7 +2117,7 @@ wl_iw_set_frag(struct net_device *dev,
 {
         int error, frag;
 
-        WL_TRACE(("%s: SIOCSIWFRAG\n", dev->name));
+        WL_TRACE("%s: SIOCSIWFRAG\n", dev->name);
 
         if (vwrq->disabled)
                 frag = DOT11_DEFAULT_FRAG_LEN;
@@ -2143,7 +2139,7 @@ wl_iw_get_frag(struct net_device *dev,
 {
         int error, fragthreshold;
 
-        WL_TRACE(("%s: SIOCGIWFRAG\n", dev->name));
+        WL_TRACE("%s: SIOCGIWFRAG\n", dev->name);
 
         error = dev_wlc_intvar_get(dev, "fragthresh", &fragthreshold);
         if (error)
@@ -2163,7 +2159,7 @@ wl_iw_set_txpow(struct net_device *dev,
 {
         int error, disable;
         u16 txpwrmw;
-        WL_TRACE(("%s: SIOCSIWTXPOW\n", dev->name));
+        WL_TRACE("%s: SIOCSIWTXPOW\n", dev->name);
 
         disable = vwrq->disabled ? WL_RADIO_SW_DISABLE : 0;
         disable += WL_RADIO_SW_DISABLE << 16;
@@ -2200,7 +2196,7 @@ wl_iw_get_txpow(struct net_device *dev,
         int error, disable, txpwrdbm;
         u8 result;
 
-        WL_TRACE(("%s: SIOCGIWTXPOW\n", dev->name));
+        WL_TRACE("%s: SIOCGIWTXPOW\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_RADIO, &disable, sizeof(disable));
         if (error)
@@ -2229,7 +2225,7 @@ wl_iw_set_retry(struct net_device *dev,
 {
         int error, lrl, srl;
 
-        WL_TRACE(("%s: SIOCSIWRETRY\n", dev->name));
+        WL_TRACE("%s: SIOCSIWRETRY\n", dev->name);
 
         if (vwrq->disabled || (vwrq->flags & IW_RETRY_LIFETIME))
                 return -EINVAL;
@@ -2277,7 +2273,7 @@ wl_iw_get_retry(struct net_device *dev,
 {
         int error, lrl, srl;
 
-        WL_TRACE(("%s: SIOCGIWRETRY\n", dev->name));
+        WL_TRACE("%s: SIOCGIWRETRY\n", dev->name);
 
         vwrq->disabled = 0;
 
@@ -2317,7 +2313,7 @@ wl_iw_set_encode(struct net_device *dev,
         wl_wsec_key_t key;
         int error, val, wsec;
 
-        WL_TRACE(("%s: SIOCSIWENCODE\n", dev->name));
+        WL_TRACE("%s: SIOCSIWENCODE\n", dev->name);
 
         memset(&key, 0, sizeof(key));
 
@@ -2409,9 +2405,9 @@ wl_iw_get_encode(struct net_device *dev,
         wl_wsec_key_t key;
         int error, val, wsec, auth;
 
-        WL_TRACE(("%s: SIOCGIWENCODE\n", dev->name));
+        WL_TRACE("%s: SIOCGIWENCODE\n", dev->name);
 
-        bzero(&key, sizeof(wl_wsec_key_t));
+        memset(&key, 0, sizeof(wl_wsec_key_t));
 
         if ((dwrq->flags & IW_ENCODE_INDEX) == 0) {
                 for (key.index = 0; key.index < DOT11_MAX_DEFAULT_KEYS;
@@ -2465,7 +2461,7 @@ wl_iw_set_power(struct net_device *dev,
 {
         int error, pm;
 
-        WL_TRACE(("%s: SIOCSIWPOWER\n", dev->name));
+        WL_TRACE("%s: SIOCSIWPOWER\n", dev->name);
 
         pm = vwrq->disabled ? PM_OFF : PM_MAX;
 
@@ -2484,7 +2480,7 @@ wl_iw_get_power(struct net_device *dev,
 {
         int error, pm;
 
-        WL_TRACE(("%s: SIOCGIWPOWER\n", dev->name));
+        WL_TRACE("%s: SIOCGIWPOWER\n", dev->name);
 
         error = dev_wlc_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm));
         if (error)
@@ -2503,7 +2499,7 @@ wl_iw_set_wpaie(struct net_device *dev,
                 struct iw_request_info *info, struct iw_point *iwp, char *extra)
 {
 
-        WL_TRACE(("%s: SIOCSIWGENIE\n", dev->name));
+        WL_TRACE("%s: SIOCSIWGENIE\n", dev->name);
 
         CHECK_EXTRA_FOR_NULL(extra);
 
@@ -2516,7 +2512,7 @@ static int
 wl_iw_get_wpaie(struct net_device *dev,
                 struct iw_request_info *info, struct iw_point *iwp, char *extra)
 {
-        WL_TRACE(("%s: SIOCGIWGENIE\n", dev->name));
+        WL_TRACE("%s: SIOCGIWGENIE\n", dev->name);
         iwp->length = 64;
         dev_wlc_bufvar_get(dev, "wpaie", extra, iwp->length);
         return 0;
@@ -2531,7 +2527,7 @@ wl_iw_set_encodeext(struct net_device *dev,
         int error;
         struct iw_encode_ext *iwe;
 
-        WL_TRACE(("%s: SIOCSIWENCODEEXT\n", dev->name));
+        WL_TRACE("%s: SIOCSIWENCODEEXT\n", dev->name);
 
         CHECK_EXTRA_FOR_NULL(extra);
 
@@ -2548,14 +2544,14 @@ wl_iw_set_encodeext(struct net_device *dev,
 
         key.len = iwe->key_len;
 
-        if (!ETHER_ISMULTI(iwe->addr.sa_data))
+        if (!is_multicast_ether_addr(iwe->addr.sa_data))
                 bcopy((void *)&iwe->addr.sa_data, (char *)&key.ea,
-                      ETHER_ADDR_LEN);
+                      ETH_ALEN);
 
         if (key.len == 0) {
                 if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                        WL_WSEC(("Changing the the primary Key to %d\n",
-                                 key.index));
+                        WL_WSEC("Changing the the primary Key to %d\n",
+                                key.index);
                         key.index = htod32(key.index);
                         error = dev_wlc_ioctl(dev, WLC_SET_KEY_PRIMARY,
                                               &key.index, sizeof(key.index));
@@ -2569,9 +2565,9 @@ wl_iw_set_encodeext(struct net_device *dev,
                 if (iwe->key_len > sizeof(key.data))
                         return -EINVAL;
 
-                WL_WSEC(("Setting the key index %d\n", key.index));
+                WL_WSEC("Setting the key index %d\n", key.index);
                 if (iwe->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                        WL_WSEC(("key is a Primary Key\n"));
+                        WL_WSEC("key is a Primary Key\n");
                         key.flags = WL_PRIMARY_KEY;
                 }
 
@@ -2638,15 +2634,15 @@ wl_iw_set_pmksa(struct net_device *dev,
         uint i;
         int ret = 0;
 
-        WL_WSEC(("%s: SIOCSIWPMKSA\n", dev->name));
+        WL_WSEC("%s: SIOCSIWPMKSA\n", dev->name);
 
         CHECK_EXTRA_FOR_NULL(extra);
 
         iwpmksa = (struct iw_pmksa *)extra;
 
         if (iwpmksa->cmd == IW_PMKSA_FLUSH) {
-                WL_WSEC(("wl_iw_set_pmksa - IW_PMKSA_FLUSH\n"));
-                bzero((char *)&pmkid_list, sizeof(pmkid_list));
+                WL_WSEC("wl_iw_set_pmksa - IW_PMKSA_FLUSH\n");
+                memset((char *)&pmkid_list, 0, sizeof(pmkid_list));
         }
 
         else if (iwpmksa->cmd == IW_PMKSA_REMOVE) {
@@ -2656,30 +2652,30 @@ wl_iw_set_pmksa(struct net_device *dev,
                         pmkidptr = &pmkid;
 
                         bcopy(&iwpmksa->bssid.sa_data[0],
-                              &pmkidptr->pmkid[0].BSSID, ETHER_ADDR_LEN);
+                              &pmkidptr->pmkid[0].BSSID, ETH_ALEN);
                         bcopy(&iwpmksa->pmkid[0], &pmkidptr->pmkid[0].PMKID,
                               WPA2_PMKID_LEN);
 
-                        WL_WSEC(("wl_iw_set_pmksa:IW_PMKSA_REMOVE:PMKID: "
-                                "%pM = ", &pmkidptr->pmkid[0].BSSID));
+                        WL_WSEC("wl_iw_set_pmksa:IW_PMKSA_REMOVE:PMKID: %pM = ",
+                                &pmkidptr->pmkid[0].BSSID);
                         for (j = 0; j < WPA2_PMKID_LEN; j++)
-                                WL_WSEC(("%02x ", pmkidptr->pmkid[0].PMKID[j]));
-                        WL_WSEC(("\n"));
+                                WL_WSEC("%02x ", pmkidptr->pmkid[0].PMKID[j]);
+                        WL_WSEC("\n");
                 }
 
                 for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                        if (!bcmp
+                        if (!memcmp
                             (&iwpmksa->bssid.sa_data[0],
-                             &pmkid_list.pmkids.pmkid[i].BSSID, ETHER_ADDR_LEN))
+                             &pmkid_list.pmkids.pmkid[i].BSSID, ETH_ALEN))
                                 break;
 
                 if ((pmkid_list.pmkids.npmkid > 0)
                     && (i < pmkid_list.pmkids.npmkid)) {
-                        bzero(&pmkid_list.pmkids.pmkid[i], sizeof(pmkid_t));
+                        memset(&pmkid_list.pmkids.pmkid[i], 0, sizeof(pmkid_t));
                         for (; i < (pmkid_list.pmkids.npmkid - 1); i++) {
                                 bcopy(&pmkid_list.pmkids.pmkid[i + 1].BSSID,
                                       &pmkid_list.pmkids.pmkid[i].BSSID,
-                                      ETHER_ADDR_LEN);
+                                      ETH_ALEN);
                                 bcopy(&pmkid_list.pmkids.pmkid[i + 1].PMKID,
                                       &pmkid_list.pmkids.pmkid[i].PMKID,
                                       WPA2_PMKID_LEN);
@@ -2691,14 +2687,14 @@ wl_iw_set_pmksa(struct net_device *dev,
 
         else if (iwpmksa->cmd == IW_PMKSA_ADD) {
                 for (i = 0; i < pmkid_list.pmkids.npmkid; i++)
-                        if (!bcmp
+                        if (!memcmp
                             (&iwpmksa->bssid.sa_data[0],
-                             &pmkid_list.pmkids.pmkid[i].BSSID, ETHER_ADDR_LEN))
+                             &pmkid_list.pmkids.pmkid[i].BSSID, ETH_ALEN))
                                 break;
                 if (i < MAXPMKID) {
                         bcopy(&iwpmksa->bssid.sa_data[0],
                               &pmkid_list.pmkids.pmkid[i].BSSID,
-                              ETHER_ADDR_LEN);
+                              ETH_ALEN);
                         bcopy(&iwpmksa->pmkid[0],
                               &pmkid_list.pmkids.pmkid[i].PMKID,
                               WPA2_PMKID_LEN);
@@ -2710,25 +2706,25 @@ wl_iw_set_pmksa(struct net_device *dev,
                         uint j;
                         uint k;
                         k = pmkid_list.pmkids.npmkid;
-                        WL_WSEC(("wl_iw_set_pmksa,IW_PMKSA_ADD - PMKID: %pM = ",
-                                &pmkid_list.pmkids.pmkid[k].BSSID));
+                        WL_WSEC("wl_iw_set_pmksa,IW_PMKSA_ADD - PMKID: %pM = ",
+                                &pmkid_list.pmkids.pmkid[k].BSSID);
                         for (j = 0; j < WPA2_PMKID_LEN; j++)
-                                WL_WSEC(("%02x ",
-                                         pmkid_list.pmkids.pmkid[k].PMKID[j]));
-                        WL_WSEC(("\n"));
+                                WL_WSEC("%02x ",
+                                        pmkid_list.pmkids.pmkid[k].PMKID[j]);
+                        WL_WSEC("\n");
                 }
         }
-        WL_WSEC(("PRINTING pmkid LIST - No of elements %d\n",
-                 pmkid_list.pmkids.npmkid));
+        WL_WSEC("PRINTING pmkid LIST - No of elements %d\n",
+                pmkid_list.pmkids.npmkid);
         for (i = 0; i < pmkid_list.pmkids.npmkid; i++) {
                 uint j;
-                WL_WSEC(("PMKID[%d]: %pM = ", i,
-                        &pmkid_list.pmkids.pmkid[i].BSSID));
+                WL_WSEC("PMKID[%d]: %pM = ",
+                        i, &pmkid_list.pmkids.pmkid[i].BSSID);
                 for (j = 0; j < WPA2_PMKID_LEN; j++)
-                        WL_WSEC(("%02x ", pmkid_list.pmkids.pmkid[i].PMKID[j]));
-                WL_WSEC(("\n"));
+                        WL_WSEC("%02x ", pmkid_list.pmkids.pmkid[i].PMKID[j]);
+                WL_WSEC("\n");
         }
-        WL_WSEC(("\n"));
+        WL_WSEC("\n");
 
         if (!ret)
                 ret = dev_wlc_bufvar_set(dev, "pmkid_info", (char *)&pmkid_list,
@@ -2742,7 +2738,7 @@ wl_iw_get_encodeext(struct net_device *dev,
                     struct iw_request_info *info,
                     struct iw_param *vwrq, char *extra)
 {
-        WL_TRACE(("%s: SIOCGIWENCODEEXT\n", dev->name));
+        WL_TRACE("%s: SIOCGIWENCODEEXT\n", dev->name);
         return 0;
 }
 
@@ -2757,13 +2753,13 @@ wl_iw_set_wpaauth(struct net_device *dev,
         int val = 0;
         wl_iw_t *iw = *(wl_iw_t **) netdev_priv(dev);
 
-        WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
+        WL_TRACE("%s: SIOCSIWAUTH\n", dev->name);
 
         paramid = vwrq->flags & IW_AUTH_INDEX;
         paramval = vwrq->value;
 
-        WL_TRACE(("%s: SIOCSIWAUTH, paramid = 0x%0x, paramval = 0x%0x\n",
-                  dev->name, paramid, paramval));
+        WL_TRACE("%s: SIOCSIWAUTH, paramid = 0x%0x, paramval = 0x%0x\n",
+                 dev->name, paramid, paramval);
 
         switch (paramid) {
         case IW_AUTH_WPA_VERSION:
@@ -2773,8 +2769,8 @@ wl_iw_set_wpaauth(struct net_device *dev,
                         val = WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED;
                 else if (paramval & IW_AUTH_WPA_VERSION_WPA2)
                         val = WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED;
-                WL_INFORM(("%s: %d: setting wpa_auth to 0x%0x\n", __func__,
-                           __LINE__, val));
+                WL_INFORM("%s: %d: setting wpa_auth to 0x%0x\n",
+                          __func__, __LINE__, val);
                 error = dev_wlc_intvar_set(dev, "wpa_auth", val);
                 if (error)
                         return error;
@@ -2797,20 +2793,19 @@ wl_iw_set_wpaauth(struct net_device *dev,
                 }
 
                 if (iw->privacy_invoked && !val) {
-                        WL_WSEC(("%s: %s: 'Privacy invoked' true but clearing "
-                                "wsec, assuming " "we're a WPS enrollee\n",
-                                dev->name, __func__));
+                        WL_WSEC("%s: %s: 'Privacy invoked' true but clearing wsec, assuming we're a WPS enrollee\n",
+                                dev->name, __func__);
                         error = dev_wlc_intvar_set(dev, "is_WPS_enrollee",
                                                         true);
                         if (error) {
-                                WL_WSEC(("Failed to set is_WPS_enrollee\n"));
+                                WL_WSEC("Failed to set is_WPS_enrollee\n");
                                 return error;
                         }
                 } else if (val) {
                         error = dev_wlc_intvar_set(dev, "is_WPS_enrollee",
                                                         false);
                         if (error) {
-                                WL_WSEC(("Failed to clear is_WPS_enrollee\n"));
+                                WL_WSEC("Failed to clear is_WPS_enrollee\n");
                                 return error;
                         }
                 }
@@ -2837,8 +2832,8 @@ wl_iw_set_wpaauth(struct net_device *dev,
                         else
                                 val = WPA2_AUTH_UNSPECIFIED;
                 }
-                WL_INFORM(("%s: %d: setting wpa_auth to %d\n", __func__,
-                           __LINE__, val));
+                WL_INFORM("%s: %d: setting wpa_auth to %d\n",
+                          __func__, __LINE__, val);
                 error = dev_wlc_intvar_set(dev, "wpa_auth", val);
                 if (error)
                         return error;
@@ -2850,7 +2845,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
                 break;
 
         case IW_AUTH_80211_AUTH_ALG:
-                WL_INFORM(("Setting the D11auth %d\n", paramval));
+                WL_INFORM("Setting the D11auth %d\n", paramval);
                 if (paramval == IW_AUTH_ALG_OPEN_SYSTEM)
                         val = 0;
                 else if (paramval == IW_AUTH_ALG_SHARED_KEY)
@@ -2879,8 +2874,8 @@ wl_iw_set_wpaauth(struct net_device *dev,
                                 dev_wlc_intvar_set(dev, "wsec", val);
                         }
                         val = 0;
-                        WL_INFORM(("%s: %d: setting wpa_auth to %d\n",
-                                   __func__, __LINE__, val));
+                        WL_INFORM("%s: %d: setting wpa_auth to %d\n",
+                                  __func__, __LINE__, val);
                         dev_wlc_intvar_set(dev, "wpa_auth", 0);
                         return error;
                 }
@@ -2897,7 +2892,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
 
 #if WIRELESS_EXT > 17
         case IW_AUTH_ROAMING_CONTROL:
-                WL_INFORM(("%s: IW_AUTH_ROAMING_CONTROL\n", __func__));
+                WL_INFORM("%s: IW_AUTH_ROAMING_CONTROL\n", __func__);
                 break;
         case IW_AUTH_PRIVACY_INVOKED:
                 {
@@ -2908,8 +2903,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
                                 error = dev_wlc_intvar_set(dev,
                                                 "is_WPS_enrollee", false);
                                 if (error) {
-                                        WL_WSEC(("Failed to clear iovar "
-                                                "is_WPS_enrollee\n"));
+                                        WL_WSEC("Failed to clear iovar is_WPS_enrollee\n");
                                         return error;
                                 }
                         } else {
@@ -2923,8 +2917,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
                                                         "is_WPS_enrollee",
                                                         true);
                                         if (error) {
-                                                WL_WSEC(("Failed to set iovar "
-                                                "is_WPS_enrollee\n"));
+                                                WL_WSEC("Failed to set iovar is_WPS_enrollee\n");
                                                 return error;
                                         }
                                 } else {
@@ -2932,8 +2925,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
                                                         "is_WPS_enrollee",
                                                         false);
                                         if (error) {
-                                                WL_WSEC(("Failed to clear "
-                                                        "is_WPS_enrollee\n"));
+                                                WL_WSEC("Failed to clear is_WPS_enrollee\n");
                                                 return error;
                                         }
                                 }
@@ -2960,7 +2952,7 @@ wl_iw_get_wpaauth(struct net_device *dev,
         int val;
         wl_iw_t *iw = *(wl_iw_t **) netdev_priv(dev);
 
-        WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
+        WL_TRACE("%s: SIOCGIWAUTH\n", dev->name);
 
         paramid = vwrq->flags & IW_AUTH_INDEX;
 
@@ -3040,7 +3032,7 @@ wl_iw_get_wpaauth(struct net_device *dev,
                 break;
 #if WIRELESS_EXT > 17
         case IW_AUTH_ROAMING_CONTROL:
-                WL_ERROR(("%s: IW_AUTH_ROAMING_CONTROL\n", __func__));
+                WL_ERROR("%s: IW_AUTH_ROAMING_CONTROL\n", __func__);
                 break;
         case IW_AUTH_PRIVACY_INVOKED:
                 paramval = iw->privacy_invoked;
@@ -3157,19 +3149,19 @@ int wl_iw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         char *extra = NULL;
         int token_size = 1, max_tokens = 0, ret = 0;
 
-        WL_TRACE(("\n%s, cmd:%x alled via dhd->do_ioctl()entry point\n",
-                  __func__, cmd));
+        WL_TRACE("\n%s, cmd:%x alled via dhd->do_ioctl()entry point\n",
+                 __func__, cmd);
         if (cmd < SIOCIWFIRST ||
                 IW_IOCTL_IDX(cmd) >= ARRAY_SIZE(wl_iw_handler)) {
-                WL_ERROR(("%s: error in cmd=%x : out of range\n", __func__,
-                        cmd));
+                WL_ERROR("%s: error in cmd=%x : out of range\n",
+                         __func__, cmd);
                 return -EOPNOTSUPP;
         }
 
         handler = wl_iw_handler[IW_IOCTL_IDX(cmd)];
         if (!handler) {
-                WL_ERROR(("%s: error in cmd=%x : not supported\n",
-                        __func__, cmd));
+                WL_ERROR("%s: error in cmd=%x : not supported\n",
+                         __func__, cmd);
                 return -EOPNOTSUPP;
         }
 
@@ -3234,9 +3226,8 @@ int wl_iw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
         if (max_tokens && wrq->u.data.pointer) {
                 if (wrq->u.data.length > max_tokens) {
-                        WL_ERROR(("%s: error in cmd=%x wrq->u.data.length=%d "
-                        "> max_tokens=%d\n",
-                        __func__, cmd, wrq->u.data.length, max_tokens));
+                        WL_ERROR("%s: error in cmd=%x wrq->u.data.length=%d > max_tokens=%d\n",
+                                 __func__, cmd, wrq->u.data.length, max_tokens);
                         return -E2BIG;
                 }
                 extra = kmalloc(max_tokens * token_size, GFP_KERNEL);
@@ -3339,7 +3330,7 @@ wl_iw_conn_status_str(u32 event_type, u32 status, u32 reason,
                 memset(stringBuf, 0, buflen);
                 snprintf(stringBuf, buflen, "%s %s %02d %02d",
                          name, cause, status, reason);
-                WL_INFORM(("Connection status: %s\n", stringBuf));
+                WL_INFORM("Connection status: %s\n", stringBuf);
                 return true;
         } else {
                 return false;
@@ -3383,46 +3374,46 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
         iw = 0;
 
         if (!dev) {
-                WL_ERROR(("%s: dev is null\n", __func__));
+                WL_ERROR("%s: dev is null\n", __func__);
                 return;
         }
 
         iw = *(wl_iw_t **) netdev_priv(dev);
 
-        WL_TRACE(("%s: dev=%s event=%d\n", __func__, dev->name, event_type));
+        WL_TRACE("%s: dev=%s event=%d\n", __func__, dev->name, event_type);
 
         switch (event_type) {
         case WLC_E_TXFAIL:
                 cmd = IWEVTXDROP;
-                memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
+                memcpy(wrqu.addr.sa_data, &e->addr, ETH_ALEN);
                 wrqu.addr.sa_family = ARPHRD_ETHER;
                 break;
 #if WIRELESS_EXT > 14
         case WLC_E_JOIN:
         case WLC_E_ASSOC_IND:
         case WLC_E_REASSOC_IND:
-                memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
+                memcpy(wrqu.addr.sa_data, &e->addr, ETH_ALEN);
                 wrqu.addr.sa_family = ARPHRD_ETHER;
                 cmd = IWEVREGISTERED;
                 break;
         case WLC_E_DEAUTH_IND:
         case WLC_E_DISASSOC_IND:
                 cmd = SIOCGIWAP;
-                bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
+                memset(wrqu.addr.sa_data, 0, ETH_ALEN);
                 wrqu.addr.sa_family = ARPHRD_ETHER;
-                bzero(&extra, ETHER_ADDR_LEN);
+                memset(&extra, 0, ETH_ALEN);
                 break;
         case WLC_E_LINK:
         case WLC_E_NDIS_LINK:
                 cmd = SIOCGIWAP;
                 if (!(flags & WLC_EVENT_MSG_LINK)) {
-                        bzero(wrqu.addr.sa_data, ETHER_ADDR_LEN);
-                        bzero(&extra, ETHER_ADDR_LEN);
+                        memset(wrqu.addr.sa_data, 0, ETH_ALEN);
+                        memset(&extra, 0, ETH_ALEN);
                         WAKE_LOCK_TIMEOUT(iw->pub, WAKE_LOCK_LINK_DOWN_TMOUT,
                                           20 * HZ);
                 } else {
-                        memcpy(wrqu.addr.sa_data, &e->addr, ETHER_ADDR_LEN);
-                        WL_TRACE(("Link UP\n"));
+                        memcpy(wrqu.addr.sa_data, &e->addr, ETH_ALEN);
+                        WL_TRACE("Link UP\n");
 
                 }
                 wrqu.addr.sa_family = ARPHRD_ETHER;
@@ -3433,8 +3424,8 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                         wrqu.data.length = datalen + 1;
                         extra[0] = WLC_E_ACTION_FRAME;
                         memcpy(&extra[1], data, datalen);
-                        WL_TRACE(("WLC_E_ACTION_FRAME len %d \n",
-                                  wrqu.data.length));
+                        WL_TRACE("WLC_E_ACTION_FRAME len %d\n",
+                                 wrqu.data.length);
                 }
                 break;
 
@@ -3464,7 +3455,7 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                         else
                                 micerrevt->flags |= IW_MICFAILURE_PAIRWISE;
                         memcpy(micerrevt->src_addr.sa_data, &e->addr,
-                               ETHER_ADDR_LEN);
+                               ETH_ALEN);
                         micerrevt->src_addr.sa_family = ARPHRD_ETHER;
 
                         break;
@@ -3487,14 +3478,14 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                                 wrqu.data.length = sizeof(struct iw_pmkid_cand);
                                 pmkidcand = pmkcandlist->pmkid_cand;
                                 while (count) {
-                                        bzero(iwpmkidcand,
+                                        memset(iwpmkidcand, 0,
                                               sizeof(struct iw_pmkid_cand));
                                         if (pmkidcand->preauth)
                                                 iwpmkidcand->flags |=
                                                     IW_PMKID_CAND_PREAUTH;
                                         bcopy(&pmkidcand->BSSID,
                                               &iwpmkidcand->bssid.sa_data,
-                                              ETHER_ADDR_LEN);
+                                              ETH_ALEN);
 #ifndef SANDGATE2G
                                         wireless_send_event(dev, cmd, &wrqu,
                                                             extra);
@@ -3515,13 +3506,13 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                 } else {
                         cmd = SIOCGIWSCAN;
                         wrqu.data.length = strlen(extra);
-                        WL_TRACE(("Event WLC_E_SCAN_COMPLETE from specific "
-                                "scan %d\n", g_iscan->iscan_state));
+                        WL_TRACE("Event WLC_E_SCAN_COMPLETE from specific scan %d\n",
+                                 g_iscan->iscan_state);
                 }
 #else
                 cmd = SIOCGIWSCAN;
                 wrqu.data.length = strlen(extra);
-                WL_TRACE(("Event WLC_E_SCAN_COMPLETE\n"));
+                WL_TRACE("Event WLC_E_SCAN_COMPLETE\n");
 #endif
                 break;
 
@@ -3529,9 +3520,9 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                 {
                         wlc_ssid_t *ssid;
                         ssid = (wlc_ssid_t *) data;
-                        WL_ERROR(("%s Event WLC_E_PFN_NET_FOUND, send %s up : "
-                                "find %s len=%d\n", __func__, PNO_EVENT_UP,
-                                ssid->SSID, ssid->SSID_len));
+                        WL_ERROR("%s Event WLC_E_PFN_NET_FOUND, send %s up : find %s len=%d\n",
+                                 __func__, PNO_EVENT_UP,
+                                 ssid->SSID, ssid->SSID_len);
                         WAKE_LOCK_TIMEOUT(iw->pub, WAKE_LOCK_PNO_FIND_TMOUT,
                                           20 * HZ);
                         cmd = IWEVCUSTOM;
@@ -3542,7 +3533,7 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data)
                 break;
 
         default:
-                WL_TRACE(("Unknown Event %d: ignoring\n", event_type));
+                WL_TRACE("Unknown Event %d: ignoring\n", event_type);
                 break;
         }
 #ifndef SANDGATE2G
@@ -3583,15 +3574,15 @@ wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
                 goto done;
 
         phy_noise = dtoh32(phy_noise);
-        WL_TRACE(("wl_iw_get_wireless_stats phy noise=%d\n", phy_noise));
+        WL_TRACE("wl_iw_get_wireless_stats phy noise=%d\n", phy_noise);
 
-        bzero(&scb_val, sizeof(scb_val_t));
+        memset(&scb_val, 0, sizeof(scb_val_t));
         res = dev_wlc_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
         if (res)
                 goto done;
 
         rssi = dtoh32(scb_val.val);
-        WL_TRACE(("wl_iw_get_wireless_stats rssi=%d\n", rssi));
+        WL_TRACE("wl_iw_get_wireless_stats rssi=%d\n", rssi);
         if (rssi <= WL_IW_RSSI_NO_SIGNAL)
                 wstats->qual.qual = 0;
         else if (rssi <= WL_IW_RSSI_VERY_LOW)
@@ -3614,23 +3605,21 @@ wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
 #endif
 
 #if WIRELESS_EXT > 11
-        WL_TRACE(("wl_iw_get_wireless_stats counters=%d\n",
-                  (int)sizeof(wl_cnt_t)));
+        WL_TRACE("wl_iw_get_wireless_stats counters=%zu\n", sizeof(wl_cnt_t));
 
         memset(&cnt, 0, sizeof(wl_cnt_t));
         res =
             dev_wlc_bufvar_get(dev, "counters", (char *)&cnt, sizeof(wl_cnt_t));
         if (res) {
-                WL_ERROR(("wl_iw_get_wireless_stats counters failed error=%d\n",
-                          res));
+                WL_ERROR("wl_iw_get_wireless_stats counters failed error=%d\n",
+                         res);
                 goto done;
         }
 
         cnt.version = dtoh16(cnt.version);
         if (cnt.version != WL_CNT_T_VERSION) {
-                WL_TRACE(("\tIncorrect version of counters struct: expected "
-                        "%d; got %d\n",
-                        WL_CNT_T_VERSION, cnt.version));
+                WL_TRACE("\tIncorrect version of counters struct: expected %d; got %d\n",
+                         WL_CNT_T_VERSION, cnt.version);
                 goto done;
         }
 
@@ -3641,22 +3630,22 @@ wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
         wstats->discard.misc = dtoh32(cnt.rxrunt) + dtoh32(cnt.rxgiant);
         wstats->miss.beacon = 0;
 
-        WL_TRACE(("wl_iw_get_wireless_stats counters txframe=%d txbyte=%d\n",
-                  dtoh32(cnt.txframe), dtoh32(cnt.txbyte)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxfrmtoolong=%d\n",
-                  dtoh32(cnt.rxfrmtoolong)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxbadplcp=%d\n",
-                  dtoh32(cnt.rxbadplcp)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxundec=%d\n",
-                  dtoh32(cnt.rxundec)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxfragerr=%d\n",
-                  dtoh32(cnt.rxfragerr)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters txfail=%d\n",
-                  dtoh32(cnt.txfail)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxrunt=%d\n",
-                  dtoh32(cnt.rxrunt)));
-        WL_TRACE(("wl_iw_get_wireless_stats counters rxgiant=%d\n",
-                  dtoh32(cnt.rxgiant)));
+        WL_TRACE("wl_iw_get_wireless_stats counters txframe=%d txbyte=%d\n",
+                 dtoh32(cnt.txframe), dtoh32(cnt.txbyte));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxfrmtoolong=%d\n",
+                  dtoh32(cnt.rxfrmtoolong));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxbadplcp=%d\n",
+                  dtoh32(cnt.rxbadplcp));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxundec=%d\n",
+                  dtoh32(cnt.rxundec));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxfragerr=%d\n",
+                  dtoh32(cnt.rxfragerr));
+        WL_TRACE("wl_iw_get_wireless_stats counters txfail=%d\n",
+                  dtoh32(cnt.txfail));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxrunt=%d\n",
+                  dtoh32(cnt.rxrunt));
+        WL_TRACE("wl_iw_get_wireless_stats counters rxgiant=%d\n",
+                  dtoh32(cnt.rxgiant));
 #endif                          /* WIRELESS_EXT > 11 */
 
 done:
@@ -3690,8 +3679,7 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
                 return -ENOMEM;
         memset(iscan, 0, sizeof(iscan_info_t));
 
-        iscan->iscan_ex_params_p =
-            (wl_iscan_params_t *) kmalloc(params_size, GFP_KERNEL);
+        iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL);
         if (!iscan->iscan_ex_params_p)
                 return -ENOMEM;
         iscan->iscan_ex_param_size = params_size;
@@ -3723,9 +3711,7 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
         priv_dev = dev;
         MUTEX_LOCK_SOFTAP_SET_INIT(iw->pub);
 #endif
-        g_scan = NULL;
-
-        g_scan = (void *)kmalloc(G_SCAN_RESULTS, GFP_KERNEL);
+        g_scan = kmalloc(G_SCAN_RESULTS, GFP_KERNEL);
         if (!g_scan)
                 return -ENOMEM;
 
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index edbf61f30b47..c8637c50dc17 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
@@ -78,7 +78,7 @@ typedef struct wl_iw_extra_params {
 
 #define CHECK_EXTRA_FOR_NULL(extra) \
 if (!extra) { \
-        WL_ERROR(("%s: error : extra is null pointer\n", __func__)); \
+        WL_ERROR("%s: error : extra is null pointer\n", __func__);      \
         return -EINVAL; \
 }
 
diff --git a/drivers/staging/brcm80211/include/bcm_rpc.h b/drivers/staging/brcm80211/include/bcm_rpc.h
deleted file mode 100644
index 77e5d8f71966..000000000000
--- a/drivers/staging/brcm80211/include/bcm_rpc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _BCM_RPC_H_
-#define _BCM_RPC_H_
-
-#include <rpc_osl.h>
-
-typedef struct rpc_info rpc_info_t;
-typedef struct rpc_buf rpc_buf_t;
-struct rpc_transport_info;
-typedef void (*rpc_dispatch_cb_t) (void *ctx, struct rpc_buf *buf);
-typedef void (*rpc_resync_cb_t) (void *ctx);
-typedef void (*rpc_down_cb_t) (void *ctx);
-typedef void (*rpc_txdone_cb_t) (void *ctx, struct rpc_buf *buf);
-extern struct rpc_info *bcm_rpc_attach(void *pdev, osl_t *osh,
-                                       struct rpc_transport_info *rpc_th);
-
-extern void bcm_rpc_detach(struct rpc_info *rpc);
-extern void bcm_rpc_down(struct rpc_info *rpc);
-extern void bcm_rpc_watchdog(struct rpc_info *rpc);
-
-extern struct rpc_buf *bcm_rpc_buf_alloc(struct rpc_info *rpc, int len);
-extern void bcm_rpc_buf_free(struct rpc_info *rpc, struct rpc_buf *b);
-/* get rpc transport handle */
-extern struct rpc_transport_info *bcm_rpc_tp_get(struct rpc_info *rpc);
-
-/* callback for: data_rx, down, resync */
-extern void bcm_rpc_rxcb_init(struct rpc_info *rpc, void *ctx,
-                              rpc_dispatch_cb_t cb, void *dnctx,
-                              rpc_down_cb_t dncb, rpc_resync_cb_t resync_cb,
-                              rpc_txdone_cb_t);
-extern void bcm_rpc_rxcb_deinit(struct rpc_info *rpci);
-
-/* HOST or CLIENT rpc call, requiring no return value */
-extern int bcm_rpc_call(struct rpc_info *rpc, struct rpc_buf *b);
-
-/* HOST rpc call, demanding return.
- *   The thread may be suspended and control returns back to OS
- *   The thread will resume(waked up) on either the return signal received or timeout
- *     The implementation details depend on OS
- */
-extern struct rpc_buf *bcm_rpc_call_with_return(struct rpc_info *rpc,
-                                                struct rpc_buf *b);
-
-/* CLIENT rpc call to respond to bcm_rpc_call_with_return, requiring no return value */
-extern int bcm_rpc_call_return(struct rpc_info *rpc, struct rpc_buf *retb);
-
-extern uint bcm_rpc_buf_header_len(struct rpc_info *rpci);
-
-#define RPC_PKTLOG_SIZE         50      /* Depth of the history */
-#define RPC_PKTLOG_RD_LEN       3
-#define RPC_PKTLOG_DUMP_SIZE    150     /* dump size should be more than the product of above two */
-extern int bcm_rpc_pktlog_get(struct rpc_info *rpci, u32 *buf,
-                              uint buf_size, bool send);
-extern int bcm_rpc_dump(rpc_info_t *rpci, struct bcmstrbuf *b);
-
-/* HIGH/BMAC: bit 15-8: RPC module, bit 7-0: TP module */
-#define RPC_ERROR_VAL   0x0001
-#define RPC_TRACE_VAL   0x0002
-#define RPC_PKTTRACE_VAL 0x0004
-#define RPC_PKTLOG_VAL  0x0008
-extern void bcm_rpc_msglevel_set(struct rpc_info *rpci, u16 msglevel,
-                                 bool high_low);
-
-#endif                          /* _BCM_RPC_H_ */
diff --git a/drivers/staging/brcm80211/include/bcm_rpc_tp.h b/drivers/staging/brcm80211/include/bcm_rpc_tp.h
deleted file mode 100644
index bb8dc6dd6f44..000000000000
--- a/drivers/staging/brcm80211/include/bcm_rpc_tp.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _bcm_rpc_tp_h_
-#define _bcm_rpc_tp_h_
-#include <bcm_rpc.h>
-
-#define DBUS_RX_BUFFER_SIZE_RPC (2100)  /* rxbufsize for dbus_attach, linux only for now */
-
-#define BCM_RPC_TP_ENCAP_LEN    4       /* TP header is 4 bytes */
-
-#define BCM_RPC_TP_HOST_AGG_MASK        0xffff0000
-#define BCM_RPC_TP_HOST_AGG_SHIFT       16
-#define BCM_RPC_TP_HOST_AGG_AMPDU       0x00010000      /* HOST->DNGL ampdu aggregation */
-#define BCM_RPC_TP_HOST_AGG_TEST        0x00100000      /* HOST->DNGL test aggregation */
-#define BCM_RPC_TP_DNGL_AGG_MASK        0x0000ffff
-#define BCM_RPC_TP_DNGL_AGG_DPC         0x00000001      /* DNGL->HOST data aggregation */
-#define BCM_RPC_TP_DNGL_AGG_FLOWCTL     0x00000002      /* DNGL->HOST tx flowcontrol agg */
-#define BCM_RPC_TP_DNGL_AGG_TEST        0x00000010      /* DNGL->HOST test agg */
-
-#define BCM_RPC_TP_DNGL_AGG_MAX_SFRAME  3       /* max agg subframes, must be <= USB_NTXD */
-#define BCM_RPC_TP_DNGL_AGG_MAX_BYTE    4000    /* max agg bytes */
-
-#define BCM_RPC_TP_HOST_AGG_MAX_SFRAME  3       /* max agg subframes, AMPDU only, 3 is enough */
-#define BCM_RPC_TP_HOST_AGG_MAX_BYTE    3400    /* max agg bytes; to fit 2+ tcp/udp pkts. Each one:
-                                                 * 802.3pkt + 802.11 hdr + rpc hdr + tp hdr < 1700B
-                                                 * Need to be in sync with dongle usb rx dma
-                                                 *  rxbufsize(USBBULK_RXBUF_GIANT in usbdev_sb.c)
-                                                 */
-/* TP-DBUS pkts flowcontrol */
-#define BCM_RPC_TP_DBUS_NTXQ    50      /* queue size for TX on bulk OUT, aggregation possible */
-#define BCM_RPC_TP_DBUS_NRXQ    50      /* queue size for RX on bulk IN, aggregation possible */
-#define BCM_RPC_TP_DBUS_NRXQ_CTRL       1       /* queue size for RX on ctl EP0 */
-
-#define BCM_RPC_TP_DBUS_NRXQ_PKT        (BCM_RPC_TP_DBUS_NRXQ * BCM_RPC_TP_DNGL_AGG_MAX_SFRAME)
-#define BCM_RPC_TP_DBUS_NTXQ_PKT        (BCM_RPC_TP_DBUS_NTXQ * BCM_RPC_TP_HOST_AGG_MAX_SFRAME)
-
-typedef struct rpc_transport_info rpc_tp_info_t;
-
-typedef void (*rpc_tx_complete_fn_t) (void *, rpc_buf_t *, int status);
-typedef void (*rpc_rx_fn_t) (void *, rpc_buf_t *);
-
-#ifdef WLC_LOW
-typedef void (*rpc_txflowctl_cb_t) (void *ctx, bool on);
-#endif
-
-extern rpc_tp_info_t *bcm_rpc_tp_attach(osl_t *osh, void *bus);
-extern void bcm_rpc_tp_detach(rpc_tp_info_t *rpcb);
-extern void bcm_rpc_tp_down(rpc_tp_info_t *rpcb);
-extern void bcm_rpc_tp_watchdog(rpc_tp_info_t *rpcb);
-
-extern int bcm_rpc_tp_buf_send(rpc_tp_info_t *rpcb, rpc_buf_t *buf);
-
-/* callback for tx_complete, rx_pkt */
-extern void bcm_rpc_tp_register_cb(rpc_tp_info_t *rpcb,
-                                   rpc_tx_complete_fn_t txcmplt,
-                                   void *tx_context, rpc_rx_fn_t rxpkt,
-                                   void *rx_context, rpc_osl_t *rpc_osh);
-extern void bcm_rpc_tp_deregister_cb(rpc_tp_info_t *rpcb);
-
-/* Buffer manipulation */
-extern uint bcm_rpc_buf_tp_header_len(rpc_tp_info_t *rpcb);
-extern rpc_buf_t *bcm_rpc_tp_buf_alloc(rpc_tp_info_t *rpcb, int len);
-extern void bcm_rpc_tp_buf_free(rpc_tp_info_t *rpcb, rpc_buf_t *buf);
-extern int bcm_rpc_buf_len_get(rpc_tp_info_t *rpcb, rpc_buf_t *b);
-extern int bcm_rpc_buf_len_set(rpc_tp_info_t *rpcb, rpc_buf_t *b, uint len);
-extern rpc_buf_t *bcm_rpc_buf_next_get(rpc_tp_info_t *rpcb, rpc_buf_t *b);
-extern void bcm_rpc_buf_next_set(rpc_tp_info_t *rpcb, rpc_buf_t *b,
-                                 rpc_buf_t *nextb);
-extern unsigned char *bcm_rpc_buf_data(rpc_tp_info_t *rpcb, rpc_buf_t *b);
-extern unsigned char *bcm_rpc_buf_push(rpc_tp_info_t *rpcb, rpc_buf_t *b,
-                                       uint delta);
-extern unsigned char *bcm_rpc_buf_pull(rpc_tp_info_t *rpcb, rpc_buf_t *b,
-                                       uint delta);
-extern void bcm_rpc_tp_buf_release(rpc_tp_info_t *rpcb, rpc_buf_t *buf);
-extern void bcm_rpc_tp_buf_cnt_adjust(rpc_tp_info_t *rpcb, int adjust);
-/* RPC call_with_return */
-extern int bcm_rpc_tp_recv_rtn(rpc_tp_info_t *rpcb);
-extern int bcm_rpc_tp_get_device_speed(rpc_tp_info_t *rpc_th);
-#ifdef BCMDBG
-extern int bcm_rpc_tp_dump(rpc_tp_info_t *rpcb, struct bcmstrbuf *b);
-#endif
-
-#ifdef WLC_LOW
-/* intercept USB pkt to parse RPC header: USB driver rx-> wl_send -> this -> wl driver */
-extern void bcm_rpc_tp_rx_from_dnglbus(rpc_tp_info_t *rpc_th, struct lbuf *lb);
-
-/* RPC callreturn pkt, go to USB driver tx */
-extern int bcm_rpc_tp_send_callreturn(rpc_tp_info_t *rpc_th, rpc_buf_t *b);
-
-extern void bcm_rpc_tp_dump(rpc_tp_info_t *rpcb);
-extern void bcm_rpc_tp_txflowctl(rpc_tp_info_t *rpcb, bool state, int prio);
-extern void bcm_rpc_tp_txflowctlcb_init(rpc_tp_info_t *rpc_th, void *ctx,
-                                        rpc_txflowctl_cb_t cb);
-extern void bcm_rpc_tp_txflowctlcb_deinit(rpc_tp_info_t *rpc_th);
-extern void bcm_rpc_tp_txq_wm_set(rpc_tp_info_t *rpc_th, u8 hiwm,
-                                  u8 lowm);
-extern void bcm_rpc_tp_txq_wm_get(rpc_tp_info_t *rpc_th, u8 *hiwm,
-                                  u8 *lowm);
-#endif                          /* WLC_LOW */
-
-extern void bcm_rpc_tp_agg_set(rpc_tp_info_t *rpcb, u32 reason, bool set);
-extern void bcm_rpc_tp_agg_limit_set(rpc_tp_info_t *rpc_th, u8 sf,
-                                     u16 bytes);
-extern void bcm_rpc_tp_agg_limit_get(rpc_tp_info_t *rpc_th, u8 *sf,
-                                     u16 *bytes);
-
-#define BCM_RPC_TP_MSG_LEVEL_MASK       0x00ff
-/* dongle msg level */
-#define RPC_TP_MSG_DNGL_ERR_VAL         0x0001  /* DNGL TP error msg */
-#define RPC_TP_MSG_DNGL_DBG_VAL         0x0002  /* DNGL TP dbg msg */
-#define RPC_TP_MSG_DNGL_AGG_VAL         0x0004  /* DNGL TP agg msg */
-#define RPC_TP_MSG_DNGL_DEA_VAL         0x0008  /* DNGL TP deag msg */
-
-/* host msg level */
-#define RPC_TP_MSG_HOST_ERR_VAL         0x0001  /* DNGL TP error msg */
-#define RPC_TP_MSG_HOST_DBG_VAL         0x0002  /* DNGL TP dbg msg */
-#define RPC_TP_MSG_HOST_AGG_VAL         0x0004  /* DNGL TP agg msg */
-#define RPC_TP_MSG_HOST_DEA_VAL         0x0008  /* DNGL TP deag msg */
-
-extern void bcm_rpc_tp_msglevel_set(rpc_tp_info_t *rpc_th, u8 msglevel,
-                                    bool high_low);
-
-#endif                          /* _bcm_rpc_tp_h_ */
diff --git a/drivers/staging/brcm80211/include/bcm_xdr.h b/drivers/staging/brcm80211/include/bcm_xdr.h
deleted file mode 100644
index 50fbd78a8804..000000000000
--- a/drivers/staging/brcm80211/include/bcm_xdr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _BCM_XDR_H
-#define _BCM_XDR_H
-
-/*
- * bcm_xdr_buf_t
- * Structure used for bookkeeping of a buffer being packed or unpacked.
- * Keeps a current read/write pointer and size as well as
- * the original buffer pointer and size.
- *
- */
-typedef struct {
-        u8 *buf;                /* pointer to current position in origbuf */
-        uint size;              /* current (residual) size in bytes */
-        u8 *origbuf;            /* unmodified pointer to orignal buffer */
-        uint origsize;          /* unmodified orignal buffer size in bytes */
-} bcm_xdr_buf_t;
-
-void bcm_xdr_buf_init(bcm_xdr_buf_t *b, void *buf, size_t len);
-
-int bcm_xdr_pack_u32(bcm_xdr_buf_t *b, u32 val);
-int bcm_xdr_unpack_u32(bcm_xdr_buf_t *b, u32 *pval);
-int bcm_xdr_pack_s32(bcm_xdr_buf_t *b, s32 val);
-int bcm_xdr_unpack_s32(bcm_xdr_buf_t *b, s32 *pval);
-int bcm_xdr_pack_s8(bcm_xdr_buf_t *b, s8 val);
-int bcm_xdr_unpack_s8(bcm_xdr_buf_t *b, s8 *pval);
-int bcm_xdr_pack_opaque(bcm_xdr_buf_t *b, uint len, void *data);
-int bcm_xdr_unpack_opaque(bcm_xdr_buf_t *b, uint len, void **pdata);
-int bcm_xdr_unpack_opaque_cpy(bcm_xdr_buf_t *b, uint len, void *data);
-int bcm_xdr_pack_opaque_varlen(bcm_xdr_buf_t *b, uint len, void *data);
-int bcm_xdr_unpack_opaque_varlen(bcm_xdr_buf_t *b, uint *plen, void **pdata);
-int bcm_xdr_pack_string(bcm_xdr_buf_t *b, char *str);
-int bcm_xdr_unpack_string(bcm_xdr_buf_t *b, uint *plen, char **pstr);
-
-int bcm_xdr_pack_u8_vec(bcm_xdr_buf_t *, u8 *vec, u32 elems);
-int bcm_xdr_unpack_u8_vec(bcm_xdr_buf_t *, u8 *vec, u32 elems);
-int bcm_xdr_pack_u16_vec(bcm_xdr_buf_t *b, uint len, void *vec);
-int bcm_xdr_unpack_u16_vec(bcm_xdr_buf_t *b, uint len, void *vec);
-int bcm_xdr_pack_u32_vec(bcm_xdr_buf_t *b, uint len, void *vec);
-int bcm_xdr_unpack_u32_vec(bcm_xdr_buf_t *b, uint len, void *vec);
-
-int bcm_xdr_pack_opaque_raw(bcm_xdr_buf_t *b, uint len, void *data);
-int bcm_xdr_pack_opaque_pad(bcm_xdr_buf_t *b);
-
-#endif                          /* _BCM_XDR_H */
diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
index dc52e9dbb8b5..74601fc971c9 100644
--- a/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -42,9 +42,6 @@
 #define BCMFASTPATH
 #endif
 
-/* Put some library data/code into ROM to reduce RAM requirements */
-#define BCMROMFN(_fn)           _fn
-
 /* Bus types */
 #define SI_BUS                  0       /* SOC Interconnect */
 #define PCI_BUS                 1       /* PCI target */
@@ -54,35 +51,6 @@
 #define SPI_BUS                 6       /* gSPI target */
 #define RPC_BUS                 7       /* RPC target */
 
-/* Allows size optimization for single-bus image */
-#ifdef BCMBUSTYPE
-#define BUSTYPE(bus)    (BCMBUSTYPE)
-#else
-#define BUSTYPE(bus)    (bus)
-#endif
-
-/* Allows size optimization for single-backplane image */
-#ifdef BCMCHIPTYPE
-#define CHIPTYPE(bus)   (BCMCHIPTYPE)
-#else
-#define CHIPTYPE(bus)   (bus)
-#endif
-
-/* Allows size optimization for SPROM support */
-#define SPROMBUS        (PCI_BUS)
-
-/* Allows size optimization for single-chip image */
-#ifdef BCMCHIPID
-#define CHIPID(chip)    (BCMCHIPID)
-#else
-#define CHIPID(chip)    (chip)
-#endif
-
-#ifdef BCMCHIPREV
-#define CHIPREV(rev)    (BCMCHIPREV)
-#else
-#define CHIPREV(rev)    (rev)
-#endif
 
 /* Defines for DMA Address Width - Shared between OSL and HNDDMA */
 #define DMADDR_MASK_32 0x0      /* Address mask for 32-bits */
@@ -146,31 +114,11 @@ typedef struct {
 
 #define BCMEXTRAHDROOM 172
 
-/* Headroom required for dongle-to-host communication.  Packets allocated
- * locally in the dongle (e.g. for CDC ioctls or RNDIS messages) should
- * leave this much room in front for low-level message headers which may
- * be needed to get across the dongle bus to the host.  (These messages
- * don't go over the network, so room for the full WL header above would
- * be a waste.).
-*/
-#define BCMDONGLEHDRSZ 12
-#define BCMDONGLEPADSZ 16
-
-#define BCMDONGLEOVERHEAD       (BCMDONGLEHDRSZ + BCMDONGLEPADSZ)
-
 #ifdef BCMDBG
-
-#define BCMDBG_ERR
-
 #ifndef BCMDBG_ASSERT
 #define BCMDBG_ASSERT
-#endif                          /* BCMDBG_ASSERT */
-
-#endif                          /* BCMDBG */
-
-#if defined(BCMDBG_ASSERT)
-#define BCMASSERT_SUPPORT
-#endif
+#endif  /* BCMDBG_ASSERT */
+#endif  /* BCMDBG */
 
 /* Macros for doing definition and get/set of bitfields
  * Usage example, e.g. a three-bit field (bits 4-6):
@@ -190,11 +138,10 @@ typedef struct {
                 (((val) & (~(field ## _M << field ## _S))) | \
                  ((unsigned)(bits) << field ## _S))
 
-/* define BCMSMALL to remove misc features for memory-constrained environments */
-#define BCMSPACE
-#define bcmspace        true    /* if (bcmspace) code is retained */
-
 /* Max. nvram variable table size */
 #define MAXSZ_NVRAM_VARS        4096
 
+/* handle forward declaration */
+struct wl_info;
+
 #endif                          /* _bcmdefs_h_ */
diff --git a/drivers/staging/brcm80211/include/bcmsdbus.h b/drivers/staging/brcm80211/include/bcmsdbus.h
index ca99495eaa89..89059dd8088b 100644
--- a/drivers/staging/brcm80211/include/bcmsdbus.h
+++ b/drivers/staging/brcm80211/include/bcmsdbus.h
@@ -46,8 +46,8 @@ typedef void (*sdioh_cb_fn_t) (void *);
  *  The handler shall be provided by all subsequent calls. No local cache
  *  cfghdl points to the starting address of pci device mapped memory
  */
-extern sdioh_info_t *sdioh_attach(osl_t *osh, void *cfghdl, uint irq);
-extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *si);
+extern sdioh_info_t *sdioh_attach(struct osl_info *osh, void *cfghdl, uint irq);
+extern SDIOH_API_RC sdioh_detach(struct osl_info *osh, sdioh_info_t *si);
 extern SDIOH_API_RC sdioh_interrupt_register(sdioh_info_t *si,
                                              sdioh_cb_fn_t fn, void *argh);
 extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *si);
@@ -79,7 +79,7 @@ extern SDIOH_API_RC sdioh_request_buffer(sdioh_info_t *si, uint pio_dma,
                                          uint fix_inc, uint rw, uint fnc_num,
                                          u32 addr, uint regwidth,
                                          u32 buflen, u8 *buffer,
-                                         void *pkt);
+                                         struct sk_buff *pkt);
 
 /* get cis data */
 extern SDIOH_API_RC sdioh_cis_read(sdioh_info_t *si, uint fuc, u8 *cis,
diff --git a/drivers/staging/brcm80211/include/bcmsdh.h b/drivers/staging/brcm80211/include/bcmsdh.h
index 6b80983d43c9..0e1f79919c9c 100644
--- a/drivers/staging/brcm80211/include/bcmsdh.h
+++ b/drivers/staging/brcm80211/include/bcmsdh.h
@@ -40,11 +40,11 @@ typedef void (*bcmsdh_cb_fn_t) (void *);
  *    implementation may maintain a single "default" handle (e.g. the first or
  *    most recent one) to enable single-instance implementations to pass NULL.
  */
-extern bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva,
-                                    uint irq);
+extern bcmsdh_info_t *bcmsdh_attach(struct osl_info *osh, void *cfghdl,
+                                    void **regsva, uint irq);
 
 /* Detach - freeup resources allocated in attach */
-extern int bcmsdh_detach(osl_t *osh, void *sdh);
+extern int bcmsdh_detach(struct osl_info *osh, void *sdh);
 
 /* Query if SD device interrupts are enabled */
 extern bool bcmsdh_intr_query(void *sdh);
@@ -122,7 +122,7 @@ extern int bcmsdh_send_buf(void *sdh, u32 addr, uint fn, uint flags,
                            u8 *buf, uint nbytes, void *pkt,
                            bcmsdh_cmplt_fn_t complete, void *handle);
 extern int bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags,
-                           u8 *buf, uint nbytes, void *pkt,
+                           u8 *buf, uint nbytes, struct sk_buff *pkt,
                            bcmsdh_cmplt_fn_t complete, void *handle);
 
 /* Flags bits */
@@ -174,8 +174,8 @@ extern void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh);
 typedef struct {
         /* attach to device */
         void *(*attach) (u16 vend_id, u16 dev_id, u16 bus, u16 slot,
-                         u16 func, uint bustype, void *regsva, osl_t *osh,
-                         void *param);
+                         u16 func, uint bustype, void *regsva,
+                         struct osl_info *osh, void *param);
         /* detach from device */
         void (*detach) (void *ch);
 } bcmsdh_driver_t;
diff --git a/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h b/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
index 7d5aa71a7dc7..4d671ddb3af1 100644
--- a/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
+++ b/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
@@ -51,7 +51,7 @@ extern void sdioh_sdmmc_osfree(sdioh_info_t *sd);
 #define CLIENT_INTR             0x100   /* Get rid of this! */
 
 struct sdioh_info {
-        osl_t *osh;             /* osh handler */
+        struct osl_info *osh;           /* osh handler */
         bool client_intr_enabled;       /* interrupt connnected flag */
         bool intr_handler_valid;        /* client driver interrupt handler valid */
         sdioh_cb_fn_t intr_handler;     /* registered interrupt handler */
@@ -94,8 +94,8 @@ extern void sdioh_sdmmc_devintr_off(sdioh_info_t *sd);
  */
 
 /* Register mapping routines */
-extern u32 *sdioh_sdmmc_reg_map(osl_t *osh, s32 addr, int size);
-extern void sdioh_sdmmc_reg_unmap(osl_t *osh, s32 addr, int size);
+extern u32 *sdioh_sdmmc_reg_map(struct osl_info *osh, s32 addr, int size);
+extern void sdioh_sdmmc_reg_unmap(struct osl_info *osh, s32 addr, int size);
 
 /* Interrupt (de)registration routines */
 extern int sdioh_sdmmc_register_irq(sdioh_info_t *sd, uint irq);
diff --git a/drivers/staging/brcm80211/include/bcmsrom.h b/drivers/staging/brcm80211/include/bcmsrom.h
index 9d53657fdaa1..cdcef746284f 100644
--- a/drivers/staging/brcm80211/include/bcmsrom.h
+++ b/drivers/staging/brcm80211/include/bcmsrom.h
@@ -20,15 +20,15 @@
 #include <bcmsrom_fmt.h>
 
 /* Prototypes */
-extern int srom_var_init(si_t *sih, uint bus, void *curmap, osl_t *osh,
-                         char **vars, uint *count);
+extern int srom_var_init(si_t *sih, uint bus, void *curmap,
+                         struct osl_info *osh, char **vars, uint *count);
 
-extern int srom_read(si_t *sih, uint bus, void *curmap, osl_t *osh,
+extern int srom_read(si_t *sih, uint bus, void *curmap, struct osl_info *osh,
                      uint byteoff, uint nbytes, u16 *buf, bool check_crc);
 
 /* parse standard PCMCIA cis, normally used by SB/PCMCIA/SDIO/SPI/OTP
  *   and extract from it into name=value pairs
  */
-extern int srom_parsecis(osl_t *osh, u8 **pcis, uint ciscnt,
+extern int srom_parsecis(struct osl_info *osh, u8 **pcis, uint ciscnt,
                          char **vars, uint *count);
 #endif                          /* _bcmsrom_h_ */
diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index b53315981be0..a8f76d8199ff 100644
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -30,7 +30,6 @@
         };
 
 /* ** driver-only section ** */
-#include <osl.h>
 
 #define GPIO_PIN_NOTDEFINED     0x20    /* Pin not defined */
 
@@ -56,10 +55,10 @@
 #endif
 
         typedef struct pktq_prec {
-                void *head;     /* first packet to dequeue */
-                void *tail;     /* last packet to dequeue */
-                u16 len;        /* number of queued packets */
-                u16 max;        /* maximum number of queued packets */
+                struct sk_buff *head;   /* first packet to dequeue */
+                struct sk_buff *tail;   /* last packet to dequeue */
+                u16 len;                /* number of queued packets */
+                u16 max;                /* maximum number of queued packets */
         } pktq_prec_t;
 
 /* multi-priority pkt queue */
@@ -105,23 +104,26 @@
 #define pktq_ppeek(pq, prec)            ((pq)->q[prec].head)
 #define pktq_ppeek_tail(pq, prec)       ((pq)->q[prec].tail)
 
-        extern void *pktq_penq(struct pktq *pq, int prec, void *p);
-        extern void *pktq_penq_head(struct pktq *pq, int prec, void *p);
-        extern void *pktq_pdeq(struct pktq *pq, int prec);
-        extern void *pktq_pdeq_tail(struct pktq *pq, int prec);
+extern struct sk_buff *pktq_penq(struct pktq *pq, int prec,
+                                 struct sk_buff *p);
+extern struct sk_buff *pktq_penq_head(struct pktq *pq, int prec,
+                                      struct sk_buff *p);
+extern struct sk_buff *pktq_pdeq(struct pktq *pq, int prec);
+extern struct sk_buff *pktq_pdeq_tail(struct pktq *pq, int prec);
+
 /* Empty the queue at particular precedence level */
 #ifdef BRCM_FULLMAC
-        extern void pktq_pflush(osl_t *osh, struct pktq *pq, int prec,
+        extern void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec,
                 bool dir);
 #else
-        extern void pktq_pflush(osl_t *osh, struct pktq *pq, int prec,
+        extern void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec,
                 bool dir, ifpkt_cb_t fn, int arg);
 #endif /* BRCM_FULLMAC */
 
 /* operations on a set of precedences in packet queue */
 
-        extern int pktq_mlen(struct pktq *pq, uint prec_bmp);
-        extern void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
+extern int pktq_mlen(struct pktq *pq, uint prec_bmp);
+extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
 
 /* operations on packet queue as a whole */
 
@@ -140,20 +142,19 @@
 
         extern void pktq_init(struct pktq *pq, int num_prec, int max_len);
 /* prec_out may be NULL if caller is not interested in return value */
-        extern void *pktq_peek_tail(struct pktq *pq, int *prec_out);
+        extern struct sk_buff *pktq_peek_tail(struct pktq *pq, int *prec_out);
 #ifdef BRCM_FULLMAC
-        extern void pktq_flush(osl_t *osh, struct pktq *pq, bool dir);
+        extern void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir);
 #else
-        extern void pktq_flush(osl_t *osh, struct pktq *pq, bool dir,
+        extern void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir,
                 ifpkt_cb_t fn, int arg);
 #endif
 
 /* externs */
 /* packet */
-        extern uint pktfrombuf(osl_t *osh, void *p, uint offset, int len,
-                               unsigned char *buf);
-        extern uint pktsegcnt(osl_t *osh, void *p);
-        extern uint pkttotlen(osl_t *osh, void *p);
+        extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p,
+                               uint offset, int len, unsigned char *buf);
+        extern uint pkttotlen(struct osl_info *osh, struct sk_buff *p);
 
 /* ethernet address */
         extern int bcm_ether_atoe(char *p, struct ether_addr *ea);
@@ -166,7 +167,8 @@
         extern char *getvar(char *vars, const char *name);
         extern int getintvar(char *vars, const char *name);
 #ifdef BCMDBG
-        extern void prpkt(const char *msg, osl_t *osh, void *p0);
+        extern void prpkt(const char *msg, struct osl_info *osh,
+                          struct sk_buff *p0);
 #endif                          /* BCMDBG */
 #define bcm_perf_enable()
 #define bcmstats(fmt)
@@ -359,7 +361,21 @@
 #define CEIL(x, y)              (((x) + ((y)-1)) / (y))
 #define ISPOWEROF2(x)           ((((x)-1)&(x)) == 0)
 
-/* bit map related macros */
+/* map physical to virtual I/O */
+#if !defined(CONFIG_MMC_MSM7X00A)
+#define REG_MAP(pa, size)       ioremap_nocache((unsigned long)(pa), \
+                                        (unsigned long)(size))
+#else
+#define REG_MAP(pa, size)       (void *)(0)
+#endif
+
+/* Register operations */
+#define AND_REG(osh, r, v)      W_REG(osh, (r), R_REG(osh, r) & (v))
+#define OR_REG(osh, r, v)       W_REG(osh, (r), R_REG(osh, r) | (v))
+
+#define SET_REG(osh, r, mask, val) \
+                W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
+
 #ifndef setbit
 #ifndef NBBY                    /* the BSD family defines NBBY */
 #define NBBY    8               /* 8 bits per byte */
diff --git a/drivers/staging/brcm80211/include/d11.h b/drivers/staging/brcm80211/include/d11.h
index c07548c70e30..be2d4970407c 100644
--- a/drivers/staging/brcm80211/include/d11.h
+++ b/drivers/staging/brcm80211/include/d11.h
@@ -17,13 +17,6 @@
 #ifndef _D11_H
 #define _D11_H
 
-#include <bcmdefs.h>
-#include <bcmdevs.h>
-#include <hndsoc.h>
-#include <sbhndpio.h>
-#include <sbhnddma.h>
-#include <proto/802.11.h>
-
 /* This marks the start of a packed structure section. */
 #include <packed_section_start.h>
 
diff --git a/drivers/staging/brcm80211/include/dbus.h b/drivers/staging/brcm80211/include/dbus.h
deleted file mode 100644
index 81ffea79d008..000000000000
--- a/drivers/staging/brcm80211/include/dbus.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __DBUS_H__
-#define __DBUS_H__
-
-#ifdef BCMDBG
-#define DBUSERR(args)        do { if (net_ratelimit()) printf args; } while (0)
-#define DBUSTRACE(args)
-#define DBUSDBGLOCK(args)
-
-#else
-#define DBUSTRACE(args)
-#define DBUSERR(args)
-#define DBUSDBGLOCK(args)
-#endif
-
-enum {
-        DBUS_OK = 0,
-        DBUS_ERR = -200,
-        DBUS_ERR_TIMEOUT,
-        DBUS_ERR_DISCONNECT,
-        DBUS_ERR_NODEVICE,
-        DBUS_ERR_UNSUPPORTED,
-        DBUS_ERR_PENDING,
-        DBUS_ERR_NOMEM,
-        DBUS_ERR_TXFAIL,
-        DBUS_ERR_TXTIMEOUT,
-        DBUS_ERR_TXDROP,
-        DBUS_ERR_RXFAIL,
-        DBUS_ERR_RXDROP,
-        DBUS_ERR_TXCTLFAIL,
-        DBUS_ERR_RXCTLFAIL,
-        DBUS_ERR_REG_PARAM,
-        DBUS_STATUS_CANCELLED
-};
-
-#define ERR_CBMASK_TXFAIL               0x00000001
-#define ERR_CBMASK_RXFAIL               0x00000002
-#define ERR_CBMASK_ALL                  0xFFFFFFFF
-
-#define DBUS_CBCTL_WRITE                0
-#define DBUS_CBCTL_READ                 1
-
-#define DBUS_TX_RETRY_LIMIT             3       /* retries for failed txirb */
-#define DBUS_TX_TIMEOUT_INTERVAL        250     /* timeout for txirb complete, in ms */
-
-#define DBUS_BUFFER_SIZE_TX     5000
-#define DBUS_BUFFER_SIZE_RX     5000
-
-#define DBUS_BUFFER_SIZE_TX_NOAGG       2048
-#define DBUS_BUFFER_SIZE_RX_NOAGG       2048
-
-/* DBUS types */
-enum {
-        DBUS_USB,
-        DBUS_SDIO,
-        DBUS_SPI,
-        DBUS_UNKNOWN
-};
-
-enum dbus_state {
-        DBUS_STATE_DL_PENDING,
-        DBUS_STATE_DL_DONE,
-        DBUS_STATE_UP,
-        DBUS_STATE_DOWN,
-        DBUS_STATE_PNP_FWDL,
-        DBUS_STATE_DISCONNECT
-};
-
-enum dbus_pnp_state {
-        DBUS_PNP_DISCONNECT,
-        DBUS_PNP_SLEEP,
-        DBUS_PNP_RESUME
-};
-
-typedef enum _DEVICE_SPEED {
-        INVALID_SPEED = -1,
-        LOW_SPEED = 1,          /* USB 1.1: 1.5 Mbps */
-        FULL_SPEED,             /* USB 1.1: 12  Mbps */
-        HIGH_SPEED,             /* USB 2.0: 480 Mbps */
-        SUPER_SPEED,            /* USB 3.0: 4.8 Gbps */
-} DEVICE_SPEED;
-
-typedef struct {
-        int bustype;
-        int vid;
-        int pid;
-        int devid;
-        int chiprev;            /* chip revsion number */
-        int mtu;
-        int nchan;              /* Data Channels */
-} dbus_attrib_t;
-
-/* FIX: Account for errors related to DBUS;
- * Let upper layer account for packets/bytes
- */
-typedef struct {
-        u32 rx_errors;
-        u32 tx_errors;
-        u32 rx_dropped;
-        u32 tx_dropped;
-} dbus_stats_t;
-
-/*
- * Configurable BUS parameters
- */
-typedef struct {
-        bool rxctl_deferrespok;
-} dbus_config_t;
-
-struct dbus_callbacks;
-struct exec_parms;
-
-typedef void *(*probe_cb_t) (void *arg, const char *desc, u32 bustype,
-                             u32 hdrlen);
-typedef void (*disconnect_cb_t) (void *arg);
-typedef void *(*exec_cb_t) (struct exec_parms *args);
-
-/* Client callbacks registered during dbus_attach() */
-typedef struct dbus_callbacks {
-        void (*send_complete) (void *cbarg, void *info, int status);
-        void (*recv_buf) (void *cbarg, u8 *buf, int len);
-        void (*recv_pkt) (void *cbarg, void *pkt);
-        void (*txflowcontrol) (void *cbarg, bool onoff);
-        void (*errhandler) (void *cbarg, int err);
-        void (*ctl_complete) (void *cbarg, int type, int status);
-        void (*state_change) (void *cbarg, int state);
-        void *(*pktget) (void *cbarg, uint len, bool send);
-        void (*pktfree) (void *cbarg, void *p, bool send);
-} dbus_callbacks_t;
-
-struct dbus_pub;
-struct bcmstrbuf;
-struct dbus_irb;
-struct dbus_irb_rx;
-struct dbus_irb_tx;
-struct dbus_intf_callbacks;
-
-typedef struct {
-        void *(*attach) (struct dbus_pub *pub, void *cbarg,
-                         struct dbus_intf_callbacks *cbs);
-        void (*detach) (struct dbus_pub *pub, void *bus);
-
-        int (*up) (void *bus);
-        int (*down) (void *bus);
-        int (*send_irb) (void *bus, struct dbus_irb_tx *txirb);
-        int (*recv_irb) (void *bus, struct dbus_irb_rx *rxirb);
-        int (*cancel_irb) (void *bus, struct dbus_irb_tx *txirb);
-        int (*send_ctl) (void *bus, u8 *buf, int len);
-        int (*recv_ctl) (void *bus, u8 *buf, int len);
-        int (*get_stats) (void *bus, dbus_stats_t *stats);
-        int (*get_attrib) (void *bus, dbus_attrib_t *attrib);
-
-        int (*pnp) (void *bus, int event);
-        int (*remove) (void *bus);
-        int (*resume) (void *bus);
-        int (*suspend) (void *bus);
-        int (*stop) (void *bus);
-        int (*reset) (void *bus);
-
-        /* Access to bus buffers directly */
-        void *(*pktget) (void *bus, int len);
-        void (*pktfree) (void *bus, void *pkt);
-
-        int (*iovar_op) (void *bus, const char *name, void *params, int plen,
-                         void *arg, int len, bool set);
-        void (*dump) (void *bus, struct bcmstrbuf *strbuf);
-        int (*set_config) (void *bus, dbus_config_t *config);
-        int (*get_config) (void *bus, dbus_config_t *config);
-
-         bool(*device_exists) (void *bus);
-         bool(*dlneeded) (void *bus);
-        int (*dlstart) (void *bus, u8 *fw, int len);
-        int (*dlrun) (void *bus);
-         bool(*recv_needed) (void *bus);
-
-        void *(*exec_rxlock) (void *bus, exec_cb_t func,
-                              struct exec_parms *args);
-        void *(*exec_txlock) (void *bus, exec_cb_t func,
-                              struct exec_parms *args);
-
-        int (*tx_timer_init) (void *bus);
-        int (*tx_timer_start) (void *bus, uint timeout);
-        int (*tx_timer_stop) (void *bus);
-
-        int (*sched_dpc) (void *bus);
-        int (*lock) (void *bus);
-        int (*unlock) (void *bus);
-        int (*sched_probe_cb) (void *bus);
-
-        int (*shutdown) (void *bus);
-
-        int (*recv_stop) (void *bus);
-        int (*recv_resume) (void *bus);
-
-        /* Add from the bottom */
-} dbus_intf_t;
-
-typedef struct dbus_pub {
-        struct osl_info *osh;
-        dbus_stats_t stats;
-        dbus_attrib_t attrib;
-        enum dbus_state busstate;
-        DEVICE_SPEED device_speed;
-        int ntxq, nrxq, rxsize;
-        void *bus;
-        struct shared_info *sh;
-} dbus_pub_t;
-
-#define BUS_INFO(bus, type) (((type *) bus)->pub->bus)
-
-/*
- * Public Bus Function Interface
- */
-extern int dbus_register(int vid, int pid, probe_cb_t prcb,
-                         disconnect_cb_t discb, void *prarg, void *param1,
-                         void *param2);
-extern int dbus_deregister(void);
-
-extern const dbus_pub_t *dbus_attach(struct osl_info *osh, int rxsize, int nrxq,
-                                     int ntxq, void *cbarg,
-                                     dbus_callbacks_t *cbs,
-                                     struct shared_info *sh);
-extern void dbus_detach(const dbus_pub_t *pub);
-
-extern int dbus_up(const dbus_pub_t *pub);
-extern int dbus_down(const dbus_pub_t *pub);
-extern int dbus_stop(const dbus_pub_t *pub);
-extern int dbus_shutdown(const dbus_pub_t *pub);
-extern void dbus_flowctrl_rx(const dbus_pub_t *pub, bool on);
-
-extern int dbus_send_buf(const dbus_pub_t *pub, u8 *buf, int len,
-                         void *info);
-extern int dbus_send_pkt(const dbus_pub_t *pub, void *pkt, void *info);
-extern int dbus_send_ctl(const dbus_pub_t *pub, u8 *buf, int len);
-extern int dbus_recv_ctl(const dbus_pub_t *pub, u8 *buf, int len);
-
-extern int dbus_get_stats(const dbus_pub_t *pub, dbus_stats_t *stats);
-extern int dbus_get_attrib(const dbus_pub_t *pub, dbus_attrib_t *attrib);
-extern int dbus_get_device_speed(const dbus_pub_t *pub);
-extern int dbus_set_config(const dbus_pub_t *pub, dbus_config_t *config);
-extern int dbus_get_config(const dbus_pub_t *pub, dbus_config_t *config);
-
-extern void *dbus_pktget(const dbus_pub_t *pub, int len);
-extern void dbus_pktfree(const dbus_pub_t *pub, void *pkt);
-
-extern int dbus_set_errmask(const dbus_pub_t *pub, u32 mask);
-extern int dbus_pnp_sleep(const dbus_pub_t *pub);
-extern int dbus_pnp_resume(const dbus_pub_t *pub, int *fw_reload);
-extern int dbus_pnp_disconnect(const dbus_pub_t *pub);
-
-extern int dbus_iovar_op(const dbus_pub_t *pub, const char *name,
-                         void *params, int plen, void *arg, int len, bool set);
-#ifdef BCMDBG
-extern void dbus_hist_dump(const dbus_pub_t *pub, struct bcmstrbuf *b);
-#endif                          /* BCMDBG */
-/*
- * Private Common Bus Interface
- */
-
-/* IO Request Block (IRB) */
-typedef struct dbus_irb {
-        struct dbus_irb *next;  /* it's casted from dbus_irb_tx or dbus_irb_rx struct */
-} dbus_irb_t;
-
-typedef struct dbus_irb_rx {
-        struct dbus_irb irb;    /* Must be first */
-        u8 *buf;
-        int buf_len;
-        int actual_len;
-        void *pkt;
-        void *info;
-        void *arg;
-} dbus_irb_rx_t;
-
-typedef struct dbus_irb_tx {
-        struct dbus_irb irb;    /* Must be first */
-        u8 *buf;
-        int len;
-        void *pkt;
-        int retry_count;
-        void *info;
-        void *arg;
-} dbus_irb_tx_t;
-
-/* DBUS interface callbacks are different from user callbacks
- * so, internally, different info can be passed to upper layer
- */
-typedef struct dbus_intf_callbacks {
-        void (*send_irb_timeout) (void *cbarg, dbus_irb_tx_t *txirb);
-        void (*send_irb_complete) (void *cbarg, dbus_irb_tx_t *txirb,
-                                   int status);
-        void (*recv_irb_complete) (void *cbarg, dbus_irb_rx_t *rxirb,
-                                   int status);
-        void (*errhandler) (void *cbarg, int err);
-        void (*ctl_complete) (void *cbarg, int type, int status);
-        void (*state_change) (void *cbarg, int state);
-         bool(*isr) (void *cbarg, bool *wantdpc);
-         bool(*dpc) (void *cbarg, bool bounded);
-        void (*watchdog) (void *cbarg);
-        void *(*pktget) (void *cbarg, uint len, bool send);
-        void (*pktfree) (void *cbarg, void *p, bool send);
-        struct dbus_irb *(*getirb) (void *cbarg, bool send);
-        void (*rxerr_indicate) (void *cbarg, bool on);
-} dbus_intf_callbacks_t;
-
-/*
- * Porting: To support new bus, port these functions below
- */
-
-/*
- * Bus specific Interface
- * Implemented by dbus_usb.c/dbus_sdio.c
- */
-extern int dbus_bus_register(int vid, int pid, probe_cb_t prcb,
-                             disconnect_cb_t discb, void *prarg,
-                             dbus_intf_t **intf, void *param1, void *param2);
-extern int dbus_bus_deregister(void);
-
-/*
- * Bus-specific and OS-specific Interface
- * Implemented by dbus_usb_[linux/ndis].c/dbus_sdio_[linux/ndis].c
- */
-extern int dbus_bus_osl_register(int vid, int pid, probe_cb_t prcb,
-                                 disconnect_cb_t discb, void *prarg,
-                                 dbus_intf_t **intf, void *param1,
-                                 void *param2);
-extern int dbus_bus_osl_deregister(void);
-
-/*
- * Bus-specific, OS-specific, HW-specific Interface
- * Mainly for SDIO Host HW controller
- */
-extern int dbus_bus_osl_hw_register(int vid, int pid, probe_cb_t prcb,
-                                    disconnect_cb_t discb, void *prarg,
-                                    dbus_intf_t **intf);
-extern int dbus_bus_osl_hw_deregister(void);
-
-#endif                          /* __DBUS_H__ */
diff --git a/drivers/staging/brcm80211/include/epivers.h b/drivers/staging/brcm80211/include/epivers.h
deleted file mode 100644
index 2e6b5190ad6c..000000000000
--- a/drivers/staging/brcm80211/include/epivers.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _epivers_h_
-#define _epivers_h_
-
-#define EPI_MAJOR_VERSION       5
-
-#define EPI_MINOR_VERSION       75
-
-#define EPI_RC_NUMBER           11
-
-#define EPI_INCREMENTAL_NUMBER  0
-
-#define EPI_BUILD_NUMBER        1
-
-#define EPI_VERSION             { 5, 75, 11, 0 }
-
-#ifdef BCMSDIO
-/* EPI_VERSION_NUM must match FW version */
-#define EPI_VERSION_NUM         0x054b0c00
-#else
-#define EPI_VERSION_NUM         0x054b0b00
-#endif
-
-#define EPI_VERSION_DEV         5.75.11
-
-/* Driver Version String, ASCII, 32 chars max */
-#define EPI_VERSION_STR         "5.75.11"
-
-#endif                          /* _epivers_h_ */
diff --git a/drivers/staging/brcm80211/include/hnddma.h b/drivers/staging/brcm80211/include/hnddma.h
index bee4c89be23d..4c5462baf11e 100644
--- a/drivers/staging/brcm80211/include/hnddma.h
+++ b/drivers/staging/brcm80211/include/hnddma.h
@@ -19,7 +19,7 @@
 
 #ifndef _hnddma_pub_
 #define _hnddma_pub_
-typedef const struct hnddma_pub hnddma_t;
+struct hnddma_pub;
 #endif                          /* _hnddma_pub_ */
 
 /* range param for dma_getnexttxp() and dma_txreclaim */
@@ -30,52 +30,54 @@ typedef enum txd_range {
 } txd_range_t;
 
 /* dma function type */
-typedef void (*di_detach_t) (hnddma_t *dmah);
-typedef bool(*di_txreset_t) (hnddma_t *dmah);
-typedef bool(*di_rxreset_t) (hnddma_t *dmah);
-typedef bool(*di_rxidle_t) (hnddma_t *dmah);
-typedef void (*di_txinit_t) (hnddma_t *dmah);
-typedef bool(*di_txenabled_t) (hnddma_t *dmah);
-typedef void (*di_rxinit_t) (hnddma_t *dmah);
-typedef void (*di_txsuspend_t) (hnddma_t *dmah);
-typedef void (*di_txresume_t) (hnddma_t *dmah);
-typedef bool(*di_txsuspended_t) (hnddma_t *dmah);
-typedef bool(*di_txsuspendedidle_t) (hnddma_t *dmah);
-typedef int (*di_txfast_t) (hnddma_t *dmah, void *p, bool commit);
-typedef int (*di_txunframed_t) (hnddma_t *dmah, void *p, uint len,
+typedef void (*di_detach_t) (struct hnddma_pub *dmah);
+typedef bool(*di_txreset_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxreset_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxidle_t) (struct hnddma_pub *dmah);
+typedef void (*di_txinit_t) (struct hnddma_pub *dmah);
+typedef bool(*di_txenabled_t) (struct hnddma_pub *dmah);
+typedef void (*di_rxinit_t) (struct hnddma_pub *dmah);
+typedef void (*di_txsuspend_t) (struct hnddma_pub *dmah);
+typedef void (*di_txresume_t) (struct hnddma_pub *dmah);
+typedef bool(*di_txsuspended_t) (struct hnddma_pub *dmah);
+typedef bool(*di_txsuspendedidle_t) (struct hnddma_pub *dmah);
+typedef int (*di_txfast_t) (struct hnddma_pub *dmah, struct sk_buff *p,
+                            bool commit);
+typedef int (*di_txunframed_t) (struct hnddma_pub *dmah, void *p, uint len,
                                 bool commit);
-typedef void *(*di_getpos_t) (hnddma_t *di, bool direction);
-typedef void (*di_fifoloopbackenable_t) (hnddma_t *dmah);
-typedef bool(*di_txstopped_t) (hnddma_t *dmah);
-typedef bool(*di_rxstopped_t) (hnddma_t *dmah);
-typedef bool(*di_rxenable_t) (hnddma_t *dmah);
-typedef bool(*di_rxenabled_t) (hnddma_t *dmah);
-typedef void *(*di_rx_t) (hnddma_t *dmah);
-typedef bool(*di_rxfill_t) (hnddma_t *dmah);
-typedef void (*di_txreclaim_t) (hnddma_t *dmah, txd_range_t range);
-typedef void (*di_rxreclaim_t) (hnddma_t *dmah);
-typedef unsigned long (*di_getvar_t) (hnddma_t *dmah, const char *name);
-typedef void *(*di_getnexttxp_t) (hnddma_t *dmah, txd_range_t range);
-typedef void *(*di_getnextrxp_t) (hnddma_t *dmah, bool forceall);
-typedef void *(*di_peeknexttxp_t) (hnddma_t *dmah);
-typedef void *(*di_peeknextrxp_t) (hnddma_t *dmah);
-typedef void (*di_rxparam_get_t) (hnddma_t *dmah, u16 *rxoffset,
+typedef void *(*di_getpos_t) (struct hnddma_pub *di, bool direction);
+typedef void (*di_fifoloopbackenable_t) (struct hnddma_pub *dmah);
+typedef bool(*di_txstopped_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxstopped_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxenable_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxenabled_t) (struct hnddma_pub *dmah);
+typedef void *(*di_rx_t) (struct hnddma_pub *dmah);
+typedef bool(*di_rxfill_t) (struct hnddma_pub *dmah);
+typedef void (*di_txreclaim_t) (struct hnddma_pub *dmah, txd_range_t range);
+typedef void (*di_rxreclaim_t) (struct hnddma_pub *dmah);
+typedef unsigned long (*di_getvar_t) (struct hnddma_pub *dmah,
+                                      const char *name);
+typedef void *(*di_getnexttxp_t) (struct hnddma_pub *dmah, txd_range_t range);
+typedef void *(*di_getnextrxp_t) (struct hnddma_pub *dmah, bool forceall);
+typedef void *(*di_peeknexttxp_t) (struct hnddma_pub *dmah);
+typedef void *(*di_peeknextrxp_t) (struct hnddma_pub *dmah);
+typedef void (*di_rxparam_get_t) (struct hnddma_pub *dmah, u16 *rxoffset,
                                   u16 *rxbufsize);
-typedef void (*di_txblock_t) (hnddma_t *dmah);
-typedef void (*di_txunblock_t) (hnddma_t *dmah);
-typedef uint(*di_txactive_t) (hnddma_t *dmah);
-typedef void (*di_txrotate_t) (hnddma_t *dmah);
-typedef void (*di_counterreset_t) (hnddma_t *dmah);
-typedef uint(*di_ctrlflags_t) (hnddma_t *dmah, uint mask, uint flags);
-typedef char *(*di_dump_t) (hnddma_t *dmah, struct bcmstrbuf *b,
+typedef void (*di_txblock_t) (struct hnddma_pub *dmah);
+typedef void (*di_txunblock_t) (struct hnddma_pub *dmah);
+typedef uint(*di_txactive_t) (struct hnddma_pub *dmah);
+typedef void (*di_txrotate_t) (struct hnddma_pub *dmah);
+typedef void (*di_counterreset_t) (struct hnddma_pub *dmah);
+typedef uint(*di_ctrlflags_t) (struct hnddma_pub *dmah, uint mask, uint flags);
+typedef char *(*di_dump_t) (struct hnddma_pub *dmah, struct bcmstrbuf *b,
                             bool dumpring);
-typedef char *(*di_dumptx_t) (hnddma_t *dmah, struct bcmstrbuf *b,
+typedef char *(*di_dumptx_t) (struct hnddma_pub *dmah, struct bcmstrbuf *b,
                               bool dumpring);
-typedef char *(*di_dumprx_t) (hnddma_t *dmah, struct bcmstrbuf *b,
+typedef char *(*di_dumprx_t) (struct hnddma_pub *dmah, struct bcmstrbuf *b,
                               bool dumpring);
-typedef uint(*di_rxactive_t) (hnddma_t *dmah);
-typedef uint(*di_txpending_t) (hnddma_t *dmah);
-typedef uint(*di_txcommitted_t) (hnddma_t *dmah);
+typedef uint(*di_rxactive_t) (struct hnddma_pub *dmah);
+typedef uint(*di_txpending_t) (struct hnddma_pub *dmah);
+typedef uint(*di_txcommitted_t) (struct hnddma_pub *dmah);
 
 /* dma opsvec */
 typedef struct di_fcn_s {
@@ -141,7 +143,8 @@ struct hnddma_pub {
         uint txnobuf;           /* tx out of dma descriptors */
 };
 
-extern hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih,
+extern struct hnddma_pub *dma_attach(struct osl_info *osh, char *name,
+                            si_t *sih,
                             void *dmaregstx, void *dmaregsrx, uint ntxd,
                             uint nrxd, uint rxbufsize, int rxextheadroom,
                             uint nrxpost, uint rxoffset, uint *msg_level);
@@ -238,6 +241,6 @@ extern const di_fcn_t dma64proc;
 extern uint dma_addrwidth(si_t *sih, void *dmaregs);
 
 /* pio helpers */
-extern void dma_txpioloopback(osl_t *osh, dma32regs_t *);
+extern void dma_txpioloopback(struct osl_info *osh, dma32regs_t *);
 
 #endif                          /* _hnddma_h_ */
diff --git a/drivers/staging/brcm80211/include/hndpmu.h b/drivers/staging/brcm80211/include/hndpmu.h
index bbcf0eecd212..a0110e4c9ac4 100644
--- a/drivers/staging/brcm80211/include/hndpmu.h
+++ b/drivers/staging/brcm80211/include/hndpmu.h
@@ -28,44 +28,44 @@
 #define SET_LDO_VOLTAGE_LNLDO1  9
 #define SET_LDO_VOLTAGE_LNLDO2_SEL      10
 
-extern void si_pmu_init(si_t *sih, osl_t *osh);
-extern void si_pmu_chip_init(si_t *sih, osl_t *osh);
-extern void si_pmu_pll_init(si_t *sih, osl_t *osh, u32 xtalfreq);
-extern void si_pmu_res_init(si_t *sih, osl_t *osh);
-extern void si_pmu_swreg_init(si_t *sih, osl_t *osh);
+extern void si_pmu_init(si_t *sih, struct osl_info *osh);
+extern void si_pmu_chip_init(si_t *sih, struct osl_info *osh);
+extern void si_pmu_pll_init(si_t *sih, struct osl_info *osh, u32 xtalfreq);
+extern void si_pmu_res_init(si_t *sih, struct osl_info *osh);
+extern void si_pmu_swreg_init(si_t *sih, struct osl_info *osh);
 
-extern u32 si_pmu_force_ilp(si_t *sih, osl_t *osh, bool force);
+extern u32 si_pmu_force_ilp(si_t *sih, struct osl_info *osh, bool force);
 
-extern u32 si_pmu_si_clock(si_t *sih, osl_t *osh);
-extern u32 si_pmu_cpu_clock(si_t *sih, osl_t *osh);
-extern u32 si_pmu_mem_clock(si_t *sih, osl_t *osh);
-extern u32 si_pmu_alp_clock(si_t *sih, osl_t *osh);
-extern u32 si_pmu_ilp_clock(si_t *sih, osl_t *osh);
+extern u32 si_pmu_si_clock(si_t *sih, struct osl_info *osh);
+extern u32 si_pmu_cpu_clock(si_t *sih, struct osl_info *osh);
+extern u32 si_pmu_mem_clock(si_t *sih, struct osl_info *osh);
+extern u32 si_pmu_alp_clock(si_t *sih, struct osl_info *osh);
+extern u32 si_pmu_ilp_clock(si_t *sih, struct osl_info *osh);
 
-extern void si_pmu_set_switcher_voltage(si_t *sih, osl_t *osh,
+extern void si_pmu_set_switcher_voltage(si_t *sih, struct osl_info *osh,
                                         u8 bb_voltage, u8 rf_voltage);
-extern void si_pmu_set_ldo_voltage(si_t *sih, osl_t *osh, u8 ldo,
+extern void si_pmu_set_ldo_voltage(si_t *sih, struct osl_info *osh, u8 ldo,
                                    u8 voltage);
-extern u16 si_pmu_fast_pwrup_delay(si_t *sih, osl_t *osh);
-extern void si_pmu_rcal(si_t *sih, osl_t *osh);
+extern u16 si_pmu_fast_pwrup_delay(si_t *sih, struct osl_info *osh);
+extern void si_pmu_rcal(si_t *sih, struct osl_info *osh);
 extern void si_pmu_pllupd(si_t *sih);
-extern void si_pmu_spuravoid(si_t *sih, osl_t *osh, u8 spuravoid);
+extern void si_pmu_spuravoid(si_t *sih, struct osl_info *osh, u8 spuravoid);
 
-extern bool si_pmu_is_otp_powered(si_t *sih, osl_t *osh);
-extern u32 si_pmu_measure_alpclk(si_t *sih, osl_t *osh);
+extern bool si_pmu_is_otp_powered(si_t *sih, struct osl_info *osh);
+extern u32 si_pmu_measure_alpclk(si_t *sih, struct osl_info *osh);
 
 extern u32 si_pmu_chipcontrol(si_t *sih, uint reg, u32 mask, u32 val);
 extern u32 si_pmu_regcontrol(si_t *sih, uint reg, u32 mask, u32 val);
 extern u32 si_pmu_pllcontrol(si_t *sih, uint reg, u32 mask, u32 val);
 extern void si_pmu_pllupd(si_t *sih);
-extern void si_pmu_sprom_enable(si_t *sih, osl_t *osh, bool enable);
+extern void si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable);
 
 extern void si_pmu_radio_enable(si_t *sih, bool enable);
-extern u32 si_pmu_waitforclk_on_backplane(si_t *sih, osl_t *osh,
+extern u32 si_pmu_waitforclk_on_backplane(si_t *sih, struct osl_info *osh,
                                              u32 clk, u32 delay);
 
-extern void si_pmu_otp_power(si_t *sih, osl_t *osh, bool on);
-extern void si_sdiod_drive_strength_init(si_t *sih, osl_t *osh,
+extern void si_pmu_otp_power(si_t *sih, struct osl_info *osh, bool on);
+extern void si_sdiod_drive_strength_init(si_t *sih, struct osl_info *osh,
                                          u32 drivestrength);
 
 #endif                          /* _hndpmu_h_ */
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
deleted file mode 100644
index c9c860b6e474..000000000000
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _linux_osl_h_
-#define _linux_osl_h_
-
-
-/* Linux Kernel: File Operations: start */
-extern void *osl_os_open_image(char *filename);
-extern int osl_os_get_image_block(char *buf, int len, void *image);
-extern void osl_os_close_image(void *image);
-/* Linux Kernel: File Operations: end */
-
-extern osl_t *osl_attach(void *pdev, uint bustype, bool pkttag);
-extern void osl_detach(osl_t *osh);
-
-extern u32 g_assert_type;
-
-#if defined(BCMDBG_ASSERT)
-#define ASSERT(exp) \
-          do { if (!(exp)) osl_assert(#exp, __FILE__, __LINE__); } while (0)
-extern void osl_assert(char *exp, char *file, int line);
-#else
-#ifdef __GNUC__
-#define GCC_VERSION \
-                        (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION > 30100
-#define ASSERT(exp)     do {} while (0)
-#else
-                        /* ASSERT could cause segmentation fault on GCC3.1, use empty instead */
-#define ASSERT(exp)
-#endif                          /* GCC_VERSION > 30100 */
-#endif                          /* __GNUC__ */
-#endif                          /* defined(BCMDBG_ASSERT) */
-
-/* PCI configuration space access macros */
-#define OSL_PCI_READ_CONFIG(osh, offset, size) \
-        osl_pci_read_config((osh), (offset), (size))
-#define OSL_PCI_WRITE_CONFIG(osh, offset, size, val) \
-        osl_pci_write_config((osh), (offset), (size), (val))
-extern u32 osl_pci_read_config(osl_t *osh, uint offset, uint size);
-extern void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val);
-
-/* PCI device bus # and slot # */
-#define OSL_PCI_BUS(osh)        osl_pci_bus(osh)
-#define OSL_PCI_SLOT(osh)       osl_pci_slot(osh)
-extern uint osl_pci_bus(osl_t *osh);
-extern uint osl_pci_slot(osl_t *osh);
-
-/* Pkttag flag should be part of public information */
-typedef struct {
-        bool pkttag;
-        uint pktalloced;        /* Number of allocated packet buffers */
-        bool mmbus;             /* Bus supports memory-mapped register accesses */
-        pktfree_cb_fn_t tx_fn;  /* Callback function for PKTFREE */
-        void *tx_ctx;           /* Context to the callback function */
-#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
-        osl_rreg_fn_t rreg_fn;  /* Read Register function */
-        osl_wreg_fn_t wreg_fn;  /* Write Register function */
-        void *reg_ctx;          /* Context to the reg callback functions */
-#endif
-} osl_pubinfo_t;
-
-#define PKTFREESETCB(osh, _tx_fn, _tx_ctx)                      \
-        do {                                                    \
-                ((osl_pubinfo_t *)osh)->tx_fn = _tx_fn;         \
-                ((osl_pubinfo_t *)osh)->tx_ctx = _tx_ctx;       \
-        } while (0)
-
-#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
-#define REGOPSSET(osh, rreg, wreg, ctx)                 \
-        do {                                            \
-                ((osl_pubinfo_t *)osh)->rreg_fn = rreg; \
-                ((osl_pubinfo_t *)osh)->wreg_fn = wreg; \
-                ((osl_pubinfo_t *)osh)->reg_ctx = ctx;  \
-        } while (0)
-#endif
-
-#define BUS_SWAP32(v)           (v)
-
-#define DMA_CONSISTENT_ALIGN    osl_dma_consistent_align()
-extern uint osl_dma_consistent_align(void);
-extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align,
-                                      uint *tot, unsigned long *pap);
-
-#ifdef BRCM_FULLMAC
-#define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
-        osl_dma_alloc_consistent((osh), (size), (0), (tot), (pap))
-#else
-#define DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \
-        osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap))
-#endif /* BRCM_FULLMAC */
-
-#define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
-        osl_dma_free_consistent((osh), (void *)(va), (size), (pa))
-extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa);
-
-/* map/unmap direction */
-#define DMA_TX  1               /* TX direction for DMA */
-#define DMA_RX  2               /* RX direction for DMA */
-
-/* map/unmap shared (dma-able) memory */
-#define DMA_MAP(osh, va, size, direction, p, dmah) \
-        osl_dma_map((osh), (va), (size), (direction))
-#define DMA_UNMAP(osh, pa, size, direction, p, dmah) \
-        osl_dma_unmap((osh), (pa), (size), (direction))
-extern uint osl_dma_map(osl_t *osh, void *va, uint size, int direction);
-extern void osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction);
-
-/* API for DMA addressing capability */
-#define OSL_DMADDRWIDTH(osh, addrwidth) do {} while (0)
-
-/* register access macros */
-#if defined(BCMSDIO)
-#ifdef BRCM_FULLMAC
-#include <bcmsdh.h>
-#endif
-#define OSL_WRITE_REG(osh, r, v) (bcmsdh_reg_write(NULL, (unsigned long)(r), sizeof(*(r)), (v)))
-#define OSL_READ_REG(osh, r) (bcmsdh_reg_read(NULL, (unsigned long)(r), sizeof(*(r))))
-#endif
-
-#if defined(BCMSDIO)
-#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) if (((osl_pubinfo_t *)(osh))->mmbus) \
-                mmap_op else bus_op
-#define SELECT_BUS_READ(osh, mmap_op, bus_op) (((osl_pubinfo_t *)(osh))->mmbus) ? \
-                mmap_op : bus_op
-#else
-#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) mmap_op
-#define SELECT_BUS_READ(osh, mmap_op, bus_op) mmap_op
-#endif
-
-#define OSL_ERROR(bcmerror)     osl_error(bcmerror)
-extern int osl_error(int bcmerror);
-
-/* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */
-#define PKTBUFSZ        2048    /* largest reasonable packet buffer, driver uses for ethernet MTU */
-
-#define OSL_SYSUPTIME()         ((u32)jiffies * (1000 / HZ))
-#define printf(fmt, args...)    printk(fmt , ## args)
-#ifdef BRCM_FULLMAC
-#include <linux/kernel.h>       /* for vsn/printf's */
-#include <linux/string.h>       /* for mem*, str* */
-#endif
-/* bcopy's: Linux kernel doesn't provide these (anymore) */
-#define bcopy(src, dst, len)    memcpy((dst), (src), (len))
-#define bcmp(b1, b2, len)       memcmp((b1), (b2), (len))
-#define bzero(b, len)           memset((b), '\0', (len))
-
-/* register access macros */
-#if defined(OSLREGOPS)
-#else
-#ifndef IL_BIGENDIAN
-#ifndef __mips__
-#define R_REG(osh, r) (\
-        SELECT_BUS_READ(osh, sizeof(*(r)) == sizeof(u8) ? readb((volatile u8*)(r)) : \
-        sizeof(*(r)) == sizeof(u16) ? readw((volatile u16*)(r)) : \
-        readl((volatile u32*)(r)), OSL_READ_REG(osh, r)) \
-)
-#else                           /* __mips__ */
-#define R_REG(osh, r) (\
-        SELECT_BUS_READ(osh, \
-                ({ \
-                        __typeof(*(r)) __osl_v; \
-                        __asm__ __volatile__("sync"); \
-                        switch (sizeof(*(r))) { \
-                        case sizeof(u8): \
-                                __osl_v = readb((volatile u8*)(r)); \
-                                break; \
-                        case sizeof(u16): \
-                                __osl_v = readw((volatile u16*)(r)); \
-                                break; \
-                        case sizeof(u32): \
-                                __osl_v = \
-                                readl((volatile u32*)(r)); \
-                                break; \
-                        } \
-                        __asm__ __volatile__("sync"); \
-                        __osl_v; \
-                }), \
-                ({ \
-                        __typeof(*(r)) __osl_v; \
-                        __asm__ __volatile__("sync"); \
-                        __osl_v = OSL_READ_REG(osh, r); \
-                        __asm__ __volatile__("sync"); \
-                        __osl_v; \
-                })) \
-)
-#endif                          /* __mips__ */
-
-#define W_REG(osh, r, v) do { \
-        SELECT_BUS_WRITE(osh,  \
-                switch (sizeof(*(r))) { \
-                case sizeof(u8): \
-                        writeb((u8)(v), (volatile u8*)(r)); break; \
-                case sizeof(u16): \
-                        writew((u16)(v), (volatile u16*)(r)); break; \
-                case sizeof(u32): \
-                        writel((u32)(v), (volatile u32*)(r)); break; \
-                }, \
-                (OSL_WRITE_REG(osh, r, v))); \
-        } while (0)
-#else                           /* IL_BIGENDIAN */
-#define R_REG(osh, r) (\
-        SELECT_BUS_READ(osh, \
-                ({ \
-                        __typeof(*(r)) __osl_v; \
-                        switch (sizeof(*(r))) { \
-                        case sizeof(u8): \
-                                __osl_v = \
-                                readb((volatile u8*)((r)^3)); \
-                                break; \
-                        case sizeof(u16): \
-                                __osl_v = \
-                                readw((volatile u16*)((r)^2)); \
-                                break; \
-                        case sizeof(u32): \
-                                __osl_v = readl((volatile u32*)(r)); \
-                                break; \
-                        } \
-                        __osl_v; \
-                }), \
-                OSL_READ_REG(osh, r)) \
-)
-#define W_REG(osh, r, v) do { \
-        SELECT_BUS_WRITE(osh,  \
-                switch (sizeof(*(r))) { \
-                case sizeof(u8):        \
-                        writeb((u8)(v), \
-                        (volatile u8*)((r)^3)); break; \
-                case sizeof(u16):       \
-                        writew((u16)(v), \
-                        (volatile u16*)((r)^2)); break; \
-                case sizeof(u32):       \
-                        writel((u32)(v), \
-                        (volatile u32*)(r)); break; \
-                }, \
-                (OSL_WRITE_REG(osh, r, v))); \
-        } while (0)
-#endif                          /* IL_BIGENDIAN */
-
-#endif                          /* OSLREGOPS */
-
-#define AND_REG(osh, r, v)              W_REG(osh, (r), R_REG(osh, r) & (v))
-#define OR_REG(osh, r, v)               W_REG(osh, (r), R_REG(osh, r) | (v))
-
-/* bcopy, bcmp, and bzero functions */
-#define bcopy(src, dst, len)    memcpy((dst), (src), (len))
-#define bcmp(b1, b2, len)       memcmp((b1), (b2), (len))
-#define bzero(b, len)           memset((b), '\0', (len))
-
-/* uncached/cached virtual address */
-#ifdef __mips__
-#include <asm/addrspace.h>
-#define OSL_UNCACHED(va)        ((void *)KSEG1ADDR((va)))
-#define OSL_CACHED(va)          ((void *)KSEG0ADDR((va)))
-#else
-#define OSL_UNCACHED(va)        ((void *)va)
-#define OSL_CACHED(va)          ((void *)va)
-#endif                          /* mips */
-
-#if defined(mips)
-#define OSL_GETCYCLES(x)        ((x) = read_c0_count() * 2)
-#elif defined(__i386__)
-#define OSL_GETCYCLES(x)        rdtscl((x))
-#else
-#define OSL_GETCYCLES(x)        ((x) = 0)
-#endif                          /* defined(mips) */
-
-/* dereference an address that may cause a bus exception */
-#ifdef mips
-#define BUSPROBE(val, addr)     get_dbe((val), (addr))
-#include <asm/paccess.h>
-#else
-#define BUSPROBE(val, addr)     ({ (val) = R_REG(NULL, (addr)); 0; })
-#endif                          /* mips */
-
-/* map/unmap physical to virtual I/O */
-#if !defined(CONFIG_MMC_MSM7X00A)
-#define REG_MAP(pa, size)       ioremap_nocache((unsigned long)(pa), (unsigned long)(size))
-#else
-#define REG_MAP(pa, size)       (void *)(0)
-#endif                          /* !defined(CONFIG_MMC_MSM7X00A */
-#define REG_UNMAP(va)           iounmap((va))
-
-#define R_SM(r)                 (*(r))
-#define W_SM(r, v)              (*(r) = (v))
-#define BZERO_SM(r, len)        memset((r), '\0', (len))
-
-#ifdef BRCM_FULLMAC
-#include <linuxver.h>           /* use current 2.4.x calling conventions */
-#endif
-
-/* packet primitives */
-#define PKTGET(osh, len, send)          osl_pktget((osh), (len))
-#define PKTFREE(osh, skb, send)         osl_pktfree((osh), (skb), (send))
-#define PKTDATA(skb)            (((struct sk_buff *)(skb))->data)
-#define PKTLEN(skb)             (((struct sk_buff *)(skb))->len)
-#define PKTHEADROOM(skb)                (PKTDATA(skb)-(((struct sk_buff *)(skb))->head))
-#define PKTTAILROOM(skb) ((((struct sk_buff *)(skb))->end)-(((struct sk_buff *)(skb))->tail))
-#define PKTNEXT(skb)            (((struct sk_buff *)(skb))->next)
-#define PKTSETNEXT(skb, x)      \
-        (((struct sk_buff *)(skb))->next = (struct sk_buff *)(x))
-#define PKTSETLEN(skb, len)     __skb_trim((struct sk_buff *)(skb), (len))
-#define PKTPUSH(skb, bytes)     skb_push((struct sk_buff *)(skb), (bytes))
-#define PKTPULL(skb, bytes)     skb_pull((struct sk_buff *)(skb), (bytes))
-#define PKTTAG(skb)             ((void *)(((struct sk_buff *)(skb))->cb))
-#define PKTALLOCED(osh)         (((osl_pubinfo_t *)(osh))->pktalloced)
-#define PKTSETPOOL(osh, skb, x, y)      do {} while (0)
-#define PKTPOOL(osh, skb)               false
-extern void *osl_pktget(osl_t *osh, uint len);
-extern void osl_pktfree(osl_t *osh, void *skb, bool send);
-
-#ifdef BRCM_FULLMAC
-extern void *osl_pktget_static(osl_t *osh, uint len);
-extern void osl_pktfree_static(osl_t *osh, void *skb, bool send);
-
-static inline void *
-osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb)
-{
-        struct sk_buff *nskb;
-
-        if (osh->pkttag)
-                bzero((void *)skb->cb, OSL_PKTTAG_SZ);
-
-        for (nskb = skb; nskb; nskb = nskb->next)
-                osh->pktalloced++;
-
-        return (void *)skb;
-}
-#define PKTFRMNATIVE(osh, skb)  \
-        osl_pkt_frmnative(((osl_pubinfo_t *)osh), (struct sk_buff*)(skb))
-
-static inline struct sk_buff *
-osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt)
-{
-        struct sk_buff *nskb;
-
-        if (osh->pkttag)
-                bzero(((struct sk_buff *)pkt)->cb, OSL_PKTTAG_SZ);
-
-        for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)
-                osh->pktalloced--;
-
-        return (struct sk_buff *)pkt;
-}
-#define PKTTONATIVE(osh, pkt)   \
-        osl_pkt_tonative((osl_pubinfo_t *)(osh), (pkt))
-#else /* !BRCM_FULLMAC */
-#define PKTUNALLOC(osh)                 (((osl_pubinfo_t *)(osh))->pktalloced--)
-
-#define PKTSETSKIPCT(osh, skb)
-#define PKTCLRSKIPCT(osh, skb)
-#define PKTSKIPCT(osh, skb)
-#endif  /* BRCM_FULLMAC */
-
-#define PKTLINK(skb)                    (((struct sk_buff *)(skb))->prev)
-#define PKTSETLINK(skb, x)              (((struct sk_buff *)(skb))->prev = (struct sk_buff*)(x))
-#define PKTPRIO(skb)                    (((struct sk_buff *)(skb))->priority)
-#define PKTSETPRIO(skb, x)              (((struct sk_buff *)(skb))->priority = (x))
-#define PKTSUMNEEDED(skb)               (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)
-#define PKTSETSUMGOOD(skb, x)           (((struct sk_buff *)(skb))->ip_summed = \
-                                                ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
-/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because skb->ip_summed is overloaded */
-#define PKTSHARED(skb)                  (((struct sk_buff *)(skb))->cloned)
-
-#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
-#define RPC_READ_REG(osh, r) (\
-        sizeof(*(r)) == sizeof(u8) ? osl_readb((osh), (volatile u8*)(r)) : \
-        sizeof(*(r)) == sizeof(u16) ? osl_readw((osh), (volatile u16*)(r)) : \
-        osl_readl((osh), (volatile u32*)(r)) \
-)
-#define RPC_WRITE_REG(osh, r, v) do { \
-        switch (sizeof(*(r))) { \
-        case sizeof(u8): \
-                osl_writeb((osh), (volatile u8*)(r), (u8)(v)); \
-                break; \
-        case sizeof(u16): \
-                osl_writew((osh), (volatile u16*)(r), (u16)(v)); \
-                break; \
-        case sizeof(u32): \
-                osl_writel((osh), (volatile u32*)(r), (u32)(v)); \
-                break; \
-        } \
-} while (0)
-
-extern u8 osl_readb(osl_t *osh, volatile u8 *r);
-extern u16 osl_readw(osl_t *osh, volatile u16 *r);
-extern u32 osl_readl(osl_t *osh, volatile u32 *r);
-extern void osl_writeb(osl_t *osh, volatile u8 *r, u8 v);
-extern void osl_writew(osl_t *osh, volatile u16 *r, u16 v);
-extern void osl_writel(osl_t *osh, volatile u32 *r, u32 v);
-#endif                          /* BCMSDIO */
-
-#endif                          /* _linux_osl_h_ */
diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h
deleted file mode 100644
index dc721413ee29..000000000000
--- a/drivers/staging/brcm80211/include/linuxver.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _linuxver_h_
-#define _linuxver_h_
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-#include <linux/ieee80211.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-
-#undef IP_TOS
-#include <asm/io.h>
-
-#endif                          /* _linuxver_h_ */
diff --git a/drivers/staging/brcm80211/include/nicpci.h b/drivers/staging/brcm80211/include/nicpci.h
index ce146e88ffdf..928818daedd7 100644
--- a/drivers/staging/brcm80211/include/nicpci.h
+++ b/drivers/staging/brcm80211/include/nicpci.h
@@ -45,17 +45,17 @@
 #else
 struct sbpcieregs;
 
-extern u8 pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id,
+extern u8 pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id,
                                          unsigned char *buf, u32 *buflen);
-extern uint pcie_readreg(osl_t *osh, struct sbpcieregs *pcieregs,
+extern uint pcie_readreg(struct osl_info *osh, struct sbpcieregs *pcieregs,
                          uint addrtype, uint offset);
-extern uint pcie_writereg(osl_t *osh, struct sbpcieregs *pcieregs,
+extern uint pcie_writereg(struct osl_info *osh, struct sbpcieregs *pcieregs,
                           uint addrtype, uint offset, uint val);
 
 extern u8 pcie_clkreq(void *pch, u32 mask, u32 val);
 extern u32 pcie_lcreg(void *pch, u32 mask, u32 val);
 
-extern void *pcicore_init(si_t *sih, osl_t *osh, void *regs);
+extern void *pcicore_init(si_t *sih, struct osl_info *osh, void *regs);
 extern void pcicore_deinit(void *pch);
 extern void pcicore_attach(void *pch, char *pvars, int state);
 extern void pcicore_hwup(void *pch);
@@ -70,10 +70,10 @@ extern u32 pcicore_pcieserdesreg(void *pch, u32 mdioslave, u32 offset,
 extern u32 pcicore_pciereg(void *pch, u32 offset, u32 mask,
                               u32 val, uint type);
 
-extern bool pcicore_pmecap_fast(osl_t *osh);
+extern bool pcicore_pmecap_fast(struct osl_info *osh);
 extern void pcicore_pmeen(void *pch);
 extern void pcicore_pmeclr(void *pch);
 extern bool pcicore_pmestat(void *pch);
-#endif                          /* defined(BCMSDIO) || (defined(BCMBUSTYPE) && (BCMBUSTYPE == SI_BUS)) */
+#endif /* defined(BCMSDIO)||(defined(BCMBUSTYPE) && (BCMBUSTYPE==SI_BUS)) */
 
 #endif                          /* _NICPCI_H */
diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index c0ebb3d97220..b28235618d8b 100644
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -18,42 +18,197 @@
 #define _osl_h_
 
 /* osl handle type forward declaration */
-typedef struct osl_info osl_t;
+struct osl_info {
+        uint pktalloced;        /* Number of allocated packet buffers */
+        bool mmbus;             /* Bus supports memory-mapped registers */
+        uint magic;
+        void *pdev;
+        uint bustype;
+};
+
 typedef struct osl_dmainfo osldma_t;
 
-#define OSL_PKTTAG_SZ   32      /* Size of PktTag */
 
-/* Drivers use PKTFREESETCB to register a callback function when a packet is freed by OSL */
-typedef void (*pktfree_cb_fn_t) (void *ctx, void *pkt, unsigned int status);
+extern struct osl_info *osl_attach(void *pdev, uint bustype);
+extern void osl_detach(struct osl_info *osh);
 
-#ifdef BCMSDIO
-/* Drivers use REGOPSSET() to register register read/write funcitons */
-typedef unsigned int (*osl_rreg_fn_t) (void *ctx, void *reg, unsigned int size);
-typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val,
-                               unsigned int size);
-#endif
+extern u32 g_assert_type;
 
-#include <linux_osl.h>
+#if defined(BCMDBG_ASSERT)
+#define ASSERT(exp) \
+          do { if (!(exp)) osl_assert(#exp, __FILE__, __LINE__); } while (0)
+extern void osl_assert(char *exp, char *file, int line);
+#else
+#define ASSERT(exp)     do {} while (0)
+#endif  /* defined(BCMDBG_ASSERT) */
 
-/* --------------------------------------------------------------------------
-** Register manipulation macros.
-*/
+/* PCI device bus # and slot # */
+#define OSL_PCI_BUS(osh)        osl_pci_bus(osh)
+#define OSL_PCI_SLOT(osh)       osl_pci_slot(osh)
+extern uint osl_pci_bus(struct osl_info *osh);
+extern uint osl_pci_slot(struct osl_info *osh);
 
-#define SET_REG(osh, r, mask, val)      W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
+#define BUS_SWAP32(v)           (v)
 
-#ifndef AND_REG
-#define AND_REG(osh, r, v)              W_REG(osh, (r), R_REG(osh, r) & (v))
-#endif                          /* !AND_REG */
+extern void *osl_dma_alloc_consistent(struct osl_info *osh, uint size,
+                                      u16 align, uint *tot, unsigned long *pap);
+
+#ifdef BRCM_FULLMAC
+#define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
+        osl_dma_alloc_consistent((osh), (size), (0), (tot), (pap))
+#else
+#define DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \
+        osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap))
+#endif /* BRCM_FULLMAC */
 
-#ifndef OR_REG
-#define OR_REG(osh, r, v)               W_REG(osh, (r), R_REG(osh, r) | (v))
-#endif                          /* !OR_REG */
+#define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
+        osl_dma_free_consistent((osh), (void *)(va), (size), (pa))
+extern void osl_dma_free_consistent(struct osl_info *osh, void *va,
+                                    uint size, unsigned long pa);
+
+/* map/unmap direction */
+#define DMA_TX  1               /* TX direction for DMA */
+#define DMA_RX  2               /* RX direction for DMA */
+
+/* map/unmap shared (dma-able) memory */
+#define DMA_MAP(osh, va, size, direction, p, dmah) \
+        osl_dma_map((osh), (va), (size), (direction))
+#define DMA_UNMAP(osh, pa, size, direction, p, dmah) \
+        osl_dma_unmap((osh), (pa), (size), (direction))
+extern uint osl_dma_map(struct osl_info *osh, void *va, uint size,
+                        int direction);
+extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
+                          int direction);
+
+/* register access macros */
+#if defined(BCMSDIO)
+#ifdef BRCM_FULLMAC
+#include <bcmsdh.h>
+#endif
+#define OSL_WRITE_REG(osh, r, v) \
+                (bcmsdh_reg_write(NULL, (unsigned long)(r), sizeof(*(r)), (v)))
+#define OSL_READ_REG(osh, r) \
+                (bcmsdh_reg_read(NULL, (unsigned long)(r), sizeof(*(r))))
+#endif
 
-#if !defined(OSL_SYSUPTIME)
-#define OSL_SYSUPTIME() (0)
-#define OSL_SYSUPTIME_SUPPORT false
+#if defined(BCMSDIO)
+#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) \
+        if ((osh)->mmbus) \
+                mmap_op else bus_op
+#define SELECT_BUS_READ(osh, mmap_op, bus_op) \
+        ((osh)->mmbus) ?  mmap_op : bus_op
 #else
-#define OSL_SYSUPTIME_SUPPORT true
-#endif                          /* OSL_SYSUPTIME */
+#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) mmap_op
+#define SELECT_BUS_READ(osh, mmap_op, bus_op) mmap_op
+#endif
+
+/* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */
+#define PKTBUFSZ        2048
+
+#define OSL_SYSUPTIME()         ((u32)jiffies * (1000 / HZ))
+#define printf(fmt, args...)    printk(fmt , ## args)
+#ifdef BRCM_FULLMAC
+#include <linux/kernel.h>       /* for vsn/printf's */
+#include <linux/string.h>       /* for mem*, str* */
+#endif
+/* bcopy's: Linux kernel doesn't provide these (anymore) */
+#define bcopy(src, dst, len)    memcpy((dst), (src), (len))
+
+/* register access macros */
+#ifndef IL_BIGENDIAN
+#ifndef __mips__
+#define R_REG(osh, r) (\
+        SELECT_BUS_READ(osh, sizeof(*(r)) == sizeof(u8) ? \
+        readb((volatile u8*)(r)) : \
+        sizeof(*(r)) == sizeof(u16) ? readw((volatile u16*)(r)) : \
+        readl((volatile u32*)(r)), OSL_READ_REG(osh, r)) \
+)
+#else                           /* __mips__ */
+#define R_REG(osh, r) (\
+        SELECT_BUS_READ(osh, \
+                ({ \
+                        __typeof(*(r)) __osl_v; \
+                        __asm__ __volatile__("sync"); \
+                        switch (sizeof(*(r))) { \
+                        case sizeof(u8): \
+                                __osl_v = readb((volatile u8*)(r)); \
+                                break; \
+                        case sizeof(u16): \
+                                __osl_v = readw((volatile u16*)(r)); \
+                                break; \
+                        case sizeof(u32): \
+                                __osl_v = \
+                                readl((volatile u32*)(r)); \
+                                break; \
+                        } \
+                        __asm__ __volatile__("sync"); \
+                        __osl_v; \
+                }), \
+                ({ \
+                        __typeof(*(r)) __osl_v; \
+                        __asm__ __volatile__("sync"); \
+                        __osl_v = OSL_READ_REG(osh, r); \
+                        __asm__ __volatile__("sync"); \
+                        __osl_v; \
+                })) \
+)
+#endif                          /* __mips__ */
+
+#define W_REG(osh, r, v) do { \
+        SELECT_BUS_WRITE(osh,  \
+                switch (sizeof(*(r))) { \
+                case sizeof(u8): \
+                        writeb((u8)(v), (volatile u8*)(r)); break; \
+                case sizeof(u16): \
+                        writew((u16)(v), (volatile u16*)(r)); break; \
+                case sizeof(u32): \
+                        writel((u32)(v), (volatile u32*)(r)); break; \
+                }, \
+                (OSL_WRITE_REG(osh, r, v))); \
+        } while (0)
+#else                           /* IL_BIGENDIAN */
+#define R_REG(osh, r) (\
+        SELECT_BUS_READ(osh, \
+                ({ \
+                        __typeof(*(r)) __osl_v; \
+                        switch (sizeof(*(r))) { \
+                        case sizeof(u8): \
+                                __osl_v = \
+                                readb((volatile u8*)((r)^3)); \
+                                break; \
+                        case sizeof(u16): \
+                                __osl_v = \
+                                readw((volatile u16*)((r)^2)); \
+                                break; \
+                        case sizeof(u32): \
+                                __osl_v = readl((volatile u32*)(r)); \
+                                break; \
+                        } \
+                        __osl_v; \
+                }), \
+                OSL_READ_REG(osh, r)) \
+)
+#define W_REG(osh, r, v) do { \
+        SELECT_BUS_WRITE(osh,  \
+                switch (sizeof(*(r))) { \
+                case sizeof(u8):        \
+                        writeb((u8)(v), \
+                        (volatile u8*)((r)^3)); break; \
+                case sizeof(u16):       \
+                        writew((u16)(v), \
+                        (volatile u16*)((r)^2)); break; \
+                case sizeof(u32):       \
+                        writel((u32)(v), \
+                        (volatile u32*)(r)); break; \
+                }, \
+                (OSL_WRITE_REG(osh, r, v))); \
+        } while (0)
+#endif                          /* IL_BIGENDIAN */
+
+#define bcopy(src, dst, len)    memcpy((dst), (src), (len))
+
+/* packet primitives */
+extern struct sk_buff *pkt_buf_get_skb(struct osl_info *osh, uint len);
+extern void pkt_buf_free_skb(struct osl_info *osh, struct sk_buff *skb, bool send);
 
-#endif                          /* _osl_h_ */
+#endif /* _osl_h_ */
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index cc17b428dd3f..567407de020e 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -17,28 +17,22 @@
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
 
+#include <linux/if_ether.h>
+
 #include <packed_section_start.h>
 
-#define ETHER_ADDR_LEN          6
 #define ETHER_TYPE_LEN          2
 #define ETHER_CRC_LEN           4
-#define ETHER_HDR_LEN           (ETHER_ADDR_LEN * 2 + ETHER_TYPE_LEN)
 #define ETHER_MIN_LEN           64
 #define ETHER_MIN_DATA          46
 #define ETHER_MAX_LEN           1518
 #define ETHER_MAX_DATA          1500
 
-#define ETHER_TYPE_MIN          0x0600
-#define ETHER_TYPE_IP           0x0800
-#define ETHER_TYPE_ARP          0x0806
-#define ETHER_TYPE_8021Q        0x8100
 #define ETHER_TYPE_BRCM         0x886c
-#define ETHER_TYPE_802_1X       0x888e
-#define ETHER_TYPE_802_1X_PREAUTH 0x88c7
 
-#define ETHER_DEST_OFFSET       (0 * ETHER_ADDR_LEN)
-#define ETHER_SRC_OFFSET        (1 * ETHER_ADDR_LEN)
-#define ETHER_TYPE_OFFSET       (2 * ETHER_ADDR_LEN)
+#define ETHER_DEST_OFFSET       (0 * ETH_ALEN)
+#define ETHER_SRC_OFFSET        (1 * ETH_ALEN)
+#define ETHER_TYPE_OFFSET       (2 * ETH_ALEN)
 
 #define ETHER_IS_VALID_LEN(foo) \
         ((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
@@ -53,50 +47,18 @@
 }
 
 BWL_PRE_PACKED_STRUCT struct ether_header {
-        u8 ether_dhost[ETHER_ADDR_LEN];
-        u8 ether_shost[ETHER_ADDR_LEN];
+        u8 ether_dhost[ETH_ALEN];
+        u8 ether_shost[ETH_ALEN];
         u16 ether_type;
 } BWL_POST_PACKED_STRUCT;
 
 BWL_PRE_PACKED_STRUCT struct ether_addr {
-        u8 octet[ETHER_ADDR_LEN];
+        u8 octet[ETH_ALEN];
 } BWL_POST_PACKED_STRUCT;
 
-#define ETHER_SET_LOCALADDR(ea) (((u8 *)(ea))[0] = (((u8 *)(ea))[0] | 2))
-#define ETHER_IS_LOCALADDR(ea)  (((u8 *)(ea))[0] & 2)
-#define ETHER_CLR_LOCALADDR(ea) (((u8 *)(ea))[0] = \
-        (((u8 *)(ea))[0] & 0xd))
-#define ETHER_TOGGLE_LOCALADDR(ea)      (((u8 *)(ea))[0] = \
-        (((u8 *)(ea))[0] ^ 2))
-
 #define ETHER_SET_UNICAST(ea)   (((u8 *)(ea))[0] = (((u8 *)(ea))[0] & ~1))
 
-#define ETHER_ISMULTI(ea) (((const u8 *)(ea))[0] & 1)
-
-#define ether_cmp(a, b) (!(((short *)a)[0] == ((short *)b)[0]) | \
-                         !(((short *)a)[1] == ((short *)b)[1]) | \
-                         !(((short *)a)[2] == ((short *)b)[2]))
-
-#define ether_copy(s, d) { \
-                ((short *)d)[0] = ((short *)s)[0]; \
-                ((short *)d)[1] = ((short *)s)[1]; \
-                ((short *)d)[2] = ((short *)s)[2]; }
-
 static const struct ether_addr ether_bcast = { {255, 255, 255, 255, 255, 255} };
-static const struct ether_addr ether_null = { {0, 0, 0, 0, 0, 0} };
-
-#define ETHER_ISBCAST(ea)       ((((u8 *)(ea))[0] &             \
-        ((u8 *)(ea))[1] &               \
-        ((u8 *)(ea))[2] &               \
-        ((u8 *)(ea))[3] &               \
-        ((u8 *)(ea))[4] &               \
-        ((u8 *)(ea))[5]) == 0xff)
-#define ETHER_ISNULLADDR(ea)    ((((u8 *)(ea))[0] |             \
-        ((u8 *)(ea))[1] |               \
-        ((u8 *)(ea))[2] |               \
-        ((u8 *)(ea))[3] |               \
-        ((u8 *)(ea))[4] |               \
-        ((u8 *)(ea))[5]) == 0)
 
 #define ETHER_MOVE_HDR(d, s) \
 do { \
diff --git a/drivers/staging/brcm80211/include/proto/wpa.h b/drivers/staging/brcm80211/include/proto/wpa.h
index ec84c9f2b5ee..10c2fb62df09 100644
--- a/drivers/staging/brcm80211/include/proto/wpa.h
+++ b/drivers/staging/brcm80211/include/proto/wpa.h
@@ -19,95 +19,7 @@
 
 #include <proto/ethernet.h>
 
-#include <packed_section_start.h>
-
-#define DOT11_RC_INVALID_WPA_IE         13
-#define DOT11_RC_MIC_FAILURE            14
-#define DOT11_RC_4WH_TIMEOUT            15
-#define DOT11_RC_GTK_UPDATE_TIMEOUT     16
-#define DOT11_RC_WPA_IE_MISMATCH        17
-#define DOT11_RC_INVALID_MC_CIPHER      18
-#define DOT11_RC_INVALID_UC_CIPHER      19
-#define DOT11_RC_INVALID_AKMP           20
-#define DOT11_RC_BAD_WPA_VERSION        21
-#define DOT11_RC_INVALID_WPA_CAP        22
-#define DOT11_RC_8021X_AUTH_FAIL        23
-
 #define WPA2_PMKID_LEN  16
-
-typedef BWL_PRE_PACKED_STRUCT struct {
-        u8 tag;
-        u8 length;
-        u8 oui[3];
-        u8 oui_type;
-        BWL_PRE_PACKED_STRUCT struct {
-                u8 low;
-                u8 high;
-        } BWL_POST_PACKED_STRUCT version;
-} BWL_POST_PACKED_STRUCT wpa_ie_fixed_t;
-#define WPA_IE_OUITYPE_LEN      4
-#define WPA_IE_FIXED_LEN        8
-#define WPA_IE_TAG_FIXED_LEN    6
-
-typedef BWL_PRE_PACKED_STRUCT struct {
-        u8 tag;
-        u8 length;
-        BWL_PRE_PACKED_STRUCT struct {
-                u8 low;
-                u8 high;
-        } BWL_POST_PACKED_STRUCT version;
-} BWL_POST_PACKED_STRUCT wpa_rsn_ie_fixed_t;
-#define WPA_RSN_IE_FIXED_LEN    4
-#define WPA_RSN_IE_TAG_FIXED_LEN        2
-typedef u8 wpa_pmkid_t[WPA2_PMKID_LEN];
-
-typedef BWL_PRE_PACKED_STRUCT struct {
-        u8 oui[3];
-        u8 type;
-} BWL_POST_PACKED_STRUCT wpa_suite_t, wpa_suite_mcast_t;
-#define WPA_SUITE_LEN   4
-
-typedef BWL_PRE_PACKED_STRUCT struct {
-        BWL_PRE_PACKED_STRUCT struct {
-                u8 low;
-                u8 high;
-        } BWL_POST_PACKED_STRUCT count;
-        wpa_suite_t list[1];
-} BWL_POST_PACKED_STRUCT wpa_suite_ucast_t, wpa_suite_auth_key_mgmt_t;
-#define WPA_IE_SUITE_COUNT_LEN  2
-typedef BWL_PRE_PACKED_STRUCT struct {
-        BWL_PRE_PACKED_STRUCT struct {
-                u8 low;
-                u8 high;
-        } BWL_POST_PACKED_STRUCT count;
-        wpa_pmkid_t list[1];
-} BWL_POST_PACKED_STRUCT wpa_pmkid_list_t;
-
-#define WPA_CIPHER_NONE         0
-#define WPA_CIPHER_WEP_40       1
-#define WPA_CIPHER_TKIP         2
-#define WPA_CIPHER_AES_OCB      3
-#define WPA_CIPHER_AES_CCM      4
-#define WPA_CIPHER_WEP_104      5
-
-#define IS_WPA_CIPHER(cipher)   ((cipher) == WPA_CIPHER_NONE || \
-                                 (cipher) == WPA_CIPHER_WEP_40 || \
-                                 (cipher) == WPA_CIPHER_WEP_104 || \
-                                 (cipher) == WPA_CIPHER_TKIP || \
-                                 (cipher) == WPA_CIPHER_AES_OCB || \
-                                 (cipher) == WPA_CIPHER_AES_CCM)
-
-#define WPA_TKIP_CM_DETECT      60
-#define WPA_TKIP_CM_BLOCK       60
-
-#define RSN_CAP_LEN             2
-
-#define RSN_CAP_PREAUTH                 0x0001
-#define RSN_CAP_NOPAIRWISE              0x0002
-#define RSN_CAP_PTK_REPLAY_CNTR_MASK    0x000C
-#define RSN_CAP_PTK_REPLAY_CNTR_SHIFT   2
-#define RSN_CAP_GTK_REPLAY_CNTR_MASK    0x0030
-#define RSN_CAP_GTK_REPLAY_CNTR_SHIFT   4
 #define RSN_CAP_1_REPLAY_CNTR           0
 #define RSN_CAP_2_REPLAY_CNTRS          1
 #define RSN_CAP_4_REPLAY_CNTRS          2
@@ -118,10 +30,4 @@ typedef BWL_PRE_PACKED_STRUCT struct {
 #define WPA_CAP_REPLAY_CNTR_SHIFT       RSN_CAP_PTK_REPLAY_CNTR_SHIFT
 #define WPA_CAP_REPLAY_CNTR_MASK        RSN_CAP_PTK_REPLAY_CNTR_MASK
 
-#define WPA_CAP_LEN     RSN_CAP_LEN
-
-#define WPA_CAP_WPA2_PREAUTH            RSN_CAP_PREAUTH
-
-#include <packed_section_end.h>
-
 #endif                          /* _proto_wpa_h_ */
diff --git a/drivers/staging/brcm80211/include/rpc_osl.h b/drivers/staging/brcm80211/include/rpc_osl.h
index 4a2648001bf0..c59d9ed1397a 100644
--- a/drivers/staging/brcm80211/include/rpc_osl.h
+++ b/drivers/staging/brcm80211/include/rpc_osl.h
@@ -18,7 +18,7 @@
 #define _rpcosl_h_
 
 typedef struct rpc_osl rpc_osl_t;
-extern rpc_osl_t *rpc_osl_attach(osl_t *osh);
+extern rpc_osl_t *rpc_osl_attach(struct osl_info *osh);
 extern void rpc_osl_detach(rpc_osl_t *rpc_osh);
 
 #define RPC_OSL_LOCK(rpc_osh) rpc_osl_lock((rpc_osh))
diff --git a/drivers/staging/brcm80211/include/siutils.h b/drivers/staging/brcm80211/include/siutils.h
index 57c36507a040..a935092d02df 100644
--- a/drivers/staging/brcm80211/include/siutils.h
+++ b/drivers/staging/brcm80211/include/siutils.h
@@ -19,9 +19,6 @@
 
 #include <hndsoc.h>
 
-#if !defined(WLC_LOW)
-#include "bcm_rpc.h"
-#endif
 /*
  * Data structure to export all chip specific common variables
  *   public (read-only) portion of siutils handle returned by si_attach()
@@ -50,19 +47,12 @@ struct si_pub {
         uint socirev;           /* SOC interconnect rev */
         bool pci_pr32414;
 
-#if !defined(WLC_LOW)
-        rpc_info_t *rpc;
-#endif
 };
 
 /* for HIGH_ONLY driver, the si_t must be writable to allow states sync from BMAC to HIGH driver
  * for monolithic driver, it is readonly to prevent accident change
  */
-#if !defined(WLC_LOW)
-typedef struct si_pub si_t;
-#else
 typedef const struct si_pub si_t;
-#endif
 
 /*
  * Many of the routines below take an 'sih' handle as their first arg.
@@ -128,8 +118,8 @@ typedef void (*gpio_handler_t) (u32 stat, void *arg);
 #define GPIO_CTRL_EPA_EN_MASK 0x40
 
 /* === exported functions === */
-extern si_t *si_attach(uint pcidev, osl_t *osh, void *regs, uint bustype,
-                       void *sdh, char **vars, uint *varsz);
+extern si_t *si_attach(uint pcidev, struct osl_info *osh, void *regs,
+                       uint bustype, void *sdh, char **vars, uint *varsz);
 
 extern void si_detach(si_t *sih);
 extern bool si_pci_war16165(si_t *sih);
@@ -138,7 +128,7 @@ extern uint si_coreid(si_t *sih);
 extern uint si_flag(si_t *sih);
 extern uint si_coreidx(si_t *sih);
 extern uint si_corerev(si_t *sih);
-extern void *si_osh(si_t *sih);
+struct osl_info *si_osh(si_t *sih);
 extern uint si_corereg(si_t *sih, uint coreidx, uint regoff, uint mask,
                 uint val);
 extern void si_write_wrapperreg(si_t *sih, u32 offset, u32 val);
@@ -227,7 +217,7 @@ typedef struct gpioh_item {
 /* misc si info needed by some of the routines */
 typedef struct si_info {
         struct si_pub pub;      /* back plane public state (must be first field) */
-        void *osh;              /* osl os handle */
+        struct osl_info *osh;           /* osl os handle */
         void *sdh;              /* bcmsdh handle */
         uint dev_coreid;        /* the core provides driver functions */
         void *intr_arg;         /* interrupt callback function arg */
@@ -305,9 +295,9 @@ typedef struct si_info {
 #define ILP_DIV_5MHZ            0       /* ILP = 5 MHz */
 #define ILP_DIV_1MHZ            4       /* ILP = 1 MHz */
 
-#define PCI(si)         ((BUSTYPE((si)->pub.bustype) == PCI_BUS) &&     \
+#define PCI(si)         (((si)->pub.bustype == PCI_BUS) &&      \
                          ((si)->pub.buscoretype == PCI_CORE_ID))
-#define PCIE(si)        ((BUSTYPE((si)->pub.bustype) == PCI_BUS) &&     \
+#define PCIE(si)        (((si)->pub.bustype == PCI_BUS) &&      \
                          ((si)->pub.buscoretype == PCIE_CORE_ID))
 #define PCI_FORCEHT(si) \
         (PCIE(si) && (si->pub.chip == BCM4716_CHIP_ID))
@@ -344,9 +334,9 @@ extern void si_epa_4313war(si_t *sih);
 char *si_getnvramflvar(si_t *sih, const char *name);
 
 /* AMBA Interconnect exported externs */
-extern si_t *ai_attach(uint pcidev, osl_t *osh, void *regs, uint bustype,
-                       void *sdh, char **vars, uint *varsz);
-extern si_t *ai_kattach(osl_t *osh);
+extern si_t *ai_attach(uint pcidev, struct osl_info *osh, void *regs,
+                       uint bustype, void *sdh, char **vars, uint *varsz);
+extern si_t *ai_kattach(struct osl_info *osh);
 extern void ai_scan(si_t *sih, void *regs, uint devid);
 
 extern uint ai_flag(si_t *sih);
diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
index 96866fb8898c..9be793c5f10c 100644
--- a/drivers/staging/brcm80211/include/wlioctl.h
+++ b/drivers/staging/brcm80211/include/wlioctl.h
@@ -33,82 +33,9 @@
 #define BWL_DEFAULT_PACKING
 #include <packed_section_start.h>
 
-/* Legacy structure to help keep backward compatible wl tool and tray app */
-
-#define LEGACY_WL_BSS_INFO_VERSION      107     /* older version of wl_bss_info struct */
-
-typedef struct wl_bss_info_107 {
-        u32 version;            /* version field */
-        u32 length;             /* byte length of data in this record,
-                                 * starting at version and including IEs
-                                 */
-        struct ether_addr BSSID;
-        u16 beacon_period;      /* units are Kusec */
-        u16 capability; /* Capability information */
-        u8 SSID_len;
-        u8 SSID[32];
-        struct {
-                uint count;     /* # rates in this set */
-                u8 rates[16];   /* rates in 500kbps units w/hi bit set if basic */
-        } rateset;              /* supported rates */
-        u8 channel;             /* Channel no. */
-        u16 atim_window;        /* units are Kusec */
-        u8 dtim_period; /* DTIM period */
-        s16 RSSI;               /* receive signal strength (in dBm) */
-        s8 phy_noise;           /* noise (in dBm) */
-        u32 ie_length;  /* byte length of Information Elements */
-        /* variable length Information Elements */
-} wl_bss_info_107_t;
-
-/*
- * Per-BSS information structure.
- */
-
-#define LEGACY2_WL_BSS_INFO_VERSION     108     /* old version of wl_bss_info struct */
-
-/* BSS info structure
- * Applications MUST CHECK ie_offset field and length field to access IEs and
- * next bss_info structure in a vector (in wl_scan_results_t)
- */
-typedef struct wl_bss_info_108 {
-        u32 version;            /* version field */
-        u32 length;             /* byte length of data in this record,
-                                 * starting at version and including IEs
-                                 */
-        struct ether_addr BSSID;
-        u16 beacon_period;      /* units are Kusec */
-        u16 capability; /* Capability information */
-        u8 SSID_len;
-        u8 SSID[32];
-        struct {
-                uint count;     /* # rates in this set */
-                u8 rates[16];   /* rates in 500kbps units w/hi bit set if basic */
-        } rateset;              /* supported rates */
-        chanspec_t chanspec;    /* chanspec for bss */
-        u16 atim_window;        /* units are Kusec */
-        u8 dtim_period; /* DTIM period */
-        s16 RSSI;               /* receive signal strength (in dBm) */
-        s8 phy_noise;           /* noise (in dBm) */
-
-        u8 n_cap;               /* BSS is 802.11N Capable */
-        u32 nbss_cap;   /* 802.11N BSS Capabilities (based on HT_CAP_*) */
-        u8 ctl_ch;              /* 802.11N BSS control channel number */
-        u32 reserved32[1];      /* Reserved for expansion of BSS properties */
-        u8 flags;               /* flags */
-        u8 reserved[3]; /* Reserved for expansion of BSS properties */
-        u8 basic_mcs[MCSSET_LEN];       /* 802.11N BSS required MCS set */
-
-        u16 ie_offset;  /* offset at which IEs start, from beginning */
-        u32 ie_length;  /* byte length of Information Elements */
-        /* Add new fields here */
-        /* variable length Information Elements */
-} wl_bss_info_108_t;
-
 #ifdef BRCM_FULLMAC
+
 #define WL_BSS_INFO_VERSION     108     /* current ver of wl_bss_info struct */
-#else
-#define WL_BSS_INFO_VERSION     109     /* current ver of wl_bss_info struct */
-#endif
 
 /* BSS info structure
  * Applications MUST CHECK ie_offset field and length field to access IEs and
@@ -148,12 +75,14 @@ typedef struct wl_bss_info {
         /* Add new fields here */
         /* variable length Information Elements */
 } wl_bss_info_t;
+#endif /* BRCM_FULLMAC */
 
 typedef struct wlc_ssid {
         u32 SSID_len;
         unsigned char SSID[32];
 } wlc_ssid_t;
 
+#ifdef BRCM_FULLMAC
 typedef struct chan_scandata {
         u8 txpower;
         u8 pad;
@@ -308,6 +237,7 @@ typedef struct wl_probe_params {
         struct ether_addr bssid;
         struct ether_addr mac;
 } wl_probe_params_t;
+#endif /* BRCM_FULLMAC */
 
 #define WL_NUMRATES             16      /* max # of rates in a rateset */
 typedef struct wl_rateset {
@@ -315,6 +245,7 @@ typedef struct wl_rateset {
         u8 rates[WL_NUMRATES];  /* rates in 500kbps units w/hi bit set if basic */
 } wl_rateset_t;
 
+#ifdef BRCM_FULLMAC
 typedef struct wl_rateset_args {
         u32 count;              /* # rates in this set */
         u8 rates[WL_NUMRATES];  /* rates in 500kbps units w/hi bit set if basic */
@@ -352,6 +283,8 @@ typedef struct wl_join_params {
 } wl_join_params_t;
 #define WL_JOIN_PARAMS_FIXED_SIZE       (sizeof(wl_join_params_t) - sizeof(chanspec_t))
 
+#endif /* BRCM_FULLMAC */
+
 /* defines used by the nrate iovar */
 #define NRATE_MCS_INUSE 0x00000080      /* MSC in use,indicates b0-6 holds an mcs */
 #define NRATE_RATE_MASK 0x0000007f      /* rate/mcs value */
@@ -391,6 +324,7 @@ typedef struct {
 
 #define HIGHEST_SINGLE_STREAM_MCS       7       /* MCS values greater than this enable multiple streams */
 
+#ifdef BRCM_FULLMAC
 #define MAX_CCA_CHANNELS 38     /* Max number of 20 Mhz wide channels */
 #define MAX_CCA_SECS     60     /* CCA keeps this many seconds history */
 
@@ -428,8 +362,11 @@ typedef struct {
         cca_congest_t secs[1];  /* Data */
 } cca_congest_channel_req_t;
 
+#endif /* BRCM_FULLMAC */
+
 #define WLC_CNTRY_BUF_SZ        4       /* Country string is 3 bytes + NUL */
 
+#ifdef BRCM_FULLMAC
 typedef struct wl_country {
         char country_abbrev[WLC_CNTRY_BUF_SZ];  /* nul-terminated country code used in
                                                  * the Country IE
@@ -516,6 +453,7 @@ typedef struct wl_rm_rep {
         wl_rm_rep_elt_t rep[1]; /* variable length block of reports */
 } wl_rm_rep_t;
 #define WL_RM_REP_FIXED_LEN     8
+#endif /* BRCM_FULLMAC */
 
 /* Enumerate crypto algorithms */
 #define CRYPTO_ALGO_OFF                 0
@@ -621,28 +559,6 @@ typedef struct wl_led_info {
         u8 activehi;
 } wl_led_info_t;
 
-/* flags */
-#define WLC_ASSOC_REQ_IS_REASSOC 0x01   /* assoc req was actually a reassoc */
-
-/* srom read/write struct passed through ioctl */
-typedef struct {
-        uint byteoff;           /* byte offset */
-        uint nbytes;            /* number of bytes */
-        u16 buf[1];
-} srom_rw_t;
-
-/* similar cis (srom or otp) struct [iovar: may not be aligned] */
-typedef struct {
-        u32 source;             /* cis source */
-        u32 byteoff;            /* byte offset */
-        u32 nbytes;             /* number of bytes */
-        /* data follows here */
-} cis_rw_t;
-
-#define WLC_CIS_DEFAULT 0       /* built-in default */
-#define WLC_CIS_SROM    1       /* source is sprom */
-#define WLC_CIS_OTP     2       /* source is otp */
-
 /* R_REG and W_REG struct passed through ioctl */
 typedef struct {
         u32 byteoff;            /* byte offset of the field in d11regs_t */
@@ -651,102 +567,14 @@ typedef struct {
         uint band;              /* band (optional) */
 } rw_reg_t;
 
-/* Structure used by GET/SET_ATTEN ioctls - it controls power in b/g-band */
-/* PCL - Power Control Loop */
-/* current gain setting is replaced by user input */
-#define WL_ATTEN_APP_INPUT_PCL_OFF      0       /* turn off PCL, apply supplied input */
-#define WL_ATTEN_PCL_ON                 1       /* turn on PCL */
-/* current gain setting is maintained */
-#define WL_ATTEN_PCL_OFF                2       /* turn off PCL. */
-
-typedef struct {
-        u16 auto_ctrl;  /* WL_ATTEN_XX */
-        u16 bb;         /* Baseband attenuation */
-        u16 radio;              /* Radio attenuation */
-        u16 txctl1;             /* Radio TX_CTL1 value */
-} atten_t;
-
-/* Per-AC retry parameters */
-struct wme_tx_params_s {
-        u8 short_retry;
-        u8 short_fallback;
-        u8 long_retry;
-        u8 long_fallback;
-        u16 max_rate;   /* In units of 512 Kbps */
-};
-
-typedef struct wme_tx_params_s wme_tx_params_t;
-
-#define WL_WME_TX_PARAMS_IO_BYTES (sizeof(wme_tx_params_t) * AC_COUNT)
-
-/* defines used by poweridx iovar - it controls power in a-band */
-/* current gain setting is maintained */
-#define WL_PWRIDX_PCL_OFF       -2      /* turn off PCL.  */
-#define WL_PWRIDX_PCL_ON        -1      /* turn on PCL */
-#define WL_PWRIDX_LOWER_LIMIT   -2      /* lower limit */
-#define WL_PWRIDX_UPPER_LIMIT   63      /* upper limit */
-/* value >= 0 causes
- *      - input to be set to that value
- *      - PCL to be off
- */
-
-/* Used to get specific link/ac parameters */
-typedef struct {
-        int ac;
-        u8 val;
-        struct ether_addr ea;
-} link_val_t;
-
-#define BCM_MAC_STATUS_INDICATION       (0x40010200L)
-
-typedef struct {
-        u16 ver;                /* version of this struct */
-        u16 len;                /* length in bytes of this structure */
-        u16 cap;                /* sta's advertised capabilities */
-        u32 flags;              /* flags defined below */
-        u32 idle;               /* time since data pkt rx'd from sta */
-        struct ether_addr ea;   /* Station address */
-        wl_rateset_t rateset;   /* rateset in use */
-        u32 in;         /* seconds elapsed since associated */
-        u32 listen_interval_inms;       /* Min Listen interval in ms for this STA */
-        u32 tx_pkts;            /* # of packets transmitted */
-        u32 tx_failures;        /* # of packets failed */
-        u32 rx_ucast_pkts;      /* # of unicast packets received */
-        u32 rx_mcast_pkts;      /* # of multicast packets received */
-        u32 tx_rate;            /* Rate of last successful tx frame */
-        u32 rx_rate;            /* Rate of last successful rx frame */
-        u32 rx_decrypt_succeeds;        /* # of packet decrypted successfully */
-        u32 rx_decrypt_failures;        /* # of packet decrypted unsuccessfully */
-} sta_info_t;
-
-#define WL_OLD_STAINFO_SIZE     offsetof(sta_info_t, tx_pkts)
-
-#define WL_STA_VER              3
-
-/* Flags for sta_info_t indicating properties of STA */
-#define WL_STA_BRCM             0x1     /* Running a Broadcom driver */
-#define WL_STA_WME              0x2     /* WMM association */
-#define WL_STA_ABCAP            0x4
-#define WL_STA_AUTHE            0x8     /* Authenticated */
-#define WL_STA_ASSOC            0x10    /* Associated */
-#define WL_STA_AUTHO            0x20    /* Authorized */
-#define WL_STA_WDS              0x40    /* Wireless Distribution System */
-#define WL_STA_WDS_LINKUP       0x80    /* WDS traffic/probes flowing properly */
-#define WL_STA_PS               0x100   /* STA is in power save mode from AP's viewpoint */
-#define WL_STA_APSD_BE          0x200   /* APSD delv/trigger for AC_BE is default enabled */
-#define WL_STA_APSD_BK          0x400   /* APSD delv/trigger for AC_BK is default enabled */
-#define WL_STA_APSD_VI          0x800   /* APSD delv/trigger for AC_VI is default enabled */
-#define WL_STA_APSD_VO          0x1000  /* APSD delv/trigger for AC_VO is default enabled */
-#define WL_STA_N_CAP            0x2000  /* STA 802.11n capable */
-#define WL_STA_SCBSTATS         0x4000  /* Per STA debug stats */
-
-#define WL_WDS_LINKUP           WL_STA_WDS_LINKUP       /* deprecated */
 
+#ifdef BRCM_FULLMAC
 /* Used to get specific STA parameters */
 typedef struct {
         u32 val;
         struct ether_addr ea;
 } scb_val_t;
+#endif /* BRCM_FULLMAC */
 
 /* channel encoding */
 typedef struct channel_info {
@@ -770,6 +598,7 @@ typedef struct get_pktcnt {
         uint rx_ocast_good_pkt; /* unicast packets destined for others */
 } get_pktcnt_t;
 
+#ifdef BRCM_FULLMAC
 /* Linux network driver ioctl encoding */
 typedef struct wl_ioctl {
         uint cmd;               /* common ioctl definition */
@@ -779,11 +608,8 @@ typedef struct wl_ioctl {
         uint used;              /* bytes read or written (optional) */
         uint needed;            /* bytes needed (optional) */
 } wl_ioctl_t;
+#endif /* BRCM_FULLMAC */
 
-/* reference to wl_ioctl_t struct used by usermode driver */
-#define ioctl_subtype   set     /* subtype param */
-#define ioctl_pid       used    /* pid param */
-#define ioctl_status    needed  /* status param */
 
 /*
  * Structure for passing hardware and software
@@ -810,45 +636,11 @@ typedef struct wlc_rev_info {
 
 #define WL_REV_INFO_LEGACY_LENGTH       48
 
-#define WL_BRAND_MAX 10
-typedef struct wl_instance_info {
-        uint instance;
-        char brand[WL_BRAND_MAX];
-} wl_instance_info_t;
-
-/* structure to change size of tx fifo */
-typedef struct wl_txfifo_sz {
-        u16 magic;
-        u16 fifo;
-        u16 size;
-} wl_txfifo_sz_t;
-/* magic pattern used for mismatch driver and wl */
-#define WL_TXFIFO_SZ_MAGIC      0xa5a5
-
-/* Transfer info about an IOVar from the driver */
-/* Max supported IOV name size in bytes, + 1 for nul termination */
-#define WLC_IOV_NAME_LEN 30
-typedef struct wlc_iov_trx_s {
-        u8 module;
-        u8 type;
-        char name[WLC_IOV_NAME_LEN];
-} wlc_iov_trx_t;
-
-/* check this magic number */
-#define WLC_IOCTL_MAGIC         0x14e46c77
-
-#define PROC_ENTRY_NAME "brcm_debug"
-/* bump this number if you change the ioctl interface */
-#define WLC_IOCTL_VERSION       1
-
 #ifdef BRCM_FULLMAC
-#define WLC_IOCTL_MAXLEN        8192
-#else
-#define WLC_IOCTL_MAXLEN                3072    /* max length ioctl buffer required */
-#endif
 #define WLC_IOCTL_SMLEN                 256     /* "small" length ioctl buffer required */
 #define WLC_IOCTL_MEDLEN                1536    /* "med" length ioctl buffer required */
-#define WLC_SAMPLECOLLECT_MAXLEN        10240   /* Max Sample Collect buffer for two cores */
+#define WLC_IOCTL_MAXLEN        8192
+#endif
 
 /* common ioctl definitions */
 #define WLC_GET_MAGIC                           0
@@ -1399,23 +1191,6 @@ typedef struct {
 #define WL_TX_POWER_MCS40_FIRST         28
 #define WL_TX_POWER_MCS40_NUM           17
 
-typedef struct {
-        u32 flags;
-        chanspec_t chanspec;    /* txpwr report for this channel */
-        chanspec_t local_chanspec;      /* channel on which we are associated */
-        u8 local_max;   /* local max according to the AP */
-        u8 local_constraint;    /* local constraint according to the AP */
-        s8 antgain[2];  /* Ant gain for each band - from SROM */
-        u8 rf_cores;            /* count of RF Cores being reported */
-        u8 est_Pout[4]; /* Latest tx power out estimate per RF
-                                 * chain without adjustment
-                                 */
-        u8 est_Pout_cck;        /* Latest CCK tx power out estimate */
-        u8 user_limit[WL_TX_POWER_RATES_LEGACY];        /* User limit */
-        u8 reg_limit[WL_TX_POWER_RATES_LEGACY]; /* Regulatory power limit */
-        u8 board_limit[WL_TX_POWER_RATES_LEGACY];       /* Max power board can support (SROM) */
-        u8 target[WL_TX_POWER_RATES_LEGACY];    /* Latest target power */
-} tx_power_legacy2_t;
 
 #define WL_TX_POWER_RATES              101
 #define WL_TX_POWER_CCK_FIRST          0
@@ -1848,63 +1623,6 @@ struct ampdu_retry_tid {
         u8 retry;               /* retry value */
 };
 
-/* structure for addts arguments */
-/* For ioctls that take a list of TSPEC */
-struct tslist {
-        int count;              /* number of tspecs */
-        struct tsinfo_arg tsinfo[1];    /* variable length array of tsinfo */
-};
-
-/* structure for addts/delts arguments */
-typedef struct tspec_arg {
-        u16 version;            /* see definition of TSPEC_ARG_VERSION */
-        u16 length;             /* length of entire structure */
-        uint flag;              /* bit field */
-        /* TSPEC Arguments */
-        struct tsinfo_arg tsinfo;       /* TS Info bit field */
-        u16 nom_msdu_size;      /* (Nominal or fixed) MSDU Size (bytes) */
-        u16 max_msdu_size;      /* Maximum MSDU Size (bytes) */
-        uint min_srv_interval;  /* Minimum Service Interval (us) */
-        uint max_srv_interval;  /* Maximum Service Interval (us) */
-        uint inactivity_interval;       /* Inactivity Interval (us) */
-        uint suspension_interval;       /* Suspension Interval (us) */
-        uint srv_start_time;    /* Service Start Time (us) */
-        uint min_data_rate;     /* Minimum Data Rate (bps) */
-        uint mean_data_rate;    /* Mean Data Rate (bps) */
-        uint peak_data_rate;    /* Peak Data Rate (bps) */
-        uint max_burst_size;    /* Maximum Burst Size (bytes) */
-        uint delay_bound;       /* Delay Bound (us) */
-        uint min_phy_rate;      /* Minimum PHY Rate (bps) */
-        u16 surplus_bw; /* Surplus Bandwidth Allowance (range 1.0 to 8.0) */
-        u16 medium_time;        /* Medium Time (32 us/s periods) */
-        u8 dialog_token;        /* dialog token */
-} tspec_arg_t;
-
-/* tspec arg for desired station */
-typedef struct tspec_per_sta_arg {
-        struct ether_addr ea;
-        struct tspec_arg ts;
-} tspec_per_sta_arg_t;
-
-/* structure for max bandwidth for each access category */
-typedef struct wme_max_bandwidth {
-        u32 ac[AC_COUNT];       /* max bandwidth for each access category */
-} wme_max_bandwidth_t;
-
-#define WL_WME_MBW_PARAMS_IO_BYTES (sizeof(wme_max_bandwidth_t))
-
-/* current version of wl_tspec_arg_t struct */
-#define TSPEC_ARG_VERSION               2       /* current version of wl_tspec_arg_t struct */
-#define TSPEC_ARG_LENGTH                55      /* argument length from tsinfo to medium_time */
-#define TSPEC_DEFAULT_DIALOG_TOKEN      42      /* default dialog token */
-#define TSPEC_DEFAULT_SBW_FACTOR        0x3000  /* default surplus bw */
-
-/* define for flag */
-#define TSPEC_PENDING           0       /* TSPEC pending */
-#define TSPEC_ACCEPTED          1       /* TSPEC accepted */
-#define TSPEC_REJECTED          2       /* TSPEC rejected */
-#define TSPEC_UNKNOWN           3       /* TSPEC unknown */
-#define TSPEC_STATUS_MASK       7       /* TSPEC status mask */
 
 /* Software feature flag defines used by wlfeatureflag */
 #define WL_SWFL_NOHWRADIO       0x0004
@@ -1913,16 +1631,6 @@ typedef struct wme_max_bandwidth {
 
 #define WL_LIFETIME_MAX 0xFFFF  /* Max value in ms */
 
-/*
- * Dongle pattern matching filter.
- */
-
-/* Packet filter types. Currently, only pattern matching is supported. */
-typedef enum wl_pkt_filter_type {
-        WL_PKT_FILTER_TYPE_PATTERN_MATCH        /* Pattern matching filter */
-} wl_pkt_filter_type_t;
-
-#define WL_PKT_FILTER_TYPE wl_pkt_filter_type_t
 
 /* Pattern matching filter. Specifies an offset within received packets to
  * start matching, the pattern to match, the size of the pattern, and a bitmask
@@ -1957,20 +1665,6 @@ typedef struct wl_pkt_filter_enable {
         u32 enable;             /* Enable/disable bool */
 } wl_pkt_filter_enable_t;
 
-/* IOVAR "pkt_filter_list" parameter. Used to retrieve a list of installed filters. */
-typedef struct wl_pkt_filter_list {
-        u32 num;                /* Number of installed packet filters */
-        wl_pkt_filter_t filter[1];      /* Variable array of packet filters. */
-} wl_pkt_filter_list_t;
-
-#define WL_PKT_FILTER_LIST_FIXED_LEN      offsetof(wl_pkt_filter_list_t, filter)
-
-/* IOVAR "pkt_filter_stats" parameter. Used to retrieve debug statistics. */
-typedef struct wl_pkt_filter_stats {
-        u32 num_pkts_matched;   /* # filter matches for specified filter id */
-        u32 num_pkts_forwarded; /* # packets fwded from dongle to host for all filters */
-        u32 num_pkts_discarded; /* # packets discarded by dongle for all filters */
-} wl_pkt_filter_stats_t;
 
 #define WLC_RSSI_INVALID         0      /* invalid RSSI value */
 
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
index 8287261120f4..3bed37cb59b8 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -20,10 +20,15 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmendian.h>
 #include <bcmnvram.h>
 #include <sbchipc.h>
+#include <bcmdevs.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 
 #include <wlc_phy_int.h>
 #include <wlc_phyreg_n.h>
@@ -163,7 +168,7 @@ char *phy_getvar(phy_info_t *pi, const char *name)
                 return NULL;
 
         for (s = vars; s && *s;) {
-                if ((bcmp(s, name, len) == 0) && (s[len] == '='))
+                if ((memcmp(s, name, len) == 0) && (s[len] == '='))
                         return &s[len + 1];
 
                 while (*s++)
@@ -272,7 +277,7 @@ u16 read_radio_reg(phy_info_t *pi, u16 addr)
 
 void write_radio_reg(phy_info_t *pi, u16 addr, u16 val)
 {
-        osl_t *osh;
+        struct osl_info *osh;
 
         if (NORADIO_ENAB(pi->pubpi))
                 return;
@@ -296,7 +301,7 @@ void write_radio_reg(phy_info_t *pi, u16 addr, u16 val)
                 W_REG(osh, &pi->regs->phy4wdatalo, val);
         }
 
-        if (BUSTYPE(pi->sh->bustype) == PCI_BUS) {
+        if (pi->sh->bustype == PCI_BUS) {
                 if (++pi->phy_wreg >= pi->phy_wreg_limit) {
                         (void)R_REG(osh, &pi->regs->maccontrol);
                         pi->phy_wreg = 0;
@@ -405,7 +410,7 @@ static bool wlc_phy_war41476(phy_info_t *pi)
 
 u16 read_phy_reg(phy_info_t *pi, u16 addr)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = pi->sh->osh;
@@ -426,7 +431,7 @@ u16 read_phy_reg(phy_info_t *pi, u16 addr)
 
 void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = pi->sh->osh;
@@ -441,7 +446,7 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 #else
         W_REG(osh, (volatile u32 *)(&regs->phyregaddr),
               addr | (val << 16));
-        if (BUSTYPE(pi->sh->bustype) == PCI_BUS) {
+        if (pi->sh->bustype == PCI_BUS) {
                 if (++pi->phy_wreg >= pi->phy_wreg_limit) {
                         pi->phy_wreg = 0;
                         (void)R_REG(osh, &regs->phyversion);
@@ -452,7 +457,7 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 
 void and_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = pi->sh->osh;
@@ -473,7 +478,7 @@ void and_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 
 void or_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = pi->sh->osh;
@@ -494,7 +499,7 @@ void or_phy_reg(phy_info_t *pi, u16 addr, u16 val)
 
 void mod_phy_reg(phy_info_t *pi, u16 addr, u16 mask, u16 val)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = pi->sh->osh;
@@ -591,7 +596,7 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp)
 
 void wlc_phy_shared_detach(shared_phy_t *phy_sh)
 {
-        osl_t *osh;
+        struct osl_info *osh;
 
         if (phy_sh) {
                 osh = phy_sh->osh;
@@ -609,7 +614,7 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars
         u32 sflags = 0;
         uint phyversion;
         int i;
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = sh->osh;
 
@@ -1080,8 +1085,8 @@ wlc_phy_table_addr(phy_info_t *pi, uint tbl_id, uint tbl_offset,
         pi->tbl_data_hi = tblDataHi;
         pi->tbl_data_lo = tblDataLo;
 
-        if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID ||
-             CHIPID(pi->sh->chip) == BCM43421_CHIP_ID) &&
+        if ((pi->sh->chip == BCM43224_CHIP_ID ||
+             pi->sh->chip == BCM43421_CHIP_ID) &&
             (pi->sh->chiprev == 1)) {
                 pi->tbl_addr = tblAddr;
                 pi->tbl_save_id = tbl_id;
@@ -1093,8 +1098,8 @@ void wlc_phy_table_data_write(phy_info_t *pi, uint width, u32 val)
 {
         ASSERT((width == 8) || (width == 16) || (width == 32));
 
-        if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID ||
-             CHIPID(pi->sh->chip) == BCM43421_CHIP_ID) &&
+        if ((pi->sh->chip == BCM43224_CHIP_ID ||
+             pi->sh->chip == BCM43421_CHIP_ID) &&
             (pi->sh->chiprev == 1) &&
             (pi->tbl_save_id == NPHY_TBL_ID_ANTSWCTRLLUT)) {
                 read_phy_reg(pi, pi->tbl_data_lo);
@@ -1132,8 +1137,8 @@ wlc_phy_write_table(phy_info_t *pi, const phytbl_info_t *ptbl_info,
 
         for (idx = 0; idx < ptbl_info->tbl_len; idx++) {
 
-                if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID ||
-                     CHIPID(pi->sh->chip) == BCM43421_CHIP_ID) &&
+                if ((pi->sh->chip == BCM43224_CHIP_ID ||
+                     pi->sh->chip == BCM43421_CHIP_ID) &&
                     (pi->sh->chiprev == 1) &&
                     (tbl_id == NPHY_TBL_ID_ANTSWCTRLLUT)) {
                         read_phy_reg(pi, tblDataLo);
@@ -1175,8 +1180,8 @@ wlc_phy_read_table(phy_info_t *pi, const phytbl_info_t *ptbl_info,
 
         for (idx = 0; idx < ptbl_info->tbl_len; idx++) {
 
-                if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID ||
-                     CHIPID(pi->sh->chip) == BCM43421_CHIP_ID) &&
+                if ((pi->sh->chip == BCM43224_CHIP_ID ||
+                     pi->sh->chip == BCM43421_CHIP_ID) &&
                     (pi->sh->chiprev == 1)) {
                         (void)read_phy_reg(pi, tblDataLo);
 
@@ -1534,7 +1539,7 @@ wlc_phy_chanspec_band_validch(wlc_phy_t *ppi, uint band, chanvec_t *channels)
 
         ASSERT((band == WLC_BAND_2G) || (band == WLC_BAND_5G));
 
-        bzero(channels, sizeof(chanvec_t));
+        memset(channels, 0, sizeof(chanvec_t));
 
         for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {
                 channel = chan_info_all[i].chan;
@@ -1896,7 +1901,7 @@ void wlc_phy_txpower_recalc_target(phy_info_t *pi)
                 tx_pwr_min = min(tx_pwr_min, tx_pwr_target[rate]);
         }
 
-        bzero(pi->tx_power_offset, sizeof(pi->tx_power_offset));
+        memset(pi->tx_power_offset, 0, sizeof(pi->tx_power_offset));
         pi->tx_power_max = tx_pwr_max;
         pi->tx_power_min = tx_pwr_min;
         pi->tx_power_max_rate_ind = tx_pwr_max_rate_ind;
@@ -2507,7 +2512,7 @@ wlc_phy_noise_calc_phy(phy_info_t *pi, u32 *cmplx_pwr, s8 *pwr_ant)
         s8 cmplx_pwr_dbm[PHY_CORE_MAX];
         u8 i;
 
-        bzero((u8 *) cmplx_pwr_dbm, sizeof(cmplx_pwr_dbm));
+        memset((u8 *) cmplx_pwr_dbm, 0, sizeof(cmplx_pwr_dbm));
         ASSERT(pi->pubpi.phy_corenum <= PHY_CORE_MAX);
         wlc_phy_compute_dB(cmplx_pwr, cmplx_pwr_dbm, pi->pubpi.phy_corenum);
 
@@ -2621,9 +2626,9 @@ wlc_phy_noise_sample_request(wlc_phy_t *pih, u8 reason, u8 ch)
                         u8 wait_crs = 0;
                         u8 i;
 
-                        bzero((u8 *) est, sizeof(est));
-                        bzero((u8 *) cmplx_pwr, sizeof(cmplx_pwr));
-                        bzero((u8 *) noise_dbm_ant, sizeof(noise_dbm_ant));
+                        memset((u8 *) est, 0, sizeof(est));
+                        memset((u8 *) cmplx_pwr, 0, sizeof(cmplx_pwr));
+                        memset((u8 *) noise_dbm_ant, 0, sizeof(noise_dbm_ant));
 
                         log_num_samps = PHY_NOISE_SAMPLE_LOG_NUM_NPHY;
                         num_samps = 1 << log_num_samps;
@@ -2704,8 +2709,8 @@ static s8 wlc_phy_noise_read_shmem(phy_info_t *pi)
         u8 idx, core;
 
         ASSERT(pi->pubpi.phy_corenum <= PHY_CORE_MAX);
-        bzero((u8 *) cmplx_pwr, sizeof(cmplx_pwr));
-        bzero((u8 *) noise_dbm_ant, sizeof(noise_dbm_ant));
+        memset((u8 *) cmplx_pwr, 0, sizeof(cmplx_pwr));
+        memset((u8 *) noise_dbm_ant, 0, sizeof(noise_dbm_ant));
 
         for (idx = 0, core = 0; core < pi->pubpi.phy_corenum; idx += 2, core++) {
                 lo = wlapi_bmac_read_shm(pi->sh->physhim, M_PWRIND_MAP(idx));
@@ -3325,7 +3330,7 @@ const u8 *wlc_phy_get_ofdm_rate_lookup(void)
 
 void wlc_lcnphy_epa_switch(phy_info_t *pi, bool mode)
 {
-        if ((CHIPID(pi->sh->chip) == BCM4313_CHIP_ID) &&
+        if ((pi->sh->chip == BCM4313_CHIP_ID) &&
             (pi->sh->boardflags & BFL_FEM)) {
                 if (mode) {
                         u16 txant = 0;
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/phy/wlc_phy_hal.h
index 52260b2d0eba..514e15e00283 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_hal.h
+++ b/drivers/staging/brcm80211/phy/wlc_phy_hal.h
@@ -122,11 +122,7 @@ typedef struct shared_phy shared_phy_t;
 
 struct phy_pub;
 
-#ifdef WLC_HIGH_ONLY
-typedef struct wlc_rpc_phy wlc_phy_t;
-#else
 typedef struct phy_pub wlc_phy_t;
-#endif
 
 typedef struct shared_phy_params {
         void *osh;
@@ -150,7 +146,6 @@ typedef struct shared_phy_params {
         u32 boardflags2;
 } shared_phy_params_t;
 
-#ifdef WLC_LOW
 
 extern shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp);
 extern void wlc_phy_shared_detach(shared_phy_t *phy_sh);
@@ -189,7 +184,6 @@ extern void wlc_phy_set_deaf(wlc_phy_t *ppi, bool user_flag);
 extern void wlc_phy_switch_radio(wlc_phy_t *ppi, bool on);
 extern void wlc_phy_anacore(wlc_phy_t *ppi, bool on);
 
-#endif                          /* WLC_LOW */
 
 extern void wlc_phy_BSSinit(wlc_phy_t *ppi, bool bonlyap, int rssi);
 
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_int.h b/drivers/staging/brcm80211/phy/wlc_phy_int.h
index 9513b87fa163..72eee9120c2f 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_int.h
+++ b/drivers/staging/brcm80211/phy/wlc_phy_int.h
@@ -527,7 +527,7 @@ typedef struct {
 struct shared_phy {
         struct phy_info *phy_head;
         uint unit;
-        osl_t *osh;
+        struct osl_info *osh;
         si_t *sih;
         void *physhim;
         uint corerev;
@@ -1158,7 +1158,7 @@ extern void wlc_phy_table_write_nphy(phy_info_t *pi, u32, u32, u32,
          (pi->ipa5g_on && CHSPEC_IS5G(pi->radio_chanspec)))
 
 #define WLC_PHY_WAR_PR51571(pi) \
-        if ((BUSTYPE((pi)->sh->bustype) == PCI_BUS) && NREV_LT((pi)->pubpi.phy_rev, 3)) \
+        if (((pi)->sh->bustype == PCI_BUS) && NREV_LT((pi)->pubpi.phy_rev, 3)) \
                 (void)R_REG((pi)->sh->osh, &(pi)->regs->maccontrol)
 
 extern void wlc_phy_cal_perical_nphy_run(phy_info_t *pi, u8 caltype);
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
index 3d3112ed4e20..3ac2b49d9a9d 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
@@ -17,13 +17,18 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <wlc_cfg.h>
 #include <qmath.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/pci.h>
 #include <siutils.h>
 #include <hndpmu.h>
 
+#include <bcmdevs.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
+
 #include <wlc_phy_radio.h>
 #include <wlc_phy_int.h>
 #include <wlc_phy_lcn.h>
@@ -1327,7 +1332,7 @@ static void wlc_lcnphy_clear_tx_power_offsets(phy_info_t *pi)
         u32 data_buf[64];
         phytbl_info_t tab;
 
-        bzero(data_buf, sizeof(data_buf));
+        memset(data_buf, 0, sizeof(data_buf));
 
         tab.tbl_id = LCNPHY_TBL_ID_TXPWRCTL;
         tab.tbl_width = 32;
@@ -1951,7 +1956,7 @@ wlc_lcnphy_tx_iqlo_cal(phy_info_t *pi,
         band_idx = (CHSPEC_IS5G(pi->radio_chanspec) ? 1 : 0);
 
         cal_gains = *target_gains;
-        bzero(ncorr_override, sizeof(ncorr_override));
+        memset(ncorr_override, 0, sizeof(ncorr_override));
         for (j = 0; j < iqcal_gainparams_numgains_lcnphy[band_idx]; j++) {
                 if (hash == tbl_iqcal_gainparams_lcnphy[band_idx][j][0]) {
                         cal_gains.gm_gain =
@@ -2529,7 +2534,7 @@ static void wlc_lcnphy_clear_papd_comptable(phy_info_t *pi)
         tab.tbl_width = 32;
         tab.tbl_offset = 0;
 
-        bzero(temp_offset, sizeof(temp_offset));
+        memset(temp_offset, 0, sizeof(temp_offset));
         for (j = 1; j < 128; j += 2)
                 temp_offset[j] = 0x80000;
 
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/phy/wlc_phy_n.c
index 950008f122b1..c6cce8de1aee 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_n.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_n.c
@@ -18,13 +18,18 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
 #include <osl.h>
 #include <siutils.h>
 #include <sbchipc.h>
 #include <hndpmu.h>
 #include <bcmendian.h>
 
+#include <bcmdevs.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
+
 #include <wlc_phy_radio.h>
 #include <wlc_phy_int.h>
 #include <wlc_phyreg_n.h>
@@ -14554,7 +14559,7 @@ void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi)
                 }
         }
 
-        if ((!PHY_IPA(pi)) && (CHIPID(pi->sh->chip) == BCM5357_CHIP_ID)) {
+        if ((!PHY_IPA(pi)) && (pi->sh->chip == BCM5357_CHIP_ID)) {
                 si_pmu_chipcontrol(pi->sh->sih, 1, CCTRL5357_EXTPA,
                                    CCTRL5357_EXTPA);
         }
@@ -17599,7 +17604,7 @@ static void wlc_phy_radio_postinit_2057(phy_info_t *pi)
 
         mod_radio_reg(pi, RADIO_2057_XTALPUOVR_PINCTRL, 0x1, 0x1);
 
-        if (CHIPID(pi->sh->chip) == !BCM6362_CHIP_ID) {
+        if (pi->sh->chip == !BCM6362_CHIP_ID) {
 
                 mod_radio_reg(pi, RADIO_2057_XTALPUOVR_PINCTRL, 0x2, 0x2);
         }
@@ -18007,8 +18012,8 @@ wlc_phy_chanspec_radio2056_setup(phy_info_t *pi,
                         write_radio_reg(pi, RADIO_2056_SYN_PLL_LOOPFILTER2 |
                                         RADIO_2056_SYN, 0x1f);
 
-                        if ((CHIPID(pi->sh->chip) == BCM4716_CHIP_ID) ||
-                            (CHIPID(pi->sh->chip) == BCM47162_CHIP_ID)) {
+                        if ((pi->sh->chip == BCM4716_CHIP_ID) ||
+                            (pi->sh->chip == BCM47162_CHIP_ID)) {
 
                                 write_radio_reg(pi,
                                                 RADIO_2056_SYN_PLL_LOOPFILTER4 |
@@ -18070,8 +18075,8 @@ wlc_phy_chanspec_radio2056_setup(phy_info_t *pi,
                                 WRITE_RADIO_REG2(pi, RADIO_2056, TX, core,
                                                  PADG_IDAC, 0xcc);
 
-                                if ((CHIPID(pi->sh->chip) == BCM4716_CHIP_ID) ||
-                                    (CHIPID(pi->sh->chip) ==
+                                if ((pi->sh->chip == BCM4716_CHIP_ID) ||
+                                    (pi->sh->chip ==
                                      BCM47162_CHIP_ID)) {
                                         bias = 0x40;
                                         cascbias = 0x45;
@@ -18083,11 +18088,11 @@ wlc_phy_chanspec_radio2056_setup(phy_info_t *pi,
                                         bias = 0x25;
                                         cascbias = 0x20;
 
-                                        if ((CHIPID(pi->sh->chip) ==
+                                        if ((pi->sh->chip ==
                                              BCM43224_CHIP_ID)
-                                            || (CHIPID(pi->sh->chip) ==
+                                            || (pi->sh->chip ==
                                                 BCM43225_CHIP_ID)
-                                            || (CHIPID(pi->sh->chip) ==
+                                            || (pi->sh->chip ==
                                                 BCM43421_CHIP_ID)) {
                                                 if (pi->sh->chippkg ==
                                                     BCM43224_FAB_SMIC) {
@@ -18198,9 +18203,9 @@ wlc_phy_chanspec_radio2056_setup(phy_info_t *pi,
 
                         cascbias = 0x30;
 
-                        if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID) ||
-                            (CHIPID(pi->sh->chip) == BCM43225_CHIP_ID) ||
-                            (CHIPID(pi->sh->chip) == BCM43421_CHIP_ID)) {
+                        if ((pi->sh->chip == BCM43224_CHIP_ID) ||
+                            (pi->sh->chip == BCM43225_CHIP_ID) ||
+                            (pi->sh->chip == BCM43421_CHIP_ID)) {
                                 if (pi->sh->chippkg == BCM43224_FAB_SMIC) {
                                         cascbias = 0x35;
                                 }
@@ -18927,7 +18932,7 @@ static void wlc_phy_spurwar_nphy(phy_info_t *pi)
                         case 38:
                         case 102:
                         case 118:
-                                if ((CHIPID(pi->sh->chip) == BCM4716_CHIP_ID) &&
+                                if ((pi->sh->chip == BCM4716_CHIP_ID) &&
                                     (pi->sh->chippkg == BCM4717_PKG_ID)) {
                                         nphy_adj_tone_id_buf[0] = 32;
                                         nphy_adj_noise_var_buf[0] = 0x21f;
@@ -19062,7 +19067,7 @@ wlc_phy_chanspec_nphy_setup(phy_info_t *pi, chanspec_t chanspec,
                                 if (pi->nphy_aband_spurwar_en &&
                                     ((val == 38) || (val == 102)
                                      || (val == 118))) {
-                                        if ((CHIPID(pi->sh->chip) ==
+                                        if ((pi->sh->chip ==
                                              BCM4716_CHIP_ID)
                                             && (pi->sh->chippkg ==
                                                 BCM4717_PKG_ID)) {
@@ -19077,8 +19082,8 @@ wlc_phy_chanspec_nphy_setup(phy_info_t *pi, chanspec_t chanspec,
                 if (pi->phy_spuravoid == SPURAVOID_FORCEON)
                         spuravoid = 1;
 
-                if ((CHIPID(pi->sh->chip) == BCM4716_CHIP_ID) ||
-                    (CHIPID(pi->sh->chip) == BCM47162_CHIP_ID)) {
+                if ((pi->sh->chip == BCM4716_CHIP_ID) ||
+                    (pi->sh->chip == BCM47162_CHIP_ID)) {
                         si_pmu_spuravoid(pi->sh->sih, pi->sh->osh, spuravoid);
                 } else {
                         wlapi_bmac_core_phypll_ctl(pi->sh->physhim, false);
@@ -19086,9 +19091,9 @@ wlc_phy_chanspec_nphy_setup(phy_info_t *pi, chanspec_t chanspec,
                         wlapi_bmac_core_phypll_ctl(pi->sh->physhim, true);
                 }
 
-                if ((CHIPID(pi->sh->chip) == BCM43224_CHIP_ID) ||
-                    (CHIPID(pi->sh->chip) == BCM43225_CHIP_ID) ||
-                    (CHIPID(pi->sh->chip) == BCM43421_CHIP_ID)) {
+                if ((pi->sh->chip == BCM43224_CHIP_ID) ||
+                    (pi->sh->chip == BCM43225_CHIP_ID) ||
+                    (pi->sh->chip == BCM43421_CHIP_ID)) {
 
                         if (spuravoid == 1) {
 
@@ -19105,8 +19110,8 @@ wlc_phy_chanspec_nphy_setup(phy_info_t *pi, chanspec_t chanspec,
                         }
                 }
 
-                if (!((CHIPID(pi->sh->chip) == BCM4716_CHIP_ID) ||
-                      (CHIPID(pi->sh->chip) == BCM47162_CHIP_ID))) {
+                if (!((pi->sh->chip == BCM4716_CHIP_ID) ||
+                      (pi->sh->chip == BCM47162_CHIP_ID))) {
                         wlapi_bmac_core_phypll_reset(pi->sh->physhim);
                 }
 
@@ -21062,11 +21067,11 @@ s16 wlc_phy_tempsense_nphy(phy_info_t *pi)
                 wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_AFECTRL, 1, 0x03, 16,
                                          &auxADC_rssi_ctrlH_save);
 
-                if (CHIPID(pi->sh->chip) == BCM5357_CHIP_ID) {
+                if (pi->sh->chip == BCM5357_CHIP_ID) {
                         radio_temp[0] = (193 * (radio_temp[1] + radio_temp2[1])
                                          + 88 * (auxADC_Vl) - 27111 +
                                          128) / 256;
-                } else if (CHIPID(pi->sh->chip) == BCM43236_CHIP_ID) {
+                } else if (pi->sh->chip == BCM43236_CHIP_ID) {
                         radio_temp[0] = (198 * (radio_temp[1] + radio_temp2[1])
                                          + 91 * (auxADC_Vl) - 27243 +
                                          128) / 256;
@@ -26277,7 +26282,7 @@ static u32 *wlc_phy_get_ipa_gaintbl_nphy(phy_info_t *pi)
                 } else if (NREV_IS(pi->pubpi.phy_rev, 6)) {
 
                         tx_pwrctrl_tbl = nphy_tpc_txgain_ipa_rev6;
-                        if (CHIPID(pi->sh->chip) == BCM47162_CHIP_ID) {
+                        if (pi->sh->chip == BCM47162_CHIP_ID) {
 
                                 tx_pwrctrl_tbl = nphy_tpc_txgain_ipa_rev5;
                         }
@@ -26833,7 +26838,7 @@ wlc_phy_a2_nphy(phy_info_t *pi, nphy_ipa_txcalgains_t *txgains,
                 phy_a2 = 63;
 
                 if (CHSPEC_IS2G(pi->radio_chanspec)) {
-                        if (CHIPID(pi->sh->chip) == BCM6362_CHIP_ID) {
+                        if (pi->sh->chip == BCM6362_CHIP_ID) {
                                 phy_a1 = 35;
                                 phy_a3 = 35;
                         } else if ((pi->pubpi.radiorev == 4)
@@ -26946,7 +26951,7 @@ wlc_phy_a2_nphy(phy_info_t *pi, nphy_ipa_txcalgains_t *txgains,
                                         if (NREV_GE(pi->pubpi.phy_rev, 6)) {
                                                 phy_a5 = 0x00f7 | (phy_a4 << 8);
 
-                                                if (CHIPID(pi->sh->chip) ==
+                                                if (pi->sh->chip ==
                                                     BCM47162_CHIP_ID) {
                                                         phy_a5 =
                                                             0x10f7 | (phy_a4 <<
diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
index 6ce9e5d96830..330b88152b65 100644
--- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c
@@ -15,6 +15,9 @@
  */
 
 #include <linux/types.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
+#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 
diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
index 7cc2c563c727..a9fc193721ef 100644
--- a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
+++ b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c
@@ -16,6 +16,9 @@
 
 #include <linux/kernel.h>
 
+#include <sbhndpio.h>
+#include <sbhnddma.h>
+#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
 
diff --git a/drivers/staging/brcm80211/sys/wl_dbg.h b/drivers/staging/brcm80211/sys/wl_dbg.h
index e63b27ebad5e..54af257598c2 100644
--- a/drivers/staging/brcm80211/sys/wl_dbg.h
+++ b/drivers/staging/brcm80211/sys/wl_dbg.h
@@ -20,15 +20,20 @@
 /* wl_msg_level is a bit vector with defs in wlioctl.h */
 extern u32 wl_msg_level;
 
-#define WL_PRINT(args)          printf args
-#define WL_NONE(args)
+#define WL_NONE(fmt, args...) no_printk(fmt, ##args)
+
+#define WL_PRINT(level, fmt, args...)           \
+do {                                            \
+        if (wl_msg_level & level)               \
+                printk(fmt, ##args);            \
+} while (0)
 
 #ifdef BCMDBG
 
-#define WL_ERROR(args)          do {if ((wl_msg_level & WL_ERROR_VAL)) WL_PRINT(args); } while (0)
-#define WL_TRACE(args)          do {if (wl_msg_level & WL_TRACE_VAL) WL_PRINT(args); } while (0)
-#define WL_AMPDU(args)          do {if (wl_msg_level & WL_AMPDU_VAL) WL_PRINT(args); } while (0)
-#define WL_FFPLD(args)          do {if (wl_msg_level & WL_FFPLD_VAL) WL_PRINT(args); } while (0)
+#define WL_ERROR(fmt, args...)  WL_PRINT(WL_ERROR_VAL, fmt, ##args)
+#define WL_TRACE(fmt, args...)  WL_PRINT(WL_TRACE_VAL, fmt, ##args)
+#define WL_AMPDU(fmt, args...)  WL_PRINT(WL_AMPDU_VAL, fmt, ##args)
+#define WL_FFPLD(fmt, args...)  WL_PRINT(WL_FFPLD_VAL, fmt, ##args)
 
 #define WL_ERROR_ON()           (wl_msg_level & WL_ERROR_VAL)
 
@@ -44,35 +49,50 @@ extern u32 wl_msg_level;
 
 extern u32 wl_ampdu_dbg;
 
-#define WL_AMPDU_UPDN(args) do {if (wl_ampdu_dbg & WL_AMPDU_UPDN_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_RX(args) do {if (wl_ampdu_dbg & WL_AMPDU_RX_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_ERR(args) do {if (wl_ampdu_dbg & WL_AMPDU_ERR_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_TX(args) do {if (wl_ampdu_dbg & WL_AMPDU_TX_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_CTL(args) do {if (wl_ampdu_dbg & WL_AMPDU_CTL_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_HW(args) do {if (wl_ampdu_dbg & WL_AMPDU_HW_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_HWTXS(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL) {WL_AMPDU(args); } } while (0)
-#define WL_AMPDU_HWDBG(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWDBG_VAL) {WL_AMPDU(args); } } while (0)
+#define WL_AMPDU_PRINT(level, fmt, args...)     \
+do {                                            \
+        if (wl_ampdu_dbg & level) {             \
+                WL_AMPDU(fmt, ##args);          \
+        }                                       \
+} while (0)
+
+#define WL_AMPDU_UPDN(fmt, args...)                     \
+        WL_AMPDU_PRINT(WL_AMPDU_UPDN_VAL, fmt, ##args)
+#define WL_AMPDU_RX(fmt, args...)                       \
+        WL_AMPDU_PRINT(WL_AMPDU_RX_VAL, fmt, ##args)
+#define WL_AMPDU_ERR(fmt, args...)                      \
+        WL_AMPDU_PRINT(WL_AMPDU_ERR_VAL, fmt, ##args)
+#define WL_AMPDU_TX(fmt, args...)                       \
+        WL_AMPDU_PRINT(WL_AMPDU_TX_VAL, fmt, ##args)
+#define WL_AMPDU_CTL(fmt, args...)                      \
+        WL_AMPDU_PRINT(WL_AMPDU_CTL_VAL, fmt, ##args)
+#define WL_AMPDU_HW(fmt, args...)                       \
+        WL_AMPDU_PRINT(WL_AMPDU_HW_VAL, fmt, ##args)
+#define WL_AMPDU_HWTXS(fmt, args...)                    \
+        WL_AMPDU_PRINT(WL_AMPDU_HWTXS_VAL, fmt, ##args)
+#define WL_AMPDU_HWDBG(fmt, args...)                    \
+        WL_AMPDU_PRINT(WL_AMPDU_HWDBG_VAL, fmt, ##args)
 #define WL_AMPDU_ERR_ON() (wl_ampdu_dbg & WL_AMPDU_ERR_VAL)
 #define WL_AMPDU_HW_ON() (wl_ampdu_dbg & WL_AMPDU_HW_VAL)
 #define WL_AMPDU_HWTXS_ON() (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL)
 
 #else                           /* BCMDBG */
 
-#define WL_ERROR(args)
-#define WL_TRACE(args)
-#define WL_AMPDU(args)
-#define WL_FFPLD(args)
+#define WL_ERROR(fmt, args...)          no_printk(fmt, ##args)
+#define WL_TRACE(fmt, args...)          no_printk(fmt, ##args)
+#define WL_AMPDU(fmt, args...)          no_printk(fmt, ##args)
+#define WL_FFPLD(fmt, args...)          no_printk(fmt, ##args)
 
 #define WL_ERROR_ON()           0
 
-#define WL_AMPDU_UPDN(args)
-#define WL_AMPDU_RX(args)
-#define WL_AMPDU_ERR(args)
-#define WL_AMPDU_TX(args)
-#define WL_AMPDU_CTL(args)
-#define WL_AMPDU_HW(args)
-#define WL_AMPDU_HWTXS(args)
-#define WL_AMPDU_HWDBG(args)
+#define WL_AMPDU_UPDN(fmt, args...)     no_printk(fmt, ##args)
+#define WL_AMPDU_RX(fmt, args...)       no_printk(fmt, ##args)
+#define WL_AMPDU_ERR(fmt, args...)      no_printk(fmt, ##args)
+#define WL_AMPDU_TX(fmt, args...)       no_printk(fmt, ##args)
+#define WL_AMPDU_CTL(fmt, args...)      no_printk(fmt, ##args)
+#define WL_AMPDU_HW(fmt, args...)       no_printk(fmt, ##args)
+#define WL_AMPDU_HWTXS(fmt, args...)    no_printk(fmt, ##args)
+#define WL_AMPDU_HWDBG(fmt, args...)    no_printk(fmt, ##args)
 #define WL_AMPDU_ERR_ON()       0
 #define WL_AMPDU_HW_ON()        0
 #define WL_AMPDU_HWTXS_ON()     0
diff --git a/drivers/staging/brcm80211/sys/wl_export.h b/drivers/staging/brcm80211/sys/wl_export.h
index 08442f8e84e0..aa8b5a3ed633 100644
--- a/drivers/staging/brcm80211/sys/wl_export.h
+++ b/drivers/staging/brcm80211/sys/wl_export.h
@@ -45,10 +45,10 @@ extern void wl_add_timer(struct wl_info *wl, struct wl_timer *timer, uint ms,
                          int periodic);
 extern bool wl_del_timer(struct wl_info *wl, struct wl_timer *timer);
 
-extern uint wl_buf_to_pktcopy(osl_t *osh, void *p, unsigned char *buf, int len,
-                              uint offset);
-extern void *wl_get_pktbuffer(osl_t *osh, int len);
-extern int wl_set_pktlen(osl_t *osh, void *p, int len);
+extern uint wl_buf_to_pktcopy(struct osl_info *osh, void *p, unsigned char *buf,
+                              int len, uint offset);
+extern void *wl_get_pktbuffer(struct osl_info *osh, int len);
+extern int wl_set_pktlen(struct osl_info *osh, void *p, int len);
 
 #define wl_sort_bsslist(a, b) false
 
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index d060377629ac..bdd629d72a75 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -21,72 +21,36 @@
 #include <linux/string.h>
 #include <linux/pci_ids.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
 #include <osl.h>
 #define WLC_MAXBSSCFG           1       /* single BSS configs */
 
 #include <wlc_cfg.h>
 #include <net/mac80211.h>
-#include <epivers.h>
-#ifndef WLC_HIGH_ONLY
 #include <phy_version.h>
-#endif
 #include <bcmutils.h>
 #include <pcicfg.h>
 #include <wlioctl.h>
 #include <wlc_key.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <wlc_channel.h>
 #include <wlc_pub.h>
 #include <wlc_scb.h>
 #include <wl_dbg.h>
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#endif
 #include <wl_export.h>
-#ifdef WLC_HIGH_ONLY
-#include "dbus.h"
-#include "bcm_rpc_tp.h"
-#include "bcm_rpc.h"
-#include "bcm_xdr.h"
-#include "wlc_rpc.h"
-#endif
 
 #include <wl_mac80211.h>
 #include <linux/firmware.h>
-#ifndef WLC_HIGH_ONLY
 #include <wl_ucode.h>
 #include <d11ucode_ext.h>
-#endif
 
-#ifdef BCMSDIO
-extern struct device *sdiommc_dev;
-#endif
-
-extern void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg,
-                              bool suspend);
-bool wlc_sendpkt_mac80211(wlc_info_t *wlc, void *sdu, struct ieee80211_hw *hw);
-void wlc_mac_bcn_promisc_change(wlc_info_t *wlc, bool promisc);
-void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset,
-                       const struct ether_addr *addr);
 
 static void wl_timer(unsigned long data);
 static void _wl_timer(wl_timer_t *t);
 
-#ifdef WLC_HIGH_ONLY
-#define RPCQ_LOCK(_wl, _flags) spin_lock_irqsave(&(_wl)->rpcq_lock, (_flags))
-#define RPCQ_UNLOCK(_wl, _flags)  spin_unlock_irqrestore(&(_wl)->rpcq_lock, (_flags))
-#define TXQ_LOCK(_wl, _flags) spin_lock_irqsave(&(_wl)->txq_lock, (_flags))
-#define TXQ_UNLOCK(_wl, _flags)  spin_unlock_irqrestore(&(_wl)->txq_lock, (_flags))
-static void wl_rpc_down(void *wlh);
-static void wl_rpcq_free(wl_info_t *wl);
-static void wl_rpcq_dispatch(struct wl_task *task);
-static void wl_rpc_dispatch_schedule(void *ctx, struct rpc_buf *buf);
-static void wl_start_txqwork(struct wl_task *task);
-static void wl_txq_free(wl_info_t *wl);
-static void wl_timer_task(wl_task_t *task);
-static int wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *),
-                            void *context);
-#endif                          /* WLC_HIGH_ONLY */
 
 static int ieee_hw_init(struct ieee80211_hw *hw);
 static int ieee_hw_rate_init(struct ieee80211_hw *hw);
@@ -134,16 +98,14 @@ struct ieee80211_tkip_data {
         u8 rx_hdr[16], tx_hdr[16];
 };
 
-#ifndef WLC_HIGH_ONLY
-#define WL_DEV_IF(dev)          ((wl_if_t *)netdev_priv(dev))
-#define WL_INFO(dev)            ((wl_info_t *)(WL_DEV_IF(dev)->wl))     /* points to wl */
-static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev);
-static void wl_release_fw(wl_info_t *wl);
-#endif
+#define WL_DEV_IF(dev)          ((struct wl_if *)netdev_priv(dev))
+#define WL_INFO(dev)            ((struct wl_info *)(WL_DEV_IF(dev)->wl))
+static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev);
+static void wl_release_fw(struct wl_info *wl);
 
 /* local prototypes */
-static int wl_start(struct sk_buff *skb, wl_info_t *wl);
-static int wl_start_int(wl_info_t *wl, struct ieee80211_hw *hw,
+static int wl_start(struct sk_buff *skb, struct wl_info *wl);
+static int wl_start_int(struct wl_info *wl, struct ieee80211_hw *hw,
                         struct sk_buff *skb);
 static void wl_dpc(unsigned long data);
 
@@ -152,7 +114,6 @@ MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
-#ifndef BCMSDIO
 /* recognized PCI IDs */
 static struct pci_device_id wl_id_table[] = {
         {PCI_VENDOR_ID_BROADCOM, 0x4357, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43225 2G */
@@ -163,55 +124,18 @@ static struct pci_device_id wl_id_table[] = {
 
 MODULE_DEVICE_TABLE(pci, wl_id_table);
 static void wl_remove(struct pci_dev *pdev);
-#endif                          /* !BCMSDIO */
 
-#ifdef BCMSDIO
-static uint sd_drivestrength = 6;
-module_param(sd_drivestrength, uint, 0);
-#endif
 
 #ifdef BCMDBG
 static int msglevel = 0xdeadbeef;
 module_param(msglevel, int, 0);
-#ifndef WLC_HIGH_ONLY
 static int phymsglevel = 0xdeadbeef;
 module_param(phymsglevel, int, 0);
-#endif                          /* WLC_HIGH_ONLY */
 #endif                          /* BCMDBG */
 
-static int oneonly;
-module_param(oneonly, int, 0);
-
-static int piomode;
-module_param(piomode, int, 0);
-
-static int instance_base;       /* Starting instance number */
-module_param(instance_base, int, 0);
-
-#if defined(BCMDBG)
-static char *macaddr;
-module_param(macaddr, charp, S_IRUGO);
-#endif
-
-static int nompc = 1;
-module_param(nompc, int, 0);
-
-static char name[IFNAMSIZ] = "eth%d";
-module_param_string(name, name, IFNAMSIZ, 0);
-
-#ifndef SRCBASE
-#define SRCBASE "."
-#endif
-
-#define WL_MAGIC        0xdeadbeef
-
 #define HW_TO_WL(hw)     (hw->priv)
 #define WL_TO_HW(wl)      (wl->pub->ieee_hw)
-#ifdef WLC_HIGH_ONLY
-static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb);
-#else
 static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-#endif
 static int wl_ops_start(struct ieee80211_hw *hw);
 static void wl_ops_stop(struct ieee80211_hw *hw);
 static int wl_ops_add_interface(struct ieee80211_hw *hw,
@@ -249,28 +173,13 @@ static int wl_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                            enum ieee80211_ampdu_mlme_action action,
                            struct ieee80211_sta *sta, u16 tid, u16 *ssn);
 
-#ifdef WLC_HIGH_ONLY
-static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        int status;
-        wl_info_t *wl = hw->priv;
-        if (!wl->pub->up) {
-                WL_ERROR(("ops->tx called while down\n"));
-                status = -ENETDOWN;
-                goto done;
-        }
-        status = wl_start(skb, wl);
- done:
-        return status;
-}
-#else
 static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         int status;
-        wl_info_t *wl = hw->priv;
+        struct wl_info *wl = hw->priv;
         WL_LOCK(wl);
         if (!wl->pub->up) {
-                WL_ERROR(("ops->tx called while down\n"));
+                WL_ERROR("ops->tx called while down\n");
                 status = -ENETDOWN;
                 goto done;
         }
@@ -279,13 +188,14 @@ static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         WL_UNLOCK(wl);
         return status;
 }
-#endif                          /* WLC_HIGH_ONLY */
 
 static int wl_ops_start(struct ieee80211_hw *hw)
 {
-        wl_info_t *wl = hw->priv;
-        /* struct ieee80211_channel *curchan = hw->conf.channel; */
-        WL_NONE(("%s : Initial channel: %d\n", __func__, curchan->hw_value));
+        struct wl_info *wl = hw->priv;
+        /*
+          struct ieee80211_channel *curchan = hw->conf.channel;
+          WL_NONE("%s : Initial channel: %d\n", __func__, curchan->hw_value);
+        */
 
         WL_LOCK(wl);
         ieee80211_wake_queues(hw);
@@ -296,7 +206,7 @@ static int wl_ops_start(struct ieee80211_hw *hw)
 
 static void wl_ops_stop(struct ieee80211_hw *hw)
 {
-        wl_info_t *wl = hw->priv;
+        struct wl_info *wl = hw->priv;
         ASSERT(wl);
         WL_LOCK(wl);
         wl_down(wl);
@@ -309,7 +219,7 @@ static void wl_ops_stop(struct ieee80211_hw *hw)
 static int
 wl_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
-        wl_info_t *wl;
+        struct wl_info *wl;
         int err;
 
         /* Just STA for now */
@@ -318,8 +228,8 @@ wl_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
             vif->type != NL80211_IFTYPE_STATION &&
             vif->type != NL80211_IFTYPE_WDS &&
             vif->type != NL80211_IFTYPE_ADHOC) {
-                WL_ERROR(("%s: Attempt to add type %d, only STA for now\n",
-                          __func__, vif->type));
+                WL_ERROR("%s: Attempt to add type %d, only STA for now\n",
+                         __func__, vif->type);
                 return -EOPNOTSUPP;
         }
 
@@ -329,7 +239,7 @@ wl_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
         WL_UNLOCK(wl);
 
         if (err != 0)
-                WL_ERROR(("%s: wl_up() returned %d\n", __func__, err));
+                WL_ERROR("%s: wl_up() returned %d\n", __func__, err);
         return err;
 }
 
@@ -343,7 +253,7 @@ static int
 ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
                  enum nl80211_channel_type type)
 {
-        wl_info_t *wl = HW_TO_WL(hw);
+        struct wl_info *wl = HW_TO_WL(hw);
         int err = 0;
 
         switch (type) {
@@ -355,8 +265,7 @@ ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
                 break;
         case NL80211_CHAN_HT40MINUS:
         case NL80211_CHAN_HT40PLUS:
-                WL_ERROR(("%s: Need to implement 40 Mhz Channels!\n",
-                          __func__));
+                WL_ERROR("%s: Need to implement 40 Mhz Channels!\n", __func__);
                 break;
         }
 
@@ -368,17 +277,17 @@ ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
 static int wl_ops_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct ieee80211_conf *conf = &hw->conf;
-        wl_info_t *wl = HW_TO_WL(hw);
+        struct wl_info *wl = HW_TO_WL(hw);
         int err = 0;
         int new_int;
 
         if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
-                WL_NONE(("%s: Setting listen interval to %d\n",
-                         __func__, conf->listen_interval));
+                WL_NONE("%s: Setting listen interval to %d\n",
+                        __func__, conf->listen_interval);
                 if (wlc_iovar_setint
                     (wl->wlc, "bcn_li_bcn", conf->listen_interval)) {
-                        WL_ERROR(("%s: Error setting listen_interval\n",
-                                  __func__));
+                        WL_ERROR("%s: Error setting listen_interval\n",
+                                 __func__);
                         err = -EIO;
                         goto config_out;
                 }
@@ -386,41 +295,42 @@ static int wl_ops_config(struct ieee80211_hw *hw, u32 changed)
                 ASSERT(new_int == conf->listen_interval);
         }
         if (changed & IEEE80211_CONF_CHANGE_MONITOR)
-                WL_NONE(("Need to set monitor mode\n"));
+                WL_NONE("Need to set monitor mode\n");
         if (changed & IEEE80211_CONF_CHANGE_PS)
-                WL_NONE(("Need to set Power-save mode\n"));
+                WL_NONE("Need to set Power-save mode\n");
 
         if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                WL_NONE(("%s: Setting tx power to %d dbm\n", __func__,
-                         conf->power_level));
+                WL_NONE("%s: Setting tx power to %d dbm\n",
+                        __func__, conf->power_level);
                 if (wlc_iovar_setint
                     (wl->wlc, "qtxpower", conf->power_level * 4)) {
-                        WL_ERROR(("%s: Error setting power_level\n", __func__));
+                        WL_ERROR("%s: Error setting power_level\n", __func__);
                         err = -EIO;
                         goto config_out;
                 }
                 wlc_iovar_getint(wl->wlc, "qtxpower", &new_int);
                 if (new_int != (conf->power_level * 4))
-                        WL_ERROR(("%s: Power level req != actual, %d %d\n",
-                                  __func__, conf->power_level * 4, new_int));
+                        WL_ERROR("%s: Power level req != actual, %d %d\n",
+                                 __func__, conf->power_level * 4, new_int);
         }
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 err = ieee_set_channel(hw, conf->channel, conf->channel_type);
         }
         if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
-                WL_NONE(("%s: srl %d, lrl %d\n", __func__,
-                         conf->short_frame_max_tx_count,
-                         conf->long_frame_max_tx_count));
+                WL_NONE("%s: srl %d, lrl %d\n",
+                        __func__,
+                        conf->short_frame_max_tx_count,
+                        conf->long_frame_max_tx_count);
                 if (wlc_set
                     (wl->wlc, WLC_SET_SRL,
                      conf->short_frame_max_tx_count) < 0) {
-                        WL_ERROR(("%s: Error setting srl\n", __func__));
+                        WL_ERROR("%s: Error setting srl\n", __func__);
                         err = -EIO;
                         goto config_out;
                 }
                 if (wlc_set(wl->wlc, WLC_SET_LRL, conf->long_frame_max_tx_count)
                     < 0) {
-                        WL_ERROR(("%s: Error setting lrl\n", __func__));
+                        WL_ERROR("%s: Error setting lrl\n", __func__);
                         err = -EIO;
                         goto config_out;
                 }
@@ -435,32 +345,29 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
                         struct ieee80211_vif *vif,
                         struct ieee80211_bss_conf *info, u32 changed)
 {
-        wl_info_t *wl = HW_TO_WL(hw);
+        struct wl_info *wl = HW_TO_WL(hw);
         int val;
 
-#ifdef WLC_HIGH_ONLY
-        WL_LOCK(wl);
-#endif
 
         if (changed & BSS_CHANGED_ASSOC) {
-                WL_ERROR(("Associated:\t%s\n", info->assoc ? "True" : "False"));
+                WL_ERROR("Associated:\t%s\n", info->assoc ? "True" : "False");
                 /* association status changed (associated/disassociated)
                  * also implies a change in the AID.
                  */
         }
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
-                WL_NONE(("Use_cts_prot:\t%s Implement me\n",
-                         info->use_cts_prot ? "True" : "False"));
+                WL_NONE("Use_cts_prot:\t%s Implement me\n",
+                        info->use_cts_prot ? "True" : "False");
                 /* CTS protection changed */
         }
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-                WL_NONE(("Short preamble:\t%s Implement me\n",
-                         info->use_short_preamble ? "True" : "False"));
+                WL_NONE("Short preamble:\t%s Implement me\n",
+                        info->use_short_preamble ? "True" : "False");
                 /* preamble changed */
         }
         if (changed & BSS_CHANGED_ERP_SLOT) {
-                WL_NONE(("Changing short slot:\t%s\n",
-                         info->use_short_slot ? "True" : "False"));
+                WL_NONE("Changing short slot:\t%s\n",
+                        info->use_short_slot ? "True" : "False");
                 if (info->use_short_slot)
                         val = 1;
                 else
@@ -470,39 +377,36 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_HT) {
-                WL_NONE(("%s: HT mode - Implement me\n", __func__));
+                WL_NONE("%s: HT mode - Implement me\n", __func__);
                 /* 802.11n parameters changed */
         }
         if (changed & BSS_CHANGED_BASIC_RATES) {
-                WL_NONE(("Need to change Basic Rates:\t0x%x! Implement me\n",
-                         (u32) info->basic_rates));
+                WL_NONE("Need to change Basic Rates:\t0x%x! Implement me\n",
+                        (u32) info->basic_rates);
                 /* Basic rateset changed */
         }
         if (changed & BSS_CHANGED_BEACON_INT) {
-                WL_NONE(("Beacon Interval:\t%d Implement me\n",
-                         info->beacon_int));
+                WL_NONE("Beacon Interval:\t%d Implement me\n",
+                        info->beacon_int);
                 /* Beacon interval changed */
         }
         if (changed & BSS_CHANGED_BSSID) {
-                WL_NONE(("new BSSID:\taid %d  bss:%pM\n", info->aid,
-                        info->bssid));
+                WL_NONE("new BSSID:\taid %d  bss:%pM\n",
+                        info->aid, info->bssid);
                 /* BSSID changed, for whatever reason (IBSS and managed mode) */
                 /* FIXME: need to store bssid in bsscfg */
                 wlc_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET,
                                   (struct ether_addr *)info->bssid);
         }
         if (changed & BSS_CHANGED_BEACON) {
-                WL_ERROR(("BSS_CHANGED_BEACON\n"));
+                WL_ERROR("BSS_CHANGED_BEACON\n");
                 /* Beacon data changed, retrieve new beacon (beaconing modes) */
         }
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                WL_ERROR(("Beacon enabled:\t%s\n",
-                          info->enable_beacon ? "True" : "False"));
+                WL_ERROR("Beacon enabled:\t%s\n",
+                         info->enable_beacon ? "True" : "False");
                 /* Beaconing should be enabled/disabled (beaconing modes) */
         }
-#ifdef WLC_HIGH_ONLY
-        WL_UNLOCK(wl);
-#endif
         return;
 }
 
@@ -511,27 +415,24 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
                         unsigned int changed_flags,
                         unsigned int *total_flags, u64 multicast)
 {
-#ifndef WLC_HIGH_ONLY
-        wl_info_t *wl = hw->priv;
-#endif
+        struct wl_info *wl = hw->priv;
 
         changed_flags &= MAC_FILTERS;
         *total_flags &= MAC_FILTERS;
         if (changed_flags & FIF_PROMISC_IN_BSS)
-                WL_ERROR(("FIF_PROMISC_IN_BSS\n"));
+                WL_ERROR("FIF_PROMISC_IN_BSS\n");
         if (changed_flags & FIF_ALLMULTI)
-                WL_ERROR(("FIF_ALLMULTI\n"));
+                WL_ERROR("FIF_ALLMULTI\n");
         if (changed_flags & FIF_FCSFAIL)
-                WL_ERROR(("FIF_FCSFAIL\n"));
+                WL_ERROR("FIF_FCSFAIL\n");
         if (changed_flags & FIF_PLCPFAIL)
-                WL_ERROR(("FIF_PLCPFAIL\n"));
+                WL_ERROR("FIF_PLCPFAIL\n");
         if (changed_flags & FIF_CONTROL)
-                WL_ERROR(("FIF_CONTROL\n"));
+                WL_ERROR("FIF_CONTROL\n");
         if (changed_flags & FIF_OTHER_BSS)
-                WL_ERROR(("FIF_OTHER_BSS\n"));
+                WL_ERROR("FIF_OTHER_BSS\n");
         if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-                WL_NONE(("FIF_BCN_PRBRESP_PROMISC\n"));
-#ifndef WLC_HIGH_ONLY
+                WL_NONE("FIF_BCN_PRBRESP_PROMISC\n");
                 WL_LOCK(wl);
                 if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
                         wl->pub->mac80211_state |= MAC80211_PROMISC_BCNS;
@@ -541,7 +442,6 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
                         wl->pub->mac80211_state &= ~MAC80211_PROMISC_BCNS;
                 }
                 WL_UNLOCK(wl);
-#endif
         }
         return;
 }
@@ -549,25 +449,25 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
 static int
 wl_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)
 {
-        WL_ERROR(("%s: Enter\n", __func__));
+        WL_ERROR("%s: Enter\n", __func__);
         return 0;
 }
 
 static void wl_ops_sw_scan_start(struct ieee80211_hw *hw)
 {
-        WL_NONE(("Scan Start\n"));
+        WL_NONE("Scan Start\n");
         return;
 }
 
 static void wl_ops_sw_scan_complete(struct ieee80211_hw *hw)
 {
-        WL_NONE(("Scan Complete\n"));
+        WL_NONE("Scan Complete\n");
         return;
 }
 
 static void wl_ops_set_tsf(struct ieee80211_hw *hw, u64 tsf)
 {
-        WL_ERROR(("%s: Enter\n", __func__));
+        WL_ERROR("%s: Enter\n", __func__);
         return;
 }
 
@@ -575,13 +475,13 @@ static int
 wl_ops_get_stats(struct ieee80211_hw *hw,
                  struct ieee80211_low_level_stats *stats)
 {
-        WL_ERROR(("%s: Enter\n", __func__));
+        WL_ERROR("%s: Enter\n", __func__);
         return 0;
 }
 
 static int wl_ops_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
-        WL_ERROR(("%s: Enter\n", __func__));
+        WL_ERROR("%s: Enter\n", __func__);
         return 0;
 }
 
@@ -589,10 +489,10 @@ static void
 wl_ops_sta_notify(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                   enum sta_notify_cmd cmd, struct ieee80211_sta *sta)
 {
-        WL_NONE(("%s: Enter\n", __func__));
+        WL_NONE("%s: Enter\n", __func__);
         switch (cmd) {
         default:
-                WL_ERROR(("%s: Uknown cmd = %d\n", __func__, cmd));
+                WL_ERROR("%s: Unknown cmd = %d\n", __func__, cmd);
                 break;
         }
         return;
@@ -602,11 +502,11 @@ static int
 wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
                const struct ieee80211_tx_queue_params *params)
 {
-        wl_info_t *wl = hw->priv;
+        struct wl_info *wl = hw->priv;
 
-        WL_NONE(("%s: Enter (WME config)\n", __func__));
-        WL_NONE(("queue %d, txop %d, cwmin %d, cwmax %d, aifs %d\n", queue,
-                 params->txop, params->cw_min, params->cw_max, params->aifs));
+        WL_NONE("%s: Enter (WME config)\n", __func__);
+        WL_NONE("queue %d, txop %d, cwmin %d, cwmax %d, aifs %d\n", queue,
+                 params->txop, params->cw_min, params->cw_max, params->aifs);
 
         WL_LOCK(wl);
         wlc_wme_setparams(wl->wlc, queue, (void *)params, true);
@@ -617,7 +517,7 @@ wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
 
 static u64 wl_ops_get_tsf(struct ieee80211_hw *hw)
 {
-        WL_ERROR(("%s: Enter\n", __func__));
+        WL_ERROR("%s: Enter\n", __func__);
         return 0;
 }
 
@@ -628,11 +528,11 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         struct scb *scb;
 
         int i;
-        wl_info_t *wl = hw->priv;
+        struct wl_info *wl = hw->priv;
 
         /* Init the scb */
         scb = (struct scb *)sta->drv_priv;
-        bzero(scb, sizeof(struct scb));
+        memset(scb, 0, sizeof(struct scb));
         for (i = 0; i < NUMPRIO; i++)
                 scb->seqctl[i] = 0xFFFF;
         scb->seqctl_nonqos = 0xFFFF;
@@ -641,20 +541,12 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         wl->pub->global_scb = scb;
         wl->pub->global_ampdu = &(scb->scb_ampdu);
         wl->pub->global_ampdu->scb = scb;
-#ifdef WLC_HIGH_ONLY
-        wl->pub->global_ampdu->max_pdu = AMPDU_NUM_MPDU;
-#else
         wl->pub->global_ampdu->max_pdu = 16;
-#endif
         pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID,
                   AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);
 
         sta->ht_cap.ht_supported = true;
-#ifdef WLC_HIGH_ONLY
-        sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_16K;
-#else
         sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_64K;
-#endif
         sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;
         sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |
             IEEE80211_HT_CAP_SGI_20 |
@@ -668,7 +560,7 @@ static int
 wl_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
               struct ieee80211_sta *sta)
 {
-        WL_NONE(("%s: Enter\n", __func__));
+        WL_NONE("%s: Enter\n", __func__);
         return 0;
 }
 
@@ -681,19 +573,19 @@ wl_ampdu_action(struct ieee80211_hw *hw,
 #if defined(BCMDBG)
         struct scb *scb = (struct scb *)sta->drv_priv;
 #endif
-        wl_info_t *wl = hw->priv;
+        struct wl_info *wl = hw->priv;
 
         ASSERT(scb->magic == SCB_MAGIC);
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
-                WL_NONE(("%s: action = IEEE80211_AMPDU_RX_START\n", __func__));
+                WL_NONE("%s: action = IEEE80211_AMPDU_RX_START\n", __func__);
                 break;
         case IEEE80211_AMPDU_RX_STOP:
-                WL_NONE(("%s: action = IEEE80211_AMPDU_RX_STOP\n", __func__));
+                WL_NONE("%s: action = IEEE80211_AMPDU_RX_STOP\n", __func__);
                 break;
         case IEEE80211_AMPDU_TX_START:
                 if (!wlc_aggregatable(wl->wlc, tid)) {
-                        /* WL_ERROR(("START: tid %d is not agg' able, return FAILURE to stack\n", tid)); */
+                        /* WL_ERROR("START: tid %d is not agg' able, return FAILURE to stack\n", tid); */
                         return -1;
                 }
                 /* XXX: Use the starting sequence number provided ... */
@@ -707,22 +599,18 @@ wl_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 /* Not sure what to do here */
                 /* Power save wakeup */
-                WL_NONE(("%s: action = IEEE80211_AMPDU_TX_OPERATIONAL\n",
-                         __func__));
+                WL_NONE("%s: action = IEEE80211_AMPDU_TX_OPERATIONAL\n",
+                        __func__);
                 break;
         default:
-                WL_ERROR(("%s: Invalid command, ignoring\n", __func__));
+                WL_ERROR("%s: Invalid command, ignoring\n", __func__);
         }
 
         return 0;
 }
 
 static const struct ieee80211_ops wl_ops = {
-#ifdef WLC_HIGH_ONLY
-        .tx = wl_ops_tx_nl,
-#else
         .tx = wl_ops_tx,
-#endif
         .start = wl_ops_start,
         .stop = wl_ops_stop,
         .add_interface = wl_ops_add_interface,
@@ -744,10 +632,10 @@ static const struct ieee80211_ops wl_ops = {
         .ampdu_action = wl_ampdu_action,
 };
 
-static int wl_set_hint(wl_info_t *wl, char *abbrev)
+static int wl_set_hint(struct wl_info *wl, char *abbrev)
 {
-        WL_ERROR(("%s: Sending country code %c%c to MAC80211\n", __func__,
-                  abbrev[0], abbrev[1]));
+        WL_ERROR("%s: Sending country code %c%c to MAC80211\n",
+                 __func__, abbrev[0], abbrev[1]);
         return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);
 }
 
@@ -762,117 +650,61 @@ static int wl_set_hint(wl_info_t *wl, char *abbrev)
  * a warning that this function is defined but not used if we declare
  * it as static.
  */
-static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
+static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
                             uint bustype, void *btparam, uint irq)
 {
-        wl_info_t *wl;
-        osl_t *osh;
+        struct wl_info *wl;
+        struct osl_info *osh;
         int unit, err;
 
         unsigned long base_addr;
         struct ieee80211_hw *hw;
         u8 perm[ETH_ALEN];
 
-        unit = wl_found + instance_base;
+        unit = wl_found;
         err = 0;
 
         if (unit < 0) {
-                WL_ERROR(("wl%d: unit number overflow, exiting\n", unit));
+                WL_ERROR("wl%d: unit number overflow, exiting\n", unit);
                 return NULL;
         }
 
-        if (oneonly && (unit != instance_base)) {
-                WL_ERROR(("wl%d: wl_attach: oneonly is set, exiting\n", unit));
-                return NULL;
-        }
-
-        /* Requires pkttag feature */
-        osh = osl_attach(btparam, bustype, true);
+        osh = osl_attach(btparam, bustype);
         ASSERT(osh);
 
-#ifdef WLC_HIGH_ONLY
-        hw = ieee80211_alloc_hw(sizeof(wl_info_t), &wl_ops);
-        if (!hw) {
-                WL_ERROR(("%s: ieee80211_alloc_hw failed\n", __func__));
-                ASSERT(0);
-        }
-
-        bzero(hw->priv, sizeof(*wl));
-        wl = hw->priv;
-#else
         /* allocate private info */
         hw = pci_get_drvdata(btparam);  /* btparam == pdev */
         wl = hw->priv;
-#endif
         ASSERT(wl);
 
-        wl->magic = WL_MAGIC;
         wl->osh = osh;
         atomic_set(&wl->callbacks, 0);
 
         /* setup the bottom half handler */
         tasklet_init(&wl->tasklet, wl_dpc, (unsigned long) wl);
 
-#ifdef WLC_HIGH_ONLY
-        wl->rpc_th = bcm_rpc_tp_attach(osh, NULL);
-        if (wl->rpc_th == NULL) {
-                WL_ERROR(("wl%d: %s: bcm_rpc_tp_attach failed!\n", unit,
-                          __func__));
-                goto fail;
-        }
-
-        wl->rpc = bcm_rpc_attach(NULL, osh, wl->rpc_th);
-        if (wl->rpc == NULL) {
-                WL_ERROR(("wl%d: %s: bcm_rpc_attach failed!\n", unit,
-                          __func__));
-                goto fail;
-        }
-
-        /* init tx work queue for wl_start/send pkt; no need to destroy workitem  */
-        INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork);
-        wl->txq_task.context = wl;
-#endif                          /* WLC_HIGH_ONLY */
 
-#ifdef BCMSDIO
-        SET_IEEE80211_DEV(hw, sdiommc_dev);
-#endif
 
         base_addr = regs;
 
         if (bustype == PCI_BUS) {
-                /* piomode can be overwritten by command argument */
-                wl->piomode = piomode;
-                WL_TRACE(("PCI/%s\n", wl->piomode ? "PIO" : "DMA"));
+                wl->piomode = false;
         } else if (bustype == RPC_BUS) {
                 /* Do nothing */
         } else {
                 bustype = PCI_BUS;
-                WL_TRACE(("force to PCI\n"));
+                WL_TRACE("force to PCI\n");
         }
         wl->bcm_bustype = bustype;
 
-#ifdef WLC_HIGH_ONLY
-        if (wl->bcm_bustype == RPC_BUS) {
-                wl->regsva = (void *)0;
-                btparam = wl->rpc;
-        } else
-#endif
         wl->regsva = ioremap_nocache(base_addr, PCI_BAR0_WINSZ);
         if (wl->regsva == NULL) {
-                WL_ERROR(("wl%d: ioremap() failed\n", unit));
+                WL_ERROR("wl%d: ioremap() failed\n", unit);
                 goto fail;
         }
-#ifdef WLC_HIGH_ONLY
-        spin_lock_init(&wl->rpcq_lock);
-        spin_lock_init(&wl->txq_lock);
-
-        sema_init(&wl->sem, 1);
-#else
         spin_lock_init(&wl->lock);
         spin_lock_init(&wl->isr_lock);
-#endif
 
-#ifndef WLC_HIGH_ONLY
         /* prepare ucode */
         if (wl_request_fw(wl, (struct pci_dev *)btparam)) {
                 printf("%s: Failed to find firmware usually in %s\n",
@@ -881,17 +713,14 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
                 wl_remove((struct pci_dev *)btparam);
                 goto fail1;
         }
-#endif
 
         /* common load-time initialization */
         wl->wlc = wlc_attach((void *)wl, vendor, device, unit, wl->piomode, osh,
                              wl->regsva, wl->bcm_bustype, btparam, &err);
-#ifndef WLC_HIGH_ONLY
         wl_release_fw(wl);
-#endif
         if (!wl->wlc) {
-                printf("%s: %s wlc_attach() failed with code %d\n",
-                        KBUILD_MODNAME, EPI_VERSION_STR, err);
+                printf("%s: wlc_attach() failed with code %d\n",
+                        KBUILD_MODNAME, err);
                 goto fail;
         }
         wl->pub = wlc_pub(wl->wlc);
@@ -900,52 +729,35 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
         ASSERT(wl->pub->ieee_hw);
         ASSERT(wl->pub->ieee_hw->priv == wl);
 
-#ifdef WLC_HIGH_ONLY
-        REGOPSSET(osh, (osl_rreg_fn_t) wlc_reg_read,
-                  (osl_wreg_fn_t) wlc_reg_write, wl->wlc);
-        wl->rpc_dispatch_ctx.rpc = wl->rpc;
-        wl->rpc_dispatch_ctx.wlc = wl->wlc;
-        bcm_rpc_rxcb_init(wl->rpc, wl, wl_rpc_dispatch_schedule, wl,
-                          wl_rpc_down, NULL, NULL);
-#endif                          /* WLC_HIGH_ONLY */
-
-        if (nompc) {
-                if (wlc_iovar_setint(wl->wlc, "mpc", 0)) {
-                        WL_ERROR(("wl%d: Error setting MPC variable to 0\n",
-                                  unit));
-                }
+
+        if (wlc_iovar_setint(wl->wlc, "mpc", 0)) {
+                WL_ERROR("wl%d: Error setting MPC variable to 0\n", unit);
         }
-#ifdef BCMSDIO
-        /* Set SDIO drive strength */
-        wlc_iovar_setint(wl->wlc, "sd_drivestrength", sd_drivestrength);
-#endif
 
-#ifdef WLC_LOW
         /* register our interrupt handler */
         if (request_irq(irq, wl_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {
-                WL_ERROR(("wl%d: request_irq() failed\n", unit));
+                WL_ERROR("wl%d: request_irq() failed\n", unit);
                 goto fail;
         }
         wl->irq = irq;
-#endif                          /* WLC_LOW */
 
         /* register module */
         wlc_module_register(wl->pub, NULL, "linux", wl, NULL, wl_linux_watchdog,
                             NULL);
 
         if (ieee_hw_init(hw)) {
-                WL_ERROR(("wl%d: %s: ieee_hw_init failed!\n", unit, __func__));
+                WL_ERROR("wl%d: %s: ieee_hw_init failed!\n", unit, __func__);
                 goto fail;
         }
 
-        bcopy(&wl->pub->cur_etheraddr, perm, ETHER_ADDR_LEN);
+        bcopy(&wl->pub->cur_etheraddr, perm, ETH_ALEN);
         ASSERT(is_valid_ether_addr(perm));
         SET_IEEE80211_PERM_ADDR(hw, perm);
 
         err = ieee80211_register_hw(hw);
         if (err) {
-                WL_ERROR(("%s: ieee80211_register_hw failed, status %d\n",
-                          __func__, err));
+                WL_ERROR("%s: ieee80211_register_hw failed, status %d\n",
+                         __func__, err);
         }
 
         if (wl->pub->srom_ccode[0])
@@ -953,19 +765,14 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
         else
                 err = wl_set_hint(wl, "US");
         if (err) {
-                WL_ERROR(("%s: regulatory_hint failed, status %d\n", __func__,
-                          err));
-        }
-#ifndef WLC_HIGH_ONLY
-        WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver "
-                  EPI_VERSION_STR " (" PHY_VERSION_STR ")", unit));
-#else
-        WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver "
-                  EPI_VERSION_STR, unit));
-#endif
+                WL_ERROR("%s: regulatory_hint failed, status %d\n",
+                         __func__, err);
+        }
+        WL_ERROR("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver (" PHY_VERSION_STR ")",
+                 unit);
 
 #ifdef BCMDBG
-        printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
+        printf(" (Compiled at " __TIME__ " on " __DATE__ ")");
 #endif                          /* BCMDBG */
         printf("\n");
 
@@ -978,54 +785,6 @@ fail1:
         return NULL;
 }
 
-#ifdef WLC_HIGH_ONLY
-static void *wl_dbus_probe_cb(void *arg, const char *desc, u32 bustype,
-                              u32 hdrlen)
-{
-        wl_info_t *wl;
-        WL_ERROR(("%s:\n", __func__));
-
-        wl = wl_attach(BCM_DNGL_VID, BCM_DNGL_BDC_PID, (unsigned long) NULL, RPC_BUS,
-                NULL, 0);
-        if (!wl) {
-                WL_ERROR(("%s: wl_attach failed\n", __func__));
-        }
-
-        /* This is later passed to wl_dbus_disconnect_cb */
-        return wl;
-}
-
-static void wl_dbus_disconnect_cb(void *arg)
-{
-        wl_info_t *wl = arg;
-
-        WL_ERROR(("%s:\n", __func__));
-
-        if (wl) {
-#ifdef WLC_HIGH_ONLY
-                if (wl->pub->ieee_hw) {
-                        ieee80211_unregister_hw(wl->pub->ieee_hw);
-                        WL_ERROR(("%s: Back from down\n", __func__));
-                }
-                wlc_device_removed(wl->wlc);
-                wlc_bmac_dngl_reboot(wl->rpc);
-                bcm_rpc_down(wl->rpc);
-#endif
-                WL_LOCK(wl);
-                wl_down(wl);
-                WL_UNLOCK(wl);
-#ifdef WLC_HIGH_ONLY
-                if (wl->pub->ieee_hw) {
-                        ieee80211_free_hw(wl->pub->ieee_hw);
-                        WL_ERROR(("%s: Back from ieee80211_free_hw\n",
-                                  __func__));
-                        wl->pub->ieee_hw = NULL;
-                }
-#endif
-                wl_free(wl);
-        }
-}
-#endif                          /* WLC_HIGH_ONLY */
 
 
 #define CHAN2GHZ(channel, freqency, chflags)  { \
@@ -1163,29 +922,13 @@ static struct ieee80211_supported_band wl_band_2GHz_nphy = {
                    .cap = IEEE80211_HT_CAP_GRN_FLD |
                    IEEE80211_HT_CAP_SGI_20 |
                    IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,
-#ifdef WLC_HIGH_ONLY
-                   .ht_supported = true,
-                   .ampdu_factor = AMPDU_RX_FACTOR_16K,
-#else
                    .ht_supported = true,
                    .ampdu_factor = AMPDU_RX_FACTOR_64K,
-#endif
                    .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
                    .mcs = {
                            /* placeholders for now */
-#ifdef WLC_HIGH_ONLY
-                           /*
-                            * rx_mask[0] = 0xff by default
-                            * rx_mask[1] = 0xff if number of rx chain >=2
-                            * rx_mask[2] = 0xff if number of rx chain >=3
-                            * rx_mask[4] = 1 if 40Mhz is supported
-                            */
-                           .rx_mask = {0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-                           .rx_highest = 72,    /* max rate of single stream */
-#else
                            .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
                            .rx_highest = 500,
-#endif
                            .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
                    }
 };
@@ -1212,7 +955,7 @@ static struct ieee80211_supported_band wl_band_5GHz_nphy = {
 
 static int ieee_hw_rate_init(struct ieee80211_hw *hw)
 {
-        wl_info_t *wl = HW_TO_WL(hw);
+        struct wl_info *wl = HW_TO_WL(hw);
         int has_5g;
         char phy_list[4];
 
@@ -1222,20 +965,16 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)
         hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
 
         if (wlc_get(wl->wlc, WLC_GET_PHYLIST, (int *)&phy_list) < 0) {
-                WL_ERROR(("Phy list failed\n"));
+                WL_ERROR("Phy list failed\n");
         }
-        WL_NONE(("%s: phylist = %c\n", __func__, phy_list[0]));
+        WL_NONE("%s: phylist = %c\n", __func__, phy_list[0]);
 
-#ifndef WLC_HIGH_ONLY
         if (phy_list[0] == 'n' || phy_list[0] == 'c') {
                 if (phy_list[0] == 'c') {
                         /* Single stream */
                         wl_band_2GHz_nphy.ht_cap.mcs.rx_mask[1] = 0;
                         wl_band_2GHz_nphy.ht_cap.mcs.rx_highest = 72;
                 }
-#else
-        if (phy_list[0] == 's') {
-#endif
                 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl_band_2GHz_nphy;
         } else {
                 BUG();
@@ -1245,11 +984,7 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)
         /* Assume all bands use the same phy.  True for 11n devices. */
         if (NBANDS_PUB(wl->pub) > 1) {
                 has_5g++;
-#ifndef WLC_HIGH_ONLY
                 if (phy_list[0] == 'n' || phy_list[0] == 'c') {
-#else
-                if (phy_list[0] == 's') {
-#endif
                         hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
                             &wl_band_5GHz_nphy;
                 } else {
@@ -1257,7 +992,7 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)
                 }
         }
 
-        WL_NONE(("%s: 2ghz = %d, 5ghz = %d\n", __func__, 1, has_5g));
+        WL_NONE("%s: 2ghz = %d, 5ghz = %d\n", __func__, 1, has_5g);
 
         return 0;
 }
@@ -1288,7 +1023,6 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
         return ieee_hw_rate_init(hw);
 }
 
-#ifndef BCMSDIO
 /**
  * determines if a device is a WL device, and if so, attaches it.
  *
@@ -1300,15 +1034,15 @@ int __devinit
 wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int rc;
-        wl_info_t *wl;
+        struct wl_info *wl;
         struct ieee80211_hw *hw;
         u32 val;
 
         ASSERT(pdev);
 
-        WL_TRACE(("%s: bus %d slot %d func %d irq %d\n", __func__,
-                  pdev->bus->number, PCI_SLOT(pdev->devfn),
-                  PCI_FUNC(pdev->devfn), pdev->irq));
+        WL_TRACE("%s: bus %d slot %d func %d irq %d\n",
+                 __func__, pdev->bus->number, PCI_SLOT(pdev->devfn),
+                 PCI_FUNC(pdev->devfn), pdev->irq);
 
         if ((pdev->vendor != PCI_VENDOR_ID_BROADCOM) ||
             (((pdev->device & 0xff00) != 0x4300) &&
@@ -1318,9 +1052,9 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         rc = pci_enable_device(pdev);
         if (rc) {
-                WL_ERROR(("%s: Cannot enable device %d-%d_%d\n", __func__,
-                          pdev->bus->number, PCI_SLOT(pdev->devfn),
-                          PCI_FUNC(pdev->devfn)));
+                WL_ERROR("%s: Cannot enable device %d-%d_%d\n",
+                         __func__, pdev->bus->number, PCI_SLOT(pdev->devfn),
+                         PCI_FUNC(pdev->devfn));
                 return -ENODEV;
         }
         pci_set_master(pdev);
@@ -1329,9 +1063,9 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if ((val & 0x0000ff00) != 0)
                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
-        hw = ieee80211_alloc_hw(sizeof(wl_info_t), &wl_ops);
+        hw = ieee80211_alloc_hw(sizeof(struct wl_info), &wl_ops);
         if (!hw) {
-                WL_ERROR(("%s: ieee80211_alloc_hw failed\n", __func__));
+                WL_ERROR("%s: ieee80211_alloc_hw failed\n", __func__);
                 rc = -ENOMEM;
                 goto err_1;
         }
@@ -1340,34 +1074,34 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, hw);
 
-        bzero(hw->priv, sizeof(*wl));
+        memset(hw->priv, 0, sizeof(*wl));
 
         wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0),
                        PCI_BUS, pdev, pdev->irq);
 
         if (!wl) {
-                WL_ERROR(("%s: %s: wl_attach failed!\n",
-                        KBUILD_MODNAME, __func__));
+                WL_ERROR("%s: %s: wl_attach failed!\n",
+                         KBUILD_MODNAME, __func__);
                 return -ENODEV;
         }
         return 0;
  err_1:
-        WL_ERROR(("%s: err_1: Major hoarkage\n", __func__));
+        WL_ERROR("%s: err_1: Major hoarkage\n", __func__);
         return 0;
 }
 
 #ifdef LINUXSTA_PS
 static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
 {
-        wl_info_t *wl;
+        struct wl_info *wl;
         struct ieee80211_hw *hw;
 
-        WL_TRACE(("wl: wl_suspend\n"));
+        WL_TRACE("wl: wl_suspend\n");
 
         hw = pci_get_drvdata(pdev);
         wl = HW_TO_WL(hw);
         if (!wl) {
-                WL_ERROR(("wl: wl_suspend: pci_get_drvdata failed\n"));
+                WL_ERROR("wl: wl_suspend: pci_get_drvdata failed\n");
                 return -ENODEV;
         }
 
@@ -1382,16 +1116,16 @@ static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
 
 static int wl_resume(struct pci_dev *pdev)
 {
-        wl_info_t *wl;
+        struct wl_info *wl;
         struct ieee80211_hw *hw;
         int err = 0;
         u32 val;
 
-        WL_TRACE(("wl: wl_resume\n"));
+        WL_TRACE("wl: wl_resume\n");
         hw = pci_get_drvdata(pdev);
         wl = HW_TO_WL(hw);
         if (!wl) {
-                WL_ERROR(("wl: wl_resume: pci_get_drvdata failed\n"));
+                WL_ERROR("wl: wl_resume: pci_get_drvdata failed\n");
                 return -ENODEV;
         }
 
@@ -1421,17 +1155,17 @@ static int wl_resume(struct pci_dev *pdev)
 
 static void wl_remove(struct pci_dev *pdev)
 {
-        wl_info_t *wl;
+        struct wl_info *wl;
         struct ieee80211_hw *hw;
 
         hw = pci_get_drvdata(pdev);
         wl = HW_TO_WL(hw);
         if (!wl) {
-                WL_ERROR(("wl: wl_remove: pci_get_drvdata failed\n"));
+                WL_ERROR("wl: wl_remove: pci_get_drvdata failed\n");
                 return;
         }
         if (!wlc_chipmatch(pdev->vendor, pdev->device)) {
-                WL_ERROR(("wl: wl_remove: wlc_chipmatch failed\n"));
+                WL_ERROR("wl: wl_remove: wlc_chipmatch failed\n");
                 return;
         }
         if (wl->wlc) {
@@ -1439,7 +1173,7 @@ static void wl_remove(struct pci_dev *pdev)
                 WL_LOCK(wl);
                 wl_down(wl);
                 WL_UNLOCK(wl);
-                WL_NONE(("%s: Down\n", __func__));
+                WL_NONE("%s: Down\n", __func__);
         }
         pci_disable_device(pdev);
 
@@ -1459,7 +1193,6 @@ static struct pci_driver wl_pci_driver = {
  .remove   = __devexit_p(wl_remove),
  .id_table = wl_id_table,
 };
-#endif                          /* !BCMSDIO */
 
 /**
  * This is the main entry point for the WL driver.
@@ -1480,7 +1213,6 @@ static int __init wl_module_init(void)
                 if (var)
                         wl_msg_level = simple_strtoul(var, NULL, 0);
         }
-#ifndef WLC_HIGH_ONLY
         {
                 extern u32 phyhal_msg_level;
 
@@ -1492,25 +1224,13 @@ static int __init wl_module_init(void)
                                 phyhal_msg_level = simple_strtoul(var, NULL, 0);
                 }
         }
-#endif                          /* WLC_HIGH_ONLY */
 #endif                          /* BCMDBG */
 
-#ifndef BCMSDIO
         error = pci_register_driver(&wl_pci_driver);
         if (!error)
                 return 0;
 
-#endif                          /* !BCMSDIO */
 
-#ifdef WLC_HIGH_ONLY
-        /* BMAC_NOTE: define hardcode number, why NODEVICE is ok ? */
-        error =
-            dbus_register(BCM_DNGL_VID, 0, wl_dbus_probe_cb,
-                          wl_dbus_disconnect_cb, NULL, NULL, NULL);
-        if (error == DBUS_ERR_NODEVICE) {
-                error = DBUS_OK;
-        }
-#endif                          /* WLC_HIGH_ONLY */
 
         return error;
 }
@@ -1524,13 +1244,8 @@ static int __init wl_module_init(void)
  */
 static void __exit wl_module_exit(void)
 {
-#ifndef BCMSDIO
         pci_unregister_driver(&wl_pci_driver);
-#endif                          /* !BCMSDIO */
 
-#ifdef WLC_HIGH_ONLY
-        dbus_deregister();
-#endif                          /* WLC_HIGH_ONLY */
 }
 
 module_init(wl_module_init);
@@ -1543,19 +1258,17 @@ module_exit(wl_module_exit);
  * by the wl parameter.
  *
  */
-void wl_free(wl_info_t *wl)
+void wl_free(struct wl_info *wl)
 {
         wl_timer_t *t, *next;
-        osl_t *osh;
+        struct osl_info *osh;
 
         ASSERT(wl);
-#ifndef WLC_HIGH_ONLY
         /* free ucode data */
         if (wl->fw.fw_cnt)
                 wl_ucode_data_free();
         if (wl->irq)
                 free_irq(wl->irq, wl);
-#endif
 
         /* kill dpc */
         tasklet_kill(&wl->tasklet);
@@ -1593,103 +1306,50 @@ void wl_free(wl_info_t *wl)
          * unregister_netdev() calls get_stats() which may read chip registers
          * so we cannot unmap the chip registers until after calling unregister_netdev() .
          */
-        if (wl->regsva && BUSTYPE(wl->bcm_bustype) != SDIO_BUS &&
-            BUSTYPE(wl->bcm_bustype) != JTAG_BUS) {
+        if (wl->regsva && wl->bcm_bustype != SDIO_BUS &&
+            wl->bcm_bustype != JTAG_BUS) {
                 iounmap((void *)wl->regsva);
         }
         wl->regsva = NULL;
 
-#ifdef WLC_HIGH_ONLY
-        wl_rpcq_free(wl);
-
-        wl_txq_free(wl);
-
-        if (wl->rpc) {
-                bcm_rpc_detach(wl->rpc);
-                wl->rpc = NULL;
-        }
-
-        if (wl->rpc_th) {
-                bcm_rpc_tp_detach(wl->rpc_th);
-                wl->rpc_th = NULL;
-        }
-#endif                          /* WLC_HIGH_ONLY */
 
         osl_detach(osh);
 }
 
-#ifdef WLC_LOW
 /* transmit a packet */
-static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl)
+static int BCMFASTPATH wl_start(struct sk_buff *skb, struct wl_info *wl)
 {
         if (!wl)
                 return -ENETDOWN;
 
         return wl_start_int(wl, WL_TO_HW(wl), skb);
 }
-#endif                          /* WLC_LOW */
 
 static int BCMFASTPATH
-wl_start_int(wl_info_t *wl, struct ieee80211_hw *hw, struct sk_buff *skb)
+wl_start_int(struct wl_info *wl, struct ieee80211_hw *hw, struct sk_buff *skb)
 {
-#ifdef WLC_HIGH_ONLY
-        WL_LOCK(wl);
-#endif
         wlc_sendpkt_mac80211(wl->wlc, skb, hw);
-#ifdef WLC_HIGH_ONLY
-        WL_UNLOCK(wl);
-#endif
         return NETDEV_TX_OK;
 }
 
-void wl_txflowcontrol(wl_info_t *wl, struct wl_if *wlif, bool state, int prio)
+void wl_txflowcontrol(struct wl_info *wl, struct wl_if *wlif, bool state,
+                      int prio)
 {
-        WL_ERROR(("Shouldn't be here %s\n", __func__));
+        WL_ERROR("Shouldn't be here %s\n", __func__);
 }
 
-#if defined(WLC_HIGH_ONLY)
-/* Schedule a completion handler to run at safe time */
-static int
-wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *task),
-                 void *context)
+void wl_init(struct wl_info *wl)
 {
-        wl_task_t *task;
-
-        WL_TRACE(("wl%d: wl_schedule_task\n", wl->pub->unit));
-
-        task = kmalloc(sizeof(wl_task_t), GFP_ATOMIC);
-        if (!task) {
-                WL_ERROR(("wl%d: wl_schedule_task: out of memory\n", wl->pub->unit));
-                return -ENOMEM;
-        }
-
-        INIT_WORK(&task->work, (work_func_t) fn);
-        task->context = context;
-
-        if (!schedule_work(&task->work)) {
-                WL_ERROR(("wl%d: schedule_work() failed\n", wl->pub->unit));
-                kfree(task);
-                return -ENOMEM;
-        }
-
-        atomic_inc(&wl->callbacks);
-
-        return 0;
-}
-#endif                          /* defined(WLC_HIGH_ONLY) */
-
-void wl_init(wl_info_t *wl)
-{
-        WL_TRACE(("wl%d: wl_init\n", wl->pub->unit));
+        WL_TRACE("wl%d: wl_init\n", wl->pub->unit);
 
         wl_reset(wl);
 
         wlc_init(wl->wlc);
 }
 
-uint wl_reset(wl_info_t *wl)
+uint wl_reset(struct wl_info *wl)
 {
-        WL_TRACE(("wl%d: wl_reset\n", wl->pub->unit));
+        WL_TRACE("wl%d: wl_reset\n", wl->pub->unit);
 
         wlc_reset(wl->wlc);
 
@@ -1703,25 +1363,22 @@ uint wl_reset(wl_info_t *wl)
  * These are interrupt on/off entry points. Disable interrupts
  * during interrupt state transition.
  */
-void BCMFASTPATH wl_intrson(wl_info_t *wl)
+void BCMFASTPATH wl_intrson(struct wl_info *wl)
 {
-#if defined(WLC_LOW)
         unsigned long flags;
 
         INT_LOCK(wl, flags);
         wlc_intrson(wl->wlc);
         INT_UNLOCK(wl, flags);
-#endif                          /* WLC_LOW */
 }
 
-bool wl_alloc_dma_resources(wl_info_t *wl, uint addrwidth)
+bool wl_alloc_dma_resources(struct wl_info *wl, uint addrwidth)
 {
         return true;
 }
 
-u32 BCMFASTPATH wl_intrsoff(wl_info_t *wl)
+u32 BCMFASTPATH wl_intrsoff(struct wl_info *wl)
 {
-#if defined(WLC_LOW)
         unsigned long flags;
         u32 status;
 
@@ -1729,23 +1386,18 @@ u32 BCMFASTPATH wl_intrsoff(wl_info_t *wl)
         status = wlc_intrsoff(wl->wlc);
         INT_UNLOCK(wl, flags);
         return status;
-#else
-        return 0;
-#endif                          /* WLC_LOW */
 }
 
-void wl_intrsrestore(wl_info_t *wl, u32 macintmask)
+void wl_intrsrestore(struct wl_info *wl, u32 macintmask)
 {
-#if defined(WLC_LOW)
         unsigned long flags;
 
         INT_LOCK(wl, flags);
         wlc_intrsrestore(wl->wlc, macintmask);
         INT_UNLOCK(wl, flags);
-#endif                          /* WLC_LOW */
 }
 
-int wl_up(wl_info_t *wl)
+int wl_up(struct wl_info *wl)
 {
         int error = 0;
 
@@ -1757,7 +1409,7 @@ int wl_up(wl_info_t *wl)
         return error;
 }
 
-void wl_down(wl_info_t *wl)
+void wl_down(struct wl_info *wl)
 {
         uint callbacks, ret_val = 0;
 
@@ -1768,24 +1420,21 @@ void wl_down(wl_info_t *wl)
         /* wait for down callbacks to complete */
         WL_UNLOCK(wl);
 
-#ifndef WLC_HIGH_ONLY
         /* For HIGH_only driver, it's important to actually schedule other work,
          * not just spin wait since everything runs at schedule level
          */
         SPINWAIT((atomic_read(&wl->callbacks) > callbacks), 100 * 1000);
-#endif                          /* WLC_HIGH_ONLY */
 
         WL_LOCK(wl);
 }
 
 irqreturn_t BCMFASTPATH wl_isr(int irq, void *dev_id)
 {
-#if defined(WLC_LOW)
-        wl_info_t *wl;
+        struct wl_info *wl;
         bool ours, wantdpc;
         unsigned long flags;
 
-        wl = (wl_info_t *) dev_id;
+        wl = (struct wl_info *) dev_id;
 
         WL_ISRLOCK(wl, flags);
 
@@ -1805,17 +1454,13 @@ irqreturn_t BCMFASTPATH wl_isr(int irq, void *dev_id)
         WL_ISRUNLOCK(wl, flags);
 
         return IRQ_RETVAL(ours);
-#else
-        return IRQ_RETVAL(0);
-#endif                          /* WLC_LOW */
 }
 
 static void BCMFASTPATH wl_dpc(unsigned long data)
 {
-#ifdef WLC_LOW
-        wl_info_t *wl;
+        struct wl_info *wl;
 
-        wl = (wl_info_t *) data;
+        wl = (struct wl_info *) data;
 
         WL_LOCK(wl);
 
@@ -1846,20 +1491,19 @@ static void BCMFASTPATH wl_dpc(unsigned long data)
 
  done:
         WL_UNLOCK(wl);
-#endif                          /* WLC_LOW */
 }
 
-static void wl_link_up(wl_info_t *wl, char *ifname)
+static void wl_link_up(struct wl_info *wl, char *ifname)
 {
-        WL_ERROR(("wl%d: link up (%s)\n", wl->pub->unit, ifname));
+        WL_ERROR("wl%d: link up (%s)\n", wl->pub->unit, ifname);
 }
 
-static void wl_link_down(wl_info_t *wl, char *ifname)
+static void wl_link_down(struct wl_info *wl, char *ifname)
 {
-        WL_ERROR(("wl%d: link down (%s)\n", wl->pub->unit, ifname));
+        WL_ERROR("wl%d: link down (%s)\n", wl->pub->unit, ifname);
 }
 
-void wl_event(wl_info_t *wl, char *ifname, wlc_event_t *e)
+void wl_event(struct wl_info *wl, char *ifname, wlc_event_t *e)
 {
 
         switch (e->event.event_type) {
@@ -1877,12 +1521,7 @@ void wl_event(wl_info_t *wl, char *ifname, wlc_event_t *e)
 
 static void wl_timer(unsigned long data)
 {
-#ifndef WLC_HIGH_ONLY
         _wl_timer((wl_timer_t *) data);
-#else
-        wl_timer_t *t = (wl_timer_t *) data;
-        wl_schedule_task(t->wl, wl_timer_task, t);
-#endif                          /* WLC_HIGH_ONLY */
 }
 
 static void _wl_timer(wl_timer_t *t)
@@ -1906,18 +1545,18 @@ static void _wl_timer(wl_timer_t *t)
         WL_UNLOCK(t->wl);
 }
 
-wl_timer_t *wl_init_timer(wl_info_t *wl, void (*fn) (void *arg), void *arg,
+wl_timer_t *wl_init_timer(struct wl_info *wl, void (*fn) (void *arg), void *arg,
                           const char *name)
 {
         wl_timer_t *t;
 
         t = kmalloc(sizeof(wl_timer_t), GFP_ATOMIC);
         if (!t) {
-                WL_ERROR(("wl%d: wl_init_timer: out of memory\n", wl->pub->unit));
+                WL_ERROR("wl%d: wl_init_timer: out of memory\n", wl->pub->unit);
                 return 0;
         }
 
-        bzero(t, sizeof(wl_timer_t));
+        memset(t, 0, sizeof(wl_timer_t));
 
         init_timer(&t->timer);
         t->timer.data = (unsigned long) t;
@@ -1940,12 +1579,12 @@ wl_timer_t *wl_init_timer(wl_info_t *wl, void (*fn) (void *arg), void *arg,
 /* BMAC_NOTE: Add timer adds only the kernel timer since it's going to be more accurate
  * as well as it's easier to make it periodic
  */
-void wl_add_timer(wl_info_t *wl, wl_timer_t *t, uint ms, int periodic)
+void wl_add_timer(struct wl_info *wl, wl_timer_t *t, uint ms, int periodic)
 {
 #ifdef BCMDBG
         if (t->set) {
-                WL_ERROR(("%s: Already set. Name: %s, per %d\n",
-                          __func__, t->name, periodic));
+                WL_ERROR("%s: Already set. Name: %s, per %d\n",
+                         __func__, t->name, periodic);
         }
 #endif
         ASSERT(!t->set);
@@ -1960,7 +1599,7 @@ void wl_add_timer(wl_info_t *wl, wl_timer_t *t, uint ms, int periodic)
 }
 
 /* return true if timer successfully deleted, false if still pending */
-bool wl_del_timer(wl_info_t *wl, wl_timer_t *t)
+bool wl_del_timer(struct wl_info *wl, wl_timer_t *t)
 {
         if (t->set) {
                 t->set = false;
@@ -1973,7 +1612,7 @@ bool wl_del_timer(wl_info_t *wl, wl_timer_t *t)
         return true;
 }
 
-void wl_free_timer(wl_info_t *wl, wl_timer_t *t)
+void wl_free_timer(struct wl_info *wl, wl_timer_t *t)
 {
         wl_timer_t *tmp;
 
@@ -2009,7 +1648,7 @@ void wl_free_timer(wl_info_t *wl, wl_timer_t *t)
 
 static int wl_linux_watchdog(void *ctx)
 {
-        wl_info_t *wl = (wl_info_t *) ctx;
+        struct wl_info *wl = (struct wl_info *) ctx;
         struct net_device_stats *stats = NULL;
         uint id;
         /* refresh stats */
@@ -2049,233 +1688,12 @@ struct wl_fw_hdr {
         u32 idx;
 };
 
-#ifdef WLC_HIGH_ONLY
-static void wl_rpc_down(void *wlh)
-{
-        wl_info_t *wl = (wl_info_t *) (wlh);
-
-        wlc_device_removed(wl->wlc);
-
-        wl_rpcq_free(wl);
-}
-
-static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl)
-{
-
-        unsigned long flags;
-
-        skb->prev = NULL;
-
-        /* Lock the queue as tasklet could be running at this time */
-        TXQ_LOCK(wl, flags);
-        if (wl->txq_head == NULL)
-                wl->txq_head = skb;
-        else {
-                wl->txq_tail->prev = skb;
-        }
-        wl->txq_tail = skb;
-
-        if (wl->txq_dispatched == false) {
-                wl->txq_dispatched = true;
-
-                if (schedule_work(&wl->txq_task.work)) {
-                        atomic_inc(&wl->callbacks);
-                } else {
-                        WL_ERROR(("wl%d: wl_start/schedule_work failed\n",
-                                  wl->pub->unit));
-                }
-        }
-
-        TXQ_UNLOCK(wl, flags);
-
-        return 0;
-
-}
-
-static void wl_start_txqwork(struct wl_task *task)
-{
-        wl_info_t *wl = (wl_info_t *) task->context;
-        struct sk_buff *skb;
-        unsigned long flags;
-        uint count = 0;
-
-        WL_TRACE(("wl%d: wl_start_txqwork\n", wl->pub->unit));
-
-        /* First remove an entry then go for execution */
-        TXQ_LOCK(wl, flags);
-        while (wl->txq_head) {
-                skb = wl->txq_head;
-                wl->txq_head = skb->prev;
-                skb->prev = NULL;
-                if (wl->txq_head == NULL)
-                        wl->txq_tail = NULL;
-                TXQ_UNLOCK(wl, flags);
-
-                /* it has WL_LOCK/WL_UNLOCK inside */
-                wl_start_int(wl, WL_TO_HW(wl), skb);
-
-                /* bounded our execution, reshedule ourself next */
-                if (++count >= 10)
-                        break;
-
-                TXQ_LOCK(wl, flags);
-        }
-
-        if (count >= 10) {
-                if (!schedule_work(&wl->txq_task.work)) {
-                        WL_ERROR(("wl%d: wl_start/schedule_work failed\n",
-                                  wl->pub->unit));
-                        atomic_dec(&wl->callbacks);
-                }
-        } else {
-                wl->txq_dispatched = false;
-                TXQ_UNLOCK(wl, flags);
-                atomic_dec(&wl->callbacks);
-        }
-
-        return;
-}
-
-static void wl_txq_free(wl_info_t *wl)
-{
-        struct sk_buff *skb;
-
-        if (wl->txq_head == NULL) {
-                ASSERT(wl->txq_tail == NULL);
-                return;
-        }
-
-        while (wl->txq_head) {
-                skb = wl->txq_head;
-                wl->txq_head = skb->prev;
-                PKTFREE(wl->osh, skb, true);
-        }
-
-        wl->txq_tail = NULL;
-}
-
-static void wl_rpcq_free(wl_info_t *wl)
-{
-        rpc_buf_t *buf;
-
-        if (wl->rpcq_head == NULL) {
-                ASSERT(wl->rpcq_tail == NULL);
-                return;
-        }
-
-        while (wl->rpcq_head) {
-                buf = wl->rpcq_head;
-                wl->rpcq_head = bcm_rpc_buf_next_get(wl->rpc_th, buf);
-                bcm_rpc_buf_free(wl->rpc_dispatch_ctx.rpc, buf);
-        }
-
-        wl->rpcq_tail = NULL;
-}
-
-static void wl_rpcq_dispatch(struct wl_task *task)
-{
-        wl_info_t *wl = (wl_info_t *) task->context;
-        rpc_buf_t *buf;
-        unsigned long flags;
-
-        /* First remove an entry then go for execution */
-        RPCQ_LOCK(wl, flags);
-        while (wl->rpcq_head) {
-                buf = wl->rpcq_head;
-                wl->rpcq_head = bcm_rpc_buf_next_get(wl->rpc_th, buf);
-
-                if (wl->rpcq_head == NULL)
-                        wl->rpcq_tail = NULL;
-                RPCQ_UNLOCK(wl, flags);
-
-                WL_LOCK(wl);
-                wlc_rpc_high_dispatch(&wl->rpc_dispatch_ctx, buf);
-                WL_UNLOCK(wl);
-
-                RPCQ_LOCK(wl, flags);
-        }
-
-        wl->rpcq_dispatched = false;
-
-        RPCQ_UNLOCK(wl, flags);
-
-        kfree(task);
-        atomic_dec(&wl->callbacks);
-}
-
-static void wl_rpcq_add(wl_info_t *wl, rpc_buf_t *buf)
-{
-        unsigned long flags;
-
-        bcm_rpc_buf_next_set(wl->rpc_th, buf, NULL);
-
-        /* Lock the queue as tasklet could be running at this time */
-        RPCQ_LOCK(wl, flags);
-        if (wl->rpcq_head == NULL)
-                wl->rpcq_head = buf;
-        else
-                bcm_rpc_buf_next_set(wl->rpc_th, wl->rpcq_tail, buf);
-
-        wl->rpcq_tail = buf;
-
-        if (wl->rpcq_dispatched == false) {
-                wl->rpcq_dispatched = true;
-                wl_schedule_task(wl, wl_rpcq_dispatch, wl);
-        }
-
-        RPCQ_UNLOCK(wl, flags);
-}
-
-#if defined(BCMDBG)
-static const struct name_entry rpc_name_tbl[] = RPC_ID_TABLE;
-#endif                          /* BCMDBG */
-
-/* dongle-side rpc dispatch routine */
-static void wl_rpc_dispatch_schedule(void *ctx, struct rpc_buf *buf)
-{
-        bcm_xdr_buf_t b;
-        wl_info_t *wl = (wl_info_t *) ctx;
-        wlc_rpc_id_t rpc_id;
-        int err;
-
-        bcm_xdr_buf_init(&b, bcm_rpc_buf_data(wl->rpc_th, buf),
-                         bcm_rpc_buf_len_get(wl->rpc_th, buf));
-
-        err = bcm_xdr_unpack_u32(&b, &rpc_id);
-        ASSERT(!err);
-        WL_TRACE(("%s: Dispatch id %s\n", __func__,
-                  WLC_RPC_ID_LOOKUP(rpc_name_tbl, rpc_id)));
-
-        /* Handle few emergency ones */
-        switch (rpc_id) {
-        default:
-                wl_rpcq_add(wl, buf);
-                break;
-        }
-}
-
-static void wl_timer_task(wl_task_t *task)
-{
-        wl_timer_t *t = (wl_timer_t *) task->context;
-
-        _wl_timer(t);
-        kfree(task);
-
-        /* This dec is for the task_schedule. The timer related
-         * callback is decremented in _wl_timer
-         */
-        atomic_dec(&t->wl->callbacks);
-}
-#endif                          /* WLC_HIGH_ONLY */
-
-#ifndef WLC_HIGH_ONLY
 char *wl_firmwares[WL_MAX_FW] = {
         "brcm/bcm43xx",
         NULL
 };
 
-#ifdef WLC_LOW
-int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx)
+int wl_ucode_init_buf(struct wl_info *wl, void **pbuf, u32 idx)
 {
         int i, entry;
         const u8 *pdata;
@@ -2301,7 +1719,7 @@ int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx)
         return -1;
 }
 
-int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx)
+int wl_ucode_init_uint(struct wl_info *wl, u32 *data, u32 idx)
 {
         int i, entry;
         const u8 *pdata;
@@ -2321,22 +1739,21 @@ int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx)
         printf("ERROR: ucode tag:%d can not be found!\n", idx);
         return -1;
 }
-#endif                          /* WLC_LOW */
 
-static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev)
+static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev)
 {
         int status;
         struct device *device = &pdev->dev;
         char fw_name[100];
         int i;
 
-        bzero((void *)&wl->fw, sizeof(struct wl_firmware));
+        memset((void *)&wl->fw, 0, sizeof(struct wl_firmware));
         for (i = 0; i < WL_MAX_FW; i++) {
                 if (wl_firmwares[i] == NULL)
                         break;
                 sprintf(fw_name, "%s-%d.fw", wl_firmwares[i],
                         UCODE_LOADER_API_VER);
-                WL_NONE(("request fw %s\n", fw_name));
+                WL_NONE("request fw %s\n", fw_name);
                 status = request_firmware(&wl->fw.fw_bin[i], fw_name, device);
                 if (status) {
                         printf("%s: fail to load firmware %s\n",
@@ -2344,7 +1761,7 @@ static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev)
                         wl_release_fw(wl);
                         return status;
                 }
-                WL_NONE(("request fw %s\n", fw_name));
+                WL_NONE("request fw %s\n", fw_name);
                 sprintf(fw_name, "%s_hdr-%d.fw", wl_firmwares[i],
                         UCODE_LOADER_API_VER);
                 status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device);
@@ -2356,22 +1773,19 @@ static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev)
                 }
                 wl->fw.hdr_num_entries[i] =
                     wl->fw.fw_hdr[i]->size / (sizeof(struct wl_fw_hdr));
-                WL_NONE(("request fw %s find: %d entries\n", fw_name,
-                         wl->fw.hdr_num_entries[i]));
+                WL_NONE("request fw %s find: %d entries\n",
+                        fw_name, wl->fw.hdr_num_entries[i]);
         }
         wl->fw.fw_cnt = i;
-        wl_ucode_data_init(wl);
-        return 0;
+        return wl_ucode_data_init(wl);
 }
 
-#ifdef WLC_LOW
 void wl_ucode_free_buf(void *p)
 {
         kfree(p);
 }
-#endif                          /* WLC_LOW */
 
-static void wl_release_fw(wl_info_t *wl)
+static void wl_release_fw(struct wl_info *wl)
 {
         int i;
         for (i = 0; i < WL_MAX_FW; i++) {
@@ -2379,4 +1793,54 @@ static void wl_release_fw(wl_info_t *wl)
                 release_firmware(wl->fw.fw_hdr[i]);
         }
 }
-#endif                          /* WLC_HIGH_ONLY */
+
+
+/*
+ * checks validity of all firmware images loaded from user space
+ */
+int wl_check_firmwares(struct wl_info *wl)
+{
+        int i;
+        int entry;
+        int rc = 0;
+        const struct firmware *fw;
+        const struct firmware *fw_hdr;
+        struct wl_fw_hdr *ucode_hdr;
+        for (i = 0; i < WL_MAX_FW && rc == 0; i++) {
+                fw =  wl->fw.fw_bin[i];
+                fw_hdr = wl->fw.fw_hdr[i];
+                if (fw == NULL && fw_hdr == NULL) {
+                        break;
+                } else if (fw == NULL || fw_hdr == NULL) {
+                        WL_ERROR("%s: invalid bin/hdr fw\n", __func__);
+                        rc = -EBADF;
+                } else if (fw_hdr->size % sizeof(struct wl_fw_hdr)) {
+                        WL_ERROR("%s: non integral fw hdr file size %d/%zu\n",
+                                 __func__, fw_hdr->size,
+                                 sizeof(struct wl_fw_hdr));
+                        rc = -EBADF;
+                } else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) {
+                        WL_ERROR("%s: out of bounds fw file size %d\n",
+                                 __func__, fw->size);
+                        rc = -EBADF;
+                } else {
+                        /* check if ucode section overruns firmware image */
+                        ucode_hdr = (struct wl_fw_hdr *)fw_hdr->data;
+                        for (entry = 0; entry < wl->fw.hdr_num_entries[i] && rc;
+                             entry++, ucode_hdr++) {
+                                if (ucode_hdr->offset + ucode_hdr->len >
+                                    fw->size) {
+                                        WL_ERROR("%s: conflicting bin/hdr\n",
+                                                 __func__);
+                                        rc = -EBADF;
+                                }
+                        }
+                }
+        }
+        if (rc == 0 && wl->fw.fw_cnt != i) {
+                WL_ERROR("%s: invalid fw_cnt=%d\n", __func__, wl->fw.fw_cnt);
+                rc = -EBADF;
+        }
+        return rc;
+}
+
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h
index 78cee4454b0b..bb39b7705947 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.h
@@ -60,58 +60,32 @@ struct wl_firmware {
 };
 
 struct wl_info {
-        wlc_pub_t *pub;         /* pointer to public wlc state */
+        struct wlc_pub *pub;            /* pointer to public wlc state */
         void *wlc;              /* pointer to private common os-independent data */
-        osl_t *osh;             /* pointer to os handler */
+        struct osl_info *osh;           /* pointer to os handler */
         u32 magic;
 
         int irq;
 
-#ifdef WLC_HIGH_ONLY
-        struct semaphore sem;   /* use semaphore to allow sleep */
-#else
         spinlock_t lock;        /* per-device perimeter lock */
         spinlock_t isr_lock;    /* per-device ISR synchronization lock */
-#endif
         uint bcm_bustype;       /* bus type */
         bool piomode;           /* set from insmod argument */
         void *regsva;           /* opaque chip registers virtual address */
         atomic_t callbacks;     /* # outstanding callback functions */
         struct wl_timer *timers;        /* timer cleanup queue */
         struct tasklet_struct tasklet;  /* dpc tasklet */
-#ifdef BCMSDIO
-        bcmsdh_info_t *sdh;     /* pointer to sdio bus handler */
-        unsigned long flags;            /* current irq flags */
-#endif                          /* BCMSDIO */
         bool resched;           /* dpc needs to be and is rescheduled */
 #ifdef LINUXSTA_PS
         u32 pci_psstate[16];    /* pci ps-state save/restore */
 #endif
         /* RPC, handle, lock, txq, workitem */
-#ifdef WLC_HIGH_ONLY
-        rpc_info_t *rpc;        /* RPC handle */
-        rpc_tp_info_t *rpc_th;  /* RPC transport handle */
-        wlc_rpc_ctx_t rpc_dispatch_ctx;
-
-        bool rpcq_dispatched;   /* Avoid scheduling multiple tasks */
-        spinlock_t rpcq_lock;   /* Lock for the queue */
-        rpc_buf_t *rpcq_head;   /* RPC Q */
-        rpc_buf_t *rpcq_tail;   /* Points to the last buf */
-
-        bool txq_dispatched;    /* Avoid scheduling multiple tasks */
-        spinlock_t txq_lock;    /* Lock for the queue */
-        struct sk_buff *txq_head;       /* TX Q */
-        struct sk_buff *txq_tail;       /* Points to the last buf */
-
-        wl_task_t txq_task;     /* work queue for wl_start() */
-#endif                          /* WLC_HIGH_ONLY */
         uint stats_id;          /* the current set of stats */
         /* ping-pong stats counters updated by Linux watchdog */
         struct net_device_stats stats_watchdog[2];
         struct wl_firmware fw;
 };
 
-#ifndef WLC_HIGH_ONLY
 #define WL_LOCK(wl)     spin_lock_bh(&(wl)->lock)
 #define WL_UNLOCK(wl)   spin_unlock_bh(&(wl)->lock)
 
@@ -122,17 +96,6 @@ struct wl_info {
 /* locking under WL_LOCK() to synchronize with wl_isr */
 #define INT_LOCK(wl, flags)     spin_lock_irqsave(&(wl)->isr_lock, flags)
 #define INT_UNLOCK(wl, flags)   spin_unlock_irqrestore(&(wl)->isr_lock, flags)
-#else                           /* BCMSDIO */
-
-#define WL_LOCK(wl)     down(&(wl)->sem)
-#define WL_UNLOCK(wl)   up(&(wl)->sem)
-
-#define WL_ISRLOCK(wl)
-#define WL_ISRUNLOCK(wl)
-#endif                          /* WLC_HIGH_ONLY */
-
-/* handle forward declaration */
-typedef struct wl_info wl_info_t;
 
 #ifndef PCI_D0
 #define PCI_D0          0
@@ -148,14 +111,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id);
 
 extern int __devinit wl_pci_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *ent);
-extern void wl_free(wl_info_t *wl);
+extern void wl_free(struct wl_info *wl);
 extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-extern int wl_ucode_data_init(wl_info_t *wl);
-extern void wl_ucode_data_free(void);
-#ifdef WLC_LOW
-extern void wl_ucode_free_buf(void *);
-extern int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx);
-extern int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx);
-#endif                          /* WLC_LOW */
 
 #endif                          /* _wl_mac80211_h_ */
diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/sys/wl_ucode.h
index a1ba37209f96..2a0f4028f6f3 100644
--- a/drivers/staging/brcm80211/sys/wl_ucode.h
+++ b/drivers/staging/brcm80211/sys/wl_ucode.h
@@ -14,6 +14,9 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define MIN_FW_SIZE 40000       /* minimum firmware file size in bytes */
+#define MAX_FW_SIZE 150000
+
 typedef struct d11init {
         u16 addr;
         u16 size;
@@ -35,3 +38,12 @@ extern u32 *bcm43xx_24_lcn;
 extern u32 bcm43xx_24_lcnsz;
 extern u32 *bcm43xx_bommajor;
 extern u32 *bcm43xx_bomminor;
+
+extern int wl_ucode_data_init(struct wl_info *wl);
+extern void wl_ucode_data_free(void);
+
+extern int wl_ucode_init_buf(struct wl_info *wl, void **pbuf, unsigned int idx);
+extern int wl_ucode_init_uint(struct wl_info *wl, unsigned *data,
+                              unsigned int idx);
+extern void wl_ucode_free_buf(void *);
+extern int  wl_check_firmwares(struct wl_info *wl);
diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/sys/wl_ucode_loader.c
index 0b41a9cb1ec9..23e10f3dec0d 100644
--- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c
+++ b/drivers/staging/brcm80211/sys/wl_ucode_loader.c
@@ -14,17 +14,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-typedef struct wl_info wl_info_t;
 #include <linux/types.h>
 #include <bcmdefs.h>
 #include <d11ucode_ext.h>
 #include <wl_ucode.h>
 
-extern int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, unsigned int idx);
-extern int wl_ucode_init_uint(wl_info_t *wl, unsigned *data, unsigned int idx);
-extern int wl_ucode_data_init(wl_info_t *wl);
-extern void wl_ucode_data_free(void);
-extern void wl_ucode_free_buf(void *);
+
 
 d11init_t *d11lcn0bsinitvals24;
 d11init_t *d11lcn0initvals24;
@@ -42,8 +37,12 @@ u32 bcm43xx_24_lcnsz;
 u32 *bcm43xx_bommajor;
 u32 *bcm43xx_bomminor;
 
-int wl_ucode_data_init(wl_info_t *wl)
+int wl_ucode_data_init(struct wl_info *wl)
 {
+        int rc;
+        rc = wl_check_firmwares(wl);
+        if (rc < 0)
+                return rc;
         wl_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24,
                           D11LCN0BSINITVALS24);
         wl_ucode_init_buf(wl, (void **)&d11lcn0initvals24, D11LCN0INITVALS24);
diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c
index 2dc89f9c2635..746439e8fd57 100644
--- a/drivers/staging/brcm80211/sys/wlc_alloc.c
+++ b/drivers/staging/brcm80211/sys/wlc_alloc.c
@@ -17,28 +17,33 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <wlioctl.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_alloc.h>
+#include <wl_dbg.h>
 
-static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err,
-                                 uint devid);
-static void wlc_pub_mfree(osl_t *osh, wlc_pub_t *pub);
+static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
+                                      uint *err, uint devid);
+static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub);
 static void wlc_tunables_init(wlc_tunables_t *tunables, uint devid);
 
-void *wlc_calloc(osl_t *osh, uint unit, uint size)
+void *wlc_calloc(struct osl_info *osh, uint unit, uint size)
 {
         void *item;
 
         item = kzalloc(size, GFP_ATOMIC);
         if (item == NULL)
-                WL_ERROR(("wl%d: %s: out of memory\n", unit, __func__));
+                WL_ERROR("wl%d: %s: out of memory\n", unit, __func__);
         return item;
 }
 
@@ -58,18 +63,14 @@ void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
         tunables->ampdudatahiwat = WLC_AMPDUDATAHIWAT;
         tunables->rxbnd = RXBND;
         tunables->txsbnd = TXSBND;
-#if defined(WLC_HIGH_ONLY) && defined(NTXD_USB_4319)
-        if (devid == BCM4319_CHIP_ID) {
-                tunables->ntxd = NTXD_USB_4319;
-        }
-#endif                          /* WLC_HIGH_ONLY */
 }
 
-static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err, uint devid)
+static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
+                                      uint *err, uint devid)
 {
-        wlc_pub_t *pub;
+        struct wlc_pub *pub;
 
-        pub = (wlc_pub_t *) wlc_calloc(osh, unit, sizeof(wlc_pub_t));
+        pub = (struct wlc_pub *) wlc_calloc(osh, unit, sizeof(struct wlc_pub));
         if (pub == NULL) {
                 *err = 1001;
                 goto fail;
@@ -99,7 +100,7 @@ static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err, uint devid)
         return NULL;
 }
 
-static void wlc_pub_mfree(osl_t *osh, wlc_pub_t *pub)
+static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub)
 {
         if (pub == NULL)
                 return;
@@ -114,7 +115,7 @@ static void wlc_pub_mfree(osl_t *osh, wlc_pub_t *pub)
         kfree(pub);
 }
 
-wlc_bsscfg_t *wlc_bsscfg_malloc(osl_t *osh, uint unit)
+wlc_bsscfg_t *wlc_bsscfg_malloc(struct osl_info *osh, uint unit)
 {
         wlc_bsscfg_t *cfg;
 
@@ -134,7 +135,7 @@ wlc_bsscfg_t *wlc_bsscfg_malloc(osl_t *osh, uint unit)
         return NULL;
 }
 
-void wlc_bsscfg_mfree(osl_t *osh, wlc_bsscfg_t *cfg)
+void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg)
 {
         if (cfg == NULL)
                 return;
@@ -155,7 +156,7 @@ void wlc_bsscfg_mfree(osl_t *osh, wlc_bsscfg_t *cfg)
         kfree(cfg);
 }
 
-void wlc_bsscfg_ID_assign(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg)
+void wlc_bsscfg_ID_assign(struct wlc_info *wlc, wlc_bsscfg_t *bsscfg)
 {
         bsscfg->ID = wlc->next_bsscfg_ID;
         wlc->next_bsscfg_ID++;
@@ -164,11 +165,13 @@ void wlc_bsscfg_ID_assign(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg)
 /*
  * The common driver entry routine. Error codes should be unique
  */
-wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
+struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err,
+                              uint devid)
 {
-        wlc_info_t *wlc;
+        struct wlc_info *wlc;
 
-        wlc = (wlc_info_t *) wlc_calloc(osh, unit, sizeof(wlc_info_t));
+        wlc = (struct wlc_info *) wlc_calloc(osh, unit,
+                                             sizeof(struct wlc_info));
         if (wlc == NULL) {
                 *err = 1002;
                 goto fail;
@@ -176,7 +179,7 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
 
         wlc->hwrxoff = WL_HWRXOFF;
 
-        /* allocate wlc_pub_t state structure */
+        /* allocate struct wlc_pub state structure */
         wlc->pub = wlc_pub_malloc(osh, unit, err, devid);
         if (wlc->pub == NULL) {
                 *err = 1003;
@@ -184,17 +187,16 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
         }
         wlc->pub->wlc = wlc;
 
-        /* allocate wlc_hw_info_t state structure */
+        /* allocate struct wlc_hw_info state structure */
 
-        wlc->hw = (wlc_hw_info_t *)wlc_calloc(osh, unit,
-                sizeof(wlc_hw_info_t));
+        wlc->hw = (struct wlc_hw_info *)wlc_calloc(osh, unit,
+                sizeof(struct wlc_hw_info));
         if (wlc->hw == NULL) {
                 *err = 1005;
                 goto fail;
         }
         wlc->hw->wlc = wlc;
 
-#ifdef WLC_LOW
         wlc->hw->bandstate[0] = (wlc_hwband_t *)wlc_calloc(osh, unit,
                 (sizeof(wlc_hwband_t) * MAXBANDS));
         if (wlc->hw->bandstate[0] == NULL) {
@@ -209,7 +211,6 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
                              (sizeof(wlc_hwband_t) * i));
                 }
         }
-#endif                          /* WLC_LOW */
 
         wlc->modulecb = (modulecb_t *)wlc_calloc(osh, unit,
                 sizeof(modulecb_t) * WLC_MAXMODULES);
@@ -266,8 +267,8 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
                 goto fail;
         }
 
-        wlc->bandstate[0] = (wlcband_t *)wlc_calloc(osh, unit,
-                                (sizeof(wlcband_t) * MAXBANDS));
+        wlc->bandstate[0] = (struct wlcband *)wlc_calloc(osh, unit,
+                                (sizeof(struct wlcband)*MAXBANDS));
         if (wlc->bandstate[0] == NULL) {
                 *err = 1025;
                 goto fail;
@@ -276,12 +277,13 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
 
                 for (i = 1; i < MAXBANDS; i++) {
                         wlc->bandstate[i] =
-                            (wlcband_t *) ((unsigned long)wlc->bandstate[0] +
-                                           (sizeof(wlcband_t) * i));
+                            (struct wlcband *) ((unsigned long)wlc->bandstate[0]
+                            + (sizeof(struct wlcband)*i));
                 }
         }
 
-        wlc->corestate = (wlccore_t *)wlc_calloc(osh, unit, sizeof(wlccore_t));
+        wlc->corestate = (struct wlccore *)wlc_calloc(osh, unit,
+                                                      sizeof(struct wlccore));
         if (wlc->corestate == NULL) {
                 *err = 1026;
                 goto fail;
@@ -301,7 +303,7 @@ wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
         return NULL;
 }
 
-void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh)
+void wlc_detach_mfree(struct wlc_info *wlc, struct osl_info *osh)
 {
         if (wlc == NULL)
                 return;
@@ -355,12 +357,10 @@ void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh)
         }
 
         if (wlc->hw) {
-#ifdef WLC_LOW
                 if (wlc->hw->bandstate[0]) {
                         kfree(wlc->hw->bandstate[0]);
                         wlc->hw->bandstate[0] = NULL;
                 }
-#endif
 
                 /* free hw struct */
                 kfree(wlc->hw);
diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.h b/drivers/staging/brcm80211/sys/wlc_alloc.h
index 678a2b9784f8..ac34f782b400 100644
--- a/drivers/staging/brcm80211/sys/wlc_alloc.h
+++ b/drivers/staging/brcm80211/sys/wlc_alloc.h
@@ -14,12 +14,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-extern void *wlc_calloc(osl_t *osh, uint unit, uint size);
+extern void *wlc_calloc(struct osl_info *osh, uint unit, uint size);
 
-extern wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err,
-                                     uint devid);
-extern void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh);
+extern struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit,
+                                          uint *err, uint devid);
+extern void wlc_detach_mfree(struct wlc_info *wlc, struct osl_info *osh);
 
 struct wlc_bsscfg;
-extern struct wlc_bsscfg *wlc_bsscfg_malloc(osl_t *osh, uint unit);
-extern void wlc_bsscfg_mfree(osl_t *osh, struct wlc_bsscfg *cfg);
+extern struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit);
+extern void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg);
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index a4e49f3c1363..d749917f5912 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -16,19 +16,19 @@
 #include <linux/kernel.h>
 #include <wlc_cfg.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
-#include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmendian.h>
 #include <wlioctl.h>
+#include <sbhndpio.h>
 #include <sbhnddma.h>
 #include <hnddma.h>
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_phy_hal.h>
 #include <wlc_antsel.h>
@@ -36,11 +36,8 @@
 #include <net/mac80211.h>
 #include <wlc_ampdu.h>
 #include <wl_export.h>
+#include <wl_dbg.h>
 
-#ifdef WLC_HIGH_ONLY
-#include <bcm_rpc_tp.h>
-#include <wlc_rpctx.h>
-#endif
 
 #define AMPDU_MAX_MPDU          32      /* max number of mpdus in an ampdu */
 #define AMPDU_NUM_MPDU_LEGACY   16      /* max number of mpdus in an ampdu to a legacy */
@@ -101,7 +98,7 @@ typedef struct wlc_fifo_info {
 
 /* AMPDU module specific state */
 struct ampdu_info {
-        wlc_info_t *wlc;        /* pointer to main wlc structure */
+        struct wlc_info *wlc;   /* pointer to main wlc structure */
         int scb_handle;         /* scb cubby handle to retrieve data from scb */
         u8 ini_enable[AMPDU_MAX_SCB_TID];       /* per-tid initiator enable/disable of ampdu */
         u8 ba_tx_wsize; /* Tx ba window size (in pdu) */
@@ -125,11 +122,6 @@ struct ampdu_info {
                                  */
         wlc_fifo_info_t fifo_tb[NUM_FFPLD_FIFO];        /* table of fifo infos  */
 
-#ifdef WLC_HIGH_ONLY
-        void *p;
-        tx_status_t txs;
-        bool waiting_status;    /* To help sanity checks */
-#endif
 };
 
 #define AMPDU_CLEANUPFLAG_RX   (0x1)
@@ -138,38 +130,39 @@ struct ampdu_info {
 #define SCB_AMPDU_CUBBY(ampdu, scb) (&(scb->scb_ampdu))
 #define SCB_AMPDU_INI(scb_ampdu, tid) (&(scb_ampdu->ini[tid]))
 
-static void wlc_ffpld_init(ampdu_info_t *ampdu);
-static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int f);
-static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f);
+static void wlc_ffpld_init(struct ampdu_info *ampdu);
+static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int f);
+static void wlc_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f);
 
-static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(ampdu_info_t *ampdu,
+static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(struct ampdu_info *ampdu,
                                                    scb_ampdu_t *scb_ampdu,
                                                    u8 tid, bool override);
-static void ampdu_cleanup_tid_ini(ampdu_info_t *ampdu, scb_ampdu_t *scb_ampdu,
+static void ampdu_cleanup_tid_ini(struct ampdu_info *ampdu,
+                                  scb_ampdu_t *scb_ampdu,
                                   u8 tid, bool force);
-static void ampdu_update_max_txlen(ampdu_info_t *ampdu, u8 dur);
-static void scb_ampdu_update_config(ampdu_info_t *ampdu, struct scb *scb);
-static void scb_ampdu_update_config_all(ampdu_info_t *ampdu);
+static void ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur);
+static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb);
+static void scb_ampdu_update_config_all(struct ampdu_info *ampdu);
 
 #define wlc_ampdu_txflowcontrol(a, b, c)        do {} while (0)
 
-static void wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb,
-                                          void *p, tx_status_t *txs,
-                                          u32 frmtxstatus,
-                                          u32 frmtxstatus2);
+static void wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu,
+                                          struct scb *scb,
+                                          struct sk_buff *p, tx_status_t *txs,
+                                          u32 frmtxstatus, u32 frmtxstatus2);
 
-static inline u16 pkt_txh_seqnum(wlc_info_t *wlc, void *p)
+static inline u16 pkt_txh_seqnum(struct wlc_info *wlc, struct sk_buff *p)
 {
         d11txh_t *txh;
         struct dot11_header *h;
-        txh = (d11txh_t *) PKTDATA(p);
+        txh = (d11txh_t *) p->data;
         h = (struct dot11_header *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
         return ltoh16(h->seq) >> SEQNUM_SHIFT;
 }
 
-ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
+struct ampdu_info *wlc_ampdu_attach(struct wlc_info *wlc)
 {
-        ampdu_info_t *ampdu;
+        struct ampdu_info *ampdu;
         int i;
 
         /* some code depends on packed structures */
@@ -179,9 +172,10 @@ ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
         ASSERT(wlc->pub->tunables->ampdunummpdu <= AMPDU_MAX_MPDU);
         ASSERT(wlc->pub->tunables->ampdunummpdu > 0);
 
-        ampdu = kzalloc(sizeof(ampdu_info_t), GFP_ATOMIC);
+        ampdu = kzalloc(sizeof(struct ampdu_info), GFP_ATOMIC);
         if (!ampdu) {
-                WL_ERROR(("wl%d: wlc_ampdu_attach: out of mem\n", wlc->pub->unit));
+                WL_ERROR("wl%d: wlc_ampdu_attach: out of mem\n",
+                         wlc->pub->unit);
                 return NULL;
         }
         ampdu->wlc = wlc;
@@ -209,10 +203,6 @@ ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
                 ampdu->rx_factor = AMPDU_RX_FACTOR_32K;
         else
                 ampdu->rx_factor = AMPDU_RX_FACTOR_64K;
-#ifdef WLC_HIGH_ONLY
-        /* Restrict to smaller rcv size for BMAC dongle */
-        ampdu->rx_factor = AMPDU_RX_FACTOR_32K;
-#endif
         ampdu->retry_limit = AMPDU_DEF_RETRY_LIMIT;
         ampdu->rr_retry_limit = AMPDU_DEF_RR_RETRY_LIMIT;
 
@@ -232,7 +222,7 @@ ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
         return ampdu;
 }
 
-void wlc_ampdu_detach(ampdu_info_t *ampdu)
+void wlc_ampdu_detach(struct ampdu_info *ampdu)
 {
         int i;
 
@@ -250,12 +240,12 @@ void wlc_ampdu_detach(ampdu_info_t *ampdu)
         kfree(ampdu);
 }
 
-void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb)
+void scb_ampdu_cleanup(struct ampdu_info *ampdu, struct scb *scb)
 {
         scb_ampdu_t *scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
         u8 tid;
 
-        WL_AMPDU_UPDN(("scb_ampdu_cleanup: enter\n"));
+        WL_AMPDU_UPDN("scb_ampdu_cleanup: enter\n");
         ASSERT(scb_ampdu);
 
         for (tid = 0; tid < AMPDU_MAX_SCB_TID; tid++) {
@@ -266,12 +256,12 @@ void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb)
 /* reset the ampdu state machine so that it can gracefully handle packets that were
  * freed from the dma and tx queues during reinit
  */
-void wlc_ampdu_reset(ampdu_info_t *ampdu)
+void wlc_ampdu_reset(struct ampdu_info *ampdu)
 {
-        WL_NONE(("%s: Entering\n", __func__));
+        WL_NONE("%s: Entering\n", __func__);
 }
 
-static void scb_ampdu_update_config(ampdu_info_t *ampdu, struct scb *scb)
+static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb)
 {
         scb_ampdu_t *scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
         int i;
@@ -301,12 +291,12 @@ static void scb_ampdu_update_config(ampdu_info_t *ampdu, struct scb *scb)
         ASSERT(scb_ampdu->release);
 }
 
-void scb_ampdu_update_config_all(ampdu_info_t *ampdu)
+void scb_ampdu_update_config_all(struct ampdu_info *ampdu)
 {
         scb_ampdu_update_config(ampdu, ampdu->wlc->pub->global_scb);
 }
 
-static void wlc_ffpld_init(ampdu_info_t *ampdu)
+static void wlc_ffpld_init(struct ampdu_info *ampdu)
 {
         int i, j;
         wlc_fifo_info_t *fifo;
@@ -330,9 +320,9 @@ static void wlc_ffpld_init(ampdu_info_t *ampdu)
  * Return 1 if pre-loading not active, -1 if not an underflow event,
  * 0 if pre-loading module took care of the event.
  */
-static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
+static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 {
-        ampdu_info_t *ampdu = wlc->ampdu;
+        struct ampdu_info *ampdu = wlc->ampdu;
         u32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, true, false);
         u32 txunfl_ratio;
         u8 max_mpdu;
@@ -349,7 +339,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
                          M_UCODE_MACSTAT + offsetof(macstat_t, txfunfl[fid]));
         new_txunfl = (u16) (cur_txunfl - fifo->prev_txfunfl);
         if (new_txunfl == 0) {
-                WL_FFPLD(("check_txunfl : TX status FRAG set but no tx underflows\n"));
+                WL_FFPLD("check_txunfl : TX status FRAG set but no tx underflows\n");
                 return -1;
         }
         fifo->prev_txfunfl = cur_txunfl;
@@ -359,7 +349,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
 
         /* check if fifo is big enough */
         if (wlc_xmtfifo_sz_get(wlc, fid, &xmtfifo_sz)) {
-                WL_FFPLD(("check_txunfl : get xmtfifo_sz failed.\n"));
+                WL_FFPLD("check_txunfl : get xmtfifo_sz failed\n");
                 return -1;
         }
 
@@ -373,8 +363,8 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
         if (fifo->accum_txfunfl < 10)
                 return 0;
 
-        WL_FFPLD(("ampdu_count %d  tx_underflows %d\n",
-                  current_ampdu_cnt, fifo->accum_txfunfl));
+        WL_FFPLD("ampdu_count %d  tx_underflows %d\n",
+                 current_ampdu_cnt, fifo->accum_txfunfl);
 
         /*
            compute the current ratio of tx unfl per ampdu.
@@ -427,8 +417,8 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
                       (max_mpdu * FFPLD_MPDU_SIZE - fifo->ampdu_pld_size))
                      / (max_mpdu * FFPLD_MPDU_SIZE)) * 100;
 
-                WL_FFPLD(("DMA estimated transfer rate %d; pre-load size %d\n",
-                          fifo->dmaxferrate, fifo->ampdu_pld_size));
+                WL_FFPLD("DMA estimated transfer rate %d; pre-load size %d\n",
+                         fifo->dmaxferrate, fifo->ampdu_pld_size);
         } else {
 
                 /* decrease ampdu size */
@@ -450,7 +440,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
         return 0;
 }
 
-static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f)
+static void wlc_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f)
 {
         int i;
         u32 phy_rate, dma_rate, tmp;
@@ -483,11 +473,12 @@ static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f)
 }
 
 static void BCMFASTPATH
-wlc_ampdu_agg(ampdu_info_t *ampdu, struct scb *scb, void *p, uint prec)
+wlc_ampdu_agg(struct ampdu_info *ampdu, struct scb *scb, struct sk_buff *p,
+              uint prec)
 {
         scb_ampdu_t *scb_ampdu;
         scb_ampdu_tid_ini_t *ini;
-        u8 tid = (u8) PKTPRIO(p);
+        u8 tid = (u8) (p->priority);
 
         scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
 
@@ -500,11 +491,12 @@ wlc_ampdu_agg(ampdu_info_t *ampdu, struct scb *scb, void *p, uint prec)
 }
 
 int BCMFASTPATH
-wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
+wlc_sendampdu(struct ampdu_info *ampdu, wlc_txq_info_t *qi,
+              struct sk_buff **pdu, int prec)
 {
-        wlc_info_t *wlc;
-        osl_t *osh;
-        void *p, *pkt[AMPDU_MAX_MPDU];
+        struct wlc_info *wlc;
+        struct osl_info *osh;
+        struct sk_buff *p, *pkt[AMPDU_MAX_MPDU];
         u8 tid, ndelim;
         int err = 0;
         u8 preamble_type = WLC_GF_PREAMBLE;
@@ -540,7 +532,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
         ASSERT(p);
 
-        tid = (u8) PKTPRIO(p);
+        tid = (u8) (p->priority);
         ASSERT(tid < AMPDU_MAX_SCB_TID);
 
         f = ampdu->fifo_tb + prio2fifo[tid];
@@ -561,7 +553,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
         wlc_ampdu_agg(ampdu, scb, p, tid);
 
         if (wlc->block_datafifo) {
-                WL_ERROR(("%s: Fifo blocked\n", __func__));
+                WL_ERROR("%s: Fifo blocked\n", __func__);
                 return BCME_BUSY;
         }
         rr_retry_limit = ampdu->rr_retry_limit_tid[tid];
@@ -576,7 +568,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                 if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
                         err = wlc_prep_pdu(wlc, p, &fifo);
                 } else {
-                        WL_ERROR(("%s: AMPDU flag is off!\n", __func__));
+                        WL_ERROR("%s: AMPDU flag is off!\n", __func__);
                         *pdu = NULL;
                         err = 0;
                         break;
@@ -584,14 +576,16 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
                 if (err) {
                         if (err == BCME_BUSY) {
-                                WL_ERROR(("wl%d: wlc_sendampdu: prep_xdu retry; seq 0x%x\n", wlc->pub->unit, seq));
+                                WL_ERROR("wl%d: wlc_sendampdu: prep_xdu retry; seq 0x%x\n",
+                                         wlc->pub->unit, seq);
                                 WLCNTINCR(ampdu->cnt->sduretry);
                                 *pdu = p;
                                 break;
                         }
 
                         /* error in the packet; reject it */
-                        WL_AMPDU_ERR(("wl%d: wlc_sendampdu: prep_xdu rejected; seq 0x%x\n", wlc->pub->unit, seq));
+                        WL_AMPDU_ERR("wl%d: wlc_sendampdu: prep_xdu rejected; seq 0x%x\n",
+                                     wlc->pub->unit, seq);
                         WLCNTINCR(ampdu->cnt->sdurejected);
 
                         *pdu = NULL;
@@ -600,7 +594,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
                 /* pkt is good to be aggregated */
                 ASSERT(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
-                txh = (d11txh_t *) PKTDATA(p);
+                txh = (d11txh_t *) p->data;
                 plcp = (u8 *) (txh + 1);
                 h = (struct dot11_header *)(plcp + D11_PHY_HDR_LEN);
                 seq = ltoh16(h->seq) >> SEQNUM_SHIFT;
@@ -633,8 +627,8 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                 ndelim = txh->RTSPLCPFallback[AMPDU_FBR_NULL_DELIM];
                 seg_cnt += 1;
 
-                WL_AMPDU_TX(("wl%d: wlc_sendampdu: mpdu %d plcp_len %d\n",
-                             wlc->pub->unit, count, len));
+                WL_AMPDU_TX("wl%d: wlc_sendampdu: mpdu %d plcp_len %d\n",
+                            wlc->pub->unit, count, len);
 
                 /*
                  * aggregateable mpdu. For ucode/hw agg,
@@ -665,7 +659,8 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
                 dma_len += (u16) pkttotlen(osh, p);
 
-                WL_AMPDU_TX(("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n", wlc->pub->unit, ampdu_len, seg_cnt, ndelim));
+                WL_AMPDU_TX("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n",
+                            wlc->pub->unit, ampdu_len, seg_cnt, ndelim);
 
                 txh->MacTxControlLow = htol16(mcl);
 
@@ -695,8 +690,8 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                             min(scb_ampdu->max_rxlen,
                                 ampdu->max_txlen[mcs][is40][sgi]);
 
-                        WL_NONE(("sendampdu: sgi %d, is40 %d, mcs %d\n", sgi,
-                                 is40, mcs));
+                        WL_NONE("sendampdu: sgi %d, is40 %d, mcs %d\n",
+                                sgi, is40, mcs);
 
                         maxlen = 64 * 1024;     /* XXX Fix me to honor real max_rxlen */
 
@@ -739,13 +734,14 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                 /* test whether to add more */
                 if ((MCS_RATE(mcs, true, false) >= f->dmaxferrate) &&
                     (count == f->mcs2ampdu_table[mcs])) {
-                        WL_AMPDU_ERR(("wl%d: PR 37644: stopping ampdu at %d for mcs %d", wlc->pub->unit, count, mcs));
+                        WL_AMPDU_ERR("wl%d: PR 37644: stopping ampdu at %d for mcs %d\n",
+                                     wlc->pub->unit, count, mcs);
                         break;
                 }
 
                 if (count == scb_ampdu->max_pdu) {
-                        WL_NONE(("Stop taking from q, reached %d deep\n",
-                                 scb_ampdu->max_pdu));
+                        WL_NONE("Stop taking from q, reached %d deep\n",
+                                scb_ampdu->max_pdu);
                         break;
                 }
 
@@ -755,7 +751,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
                 if (p) {
                         if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) &&
-                            ((u8) PKTPRIO(p) == tid)) {
+                            ((u8) (p->priority) == tid)) {
 
                                 plen =
                                     pkttotlen(osh, p) + AMPDU_MAX_MPDU_OVERHEAD;
@@ -763,15 +759,16 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
                                 if ((plen + ampdu_len) > maxlen) {
                                         p = NULL;
-                                        WL_ERROR(("%s: Bogus plen #1\n",
-                                                  __func__));
+                                        WL_ERROR("%s: Bogus plen #1\n",
+                                                 __func__);
                                         ASSERT(3 == 4);
                                         continue;
                                 }
 
                                 /* check if there are enough descriptors available */
                                 if (TXAVAIL(wlc, fifo) <= (seg_cnt + 1)) {
-                                        WL_ERROR(("%s: No fifo space   !!!!!!\n", __func__));
+                                        WL_ERROR("%s: No fifo space   !!!!!!\n",
+                                                 __func__);
                                         p = NULL;
                                         continue;
                                 }
@@ -789,7 +786,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                 WLCNTADD(ampdu->cnt->txmpdu, count);
 
                 /* patch up the last txh */
-                txh = (d11txh_t *) PKTDATA(pkt[count - 1]);
+                txh = (d11txh_t *) pkt[count - 1]->data;
                 mcl = ltoh16(txh->MacTxControlLow);
                 mcl &= ~TXC_AMPDU_MASK;
                 mcl |= (TXC_AMPDU_LAST << TXC_AMPDU_SHIFT);
@@ -807,7 +804,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                 ampdu_len -= roundup(len, 4) - len;
 
                 /* patch up the first txh & plcp */
-                txh = (d11txh_t *) PKTDATA(pkt[0]);
+                txh = (d11txh_t *) pkt[0]->data;
                 plcp = (u8 *) (txh + 1);
 
                 WLC_SET_MIMO_PLCP_LEN(plcp, ampdu_len);
@@ -878,27 +875,18 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                         WLC_SET_MIMO_PLCP_AMPDU(txh->FragPLCPFallback);
                 }
 
-                WL_AMPDU_TX(("wl%d: wlc_sendampdu: count %d ampdu_len %d\n",
-                             wlc->pub->unit, count, ampdu_len));
+                WL_AMPDU_TX("wl%d: wlc_sendampdu: count %d ampdu_len %d\n",
+                            wlc->pub->unit, count, ampdu_len);
 
                 /* inform rate_sel if it this is a rate probe pkt */
                 frameid = ltoh16(txh->TxFrameID);
                 if (frameid & TXFID_RATE_PROBE_MASK) {
-                        WL_ERROR(("%s: XXX what to do with TXFID_RATE_PROBE_MASK!?\n", __func__));
+                        WL_ERROR("%s: XXX what to do with TXFID_RATE_PROBE_MASK!?\n",
+                                 __func__);
                 }
-#ifdef WLC_HIGH_ONLY
-                if (wlc->rpc_agg & BCM_RPC_TP_HOST_AGG_AMPDU)
-                        bcm_rpc_tp_agg_set(bcm_rpc_tp_get(wlc->rpc),
-                                           BCM_RPC_TP_HOST_AGG_AMPDU, true);
-#endif
                 for (i = 0; i < count; i++)
                         wlc_txfifo(wlc, fifo, pkt[i], i == (count - 1),
                                    ampdu->txpkt_weight);
-#ifdef WLC_HIGH_ONLY
-                if (wlc->rpc_agg & BCM_RPC_TP_HOST_AGG_AMPDU)
-                        bcm_rpc_tp_agg_set(bcm_rpc_tp_get(wlc->rpc),
-                                           BCM_RPC_TP_HOST_AGG_AMPDU, false);
-#endif
 
         }
         /* endif (count) */
@@ -906,11 +894,11 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 }
 
 void BCMFASTPATH
-wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
-                     tx_status_t *txs)
+wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
+                     struct sk_buff *p, tx_status_t *txs)
 {
         scb_ampdu_t *scb_ampdu;
-        wlc_info_t *wlc = ampdu->wlc;
+        struct wlc_info *wlc = ampdu->wlc;
         scb_ampdu_tid_ini_t *ini;
         u32 s1 = 0, s2 = 0;
         struct ieee80211_tx_info *tx_info;
@@ -922,7 +910,7 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
         ASSERT(txs->status & TX_STATUS_AMPDU);
         scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
         ASSERT(scb_ampdu);
-        ini = SCB_AMPDU_INI(scb_ampdu, PKTPRIO(p));
+        ini = SCB_AMPDU_INI(scb_ampdu, p->priority);
         ASSERT(ini->scb == scb);
 
         /* BMAC_NOTE: For the split driver, second level txstatus comes later
@@ -930,7 +918,6 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
          * call the first one
          */
         if (txs->status & TX_STATUS_ACK_RCV) {
-#ifdef WLC_LOW
                 u8 status_delay = 0;
 
                 /* wait till the next 8 bytes of txstatus is available */
@@ -948,54 +935,14 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
                 ASSERT(!(s1 & TX_STATUS_INTERMEDIATE));
                 ASSERT(s1 & TX_STATUS_AMPDU);
                 s2 = R_REG(wlc->osh, &wlc->regs->frmtxstatus2);
-#else                           /* WLC_LOW */
-
-                /* Store the relevant information in ampdu structure */
-                WL_AMPDU_TX(("wl%d: wlc_ampdu_dotxstatus: High Recvd\n",
-                             wlc->pub->unit));
-
-                ASSERT(!ampdu->p);
-                ampdu->p = p;
-                bcopy(txs, &ampdu->txs, sizeof(tx_status_t));
-                ampdu->waiting_status = true;
-                return;
-#endif                          /* WLC_LOW */
         }
 
         wlc_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);
         wlc_ampdu_txflowcontrol(wlc, scb_ampdu, ini);
 }
 
-#ifdef WLC_HIGH_ONLY
-void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, u32 s2)
-{
-        WL_AMPDU_TX(("wl%d: wlc_ampdu_txstatus_complete: High Recvd 0x%x 0x%x p:%p\n", ampdu->wlc->pub->unit, s1, s2, ampdu->p));
-
-        ASSERT(ampdu->waiting_status);
-
-        /* The packet may have been freed if the SCB went away, if so, then still free the
-         * DMA chain
-         */
-        if (ampdu->p) {
-                struct ieee80211_tx_info *tx_info;
-                struct scb *scb;
-
-                tx_info = IEEE80211_SKB_CB(ampdu->p);
-                scb = (struct scb *)tx_info->control.sta->drv_priv;
-
-                wlc_ampdu_dotxstatus_complete(ampdu, scb, ampdu->p, &ampdu->txs,
-                                              s1, s2);
-                ampdu->p = NULL;
-        }
-
-        ampdu->waiting_status = false;
-}
-#endif                          /* WLC_HIGH_ONLY */
-void rate_status(wlc_info_t *wlc, struct ieee80211_tx_info *tx_info,
-                 tx_status_t *txs, u8 mcs);
-
 void
-rate_status(wlc_info_t *wlc, struct ieee80211_tx_info *tx_info,
+rate_status(struct wlc_info *wlc, struct ieee80211_tx_info *tx_info,
             tx_status_t *txs, u8 mcs)
 {
         struct ieee80211_tx_rate *txrate = tx_info->status.rates;
@@ -1008,17 +955,15 @@ rate_status(wlc_info_t *wlc, struct ieee80211_tx_info *tx_info,
         }
 }
 
-extern void wlc_txq_enq(wlc_info_t *wlc, struct scb *scb, void *sdu,
-                        uint prec);
-
 #define SHORTNAME "AMPDU status"
 
 static void BCMFASTPATH
-wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
-                              tx_status_t *txs, u32 s1, u32 s2)
+wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
+                              struct sk_buff *p, tx_status_t *txs,
+                              u32 s1, u32 s2)
 {
         scb_ampdu_t *scb_ampdu;
-        wlc_info_t *wlc = ampdu->wlc;
+        struct wlc_info *wlc = ampdu->wlc;
         scb_ampdu_tid_ini_t *ini;
         u8 bitmap[8], queue, tid;
         d11txh_t *txh;
@@ -1037,7 +982,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
 
 #ifdef BCMDBG
         u8 hole[AMPDU_MAX_MPDU];
-        bzero(hole, sizeof(hole));
+        memset(hole, 0, sizeof(hole));
 #endif
 
         ASSERT(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
@@ -1046,7 +991,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
         scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
         ASSERT(scb_ampdu);
 
-        tid = (u8) PKTPRIO(p);
+        tid = (u8) (p->priority);
 
         ini = SCB_AMPDU_INI(scb_ampdu, tid);
         retry_limit = ampdu->retry_limit_tid[tid];
@@ -1054,7 +999,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
 
         ASSERT(ini->scb == scb);
 
-        bzero(bitmap, sizeof(bitmap));
+        memset(bitmap, 0, sizeof(bitmap));
         queue = txs->frameid & TXFID_QUEUE_MASK;
         ASSERT(queue < AC_COUNT);
 
@@ -1091,13 +1036,16 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                 if (supr_status) {
                         update_rate = false;
                         if (supr_status == TX_STATUS_SUPR_BADCH) {
-                                WL_ERROR(("%s: Pkt tx suppressed, illegal channel possibly %d\n", __func__, CHSPEC_CHANNEL(wlc->default_bss->chanspec)));
+                                WL_ERROR("%s: Pkt tx suppressed, illegal channel possibly %d\n",
+                                         __func__,
+                                         CHSPEC_CHANNEL(wlc->default_bss->chanspec));
                         } else {
                                 if (supr_status == TX_STATUS_SUPR_FRAG)
-                                        WL_NONE(("%s: AMPDU frag err\n",
-                                                 __func__));
+                                        WL_NONE("%s: AMPDU frag err\n",
+                                                __func__);
                                 else
-                                        WL_ERROR(("%s: wlc_ampdu_dotxstatus: supr_status 0x%x\n", __func__, supr_status));
+                                        WL_ERROR("%s: wlc_ampdu_dotxstatus: supr_status 0x%x\n",
+                                                 __func__, supr_status);
                         }
                         /* no need to retry for badch; will fail again */
                         if (supr_status == TX_STATUS_SUPR_BADCH ||
@@ -1116,22 +1064,18 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                                 if (wlc_ffpld_check_txfunfl(wlc, prio2fifo[tid])
                                     > 0) {
                                         tx_error = true;
-#ifdef WLC_HIGH_ONLY
-                                        /* With BMAC, TX Underflows should not happen */
-                                        WL_ERROR(("wl%d: BMAC TX Underflow?",
-                                                  wlc->pub->unit));
-#endif
                                 }
                         }
                 } else if (txs->phyerr) {
                         update_rate = false;
                         WLCNTINCR(wlc->pub->_cnt->txphyerr);
-                        WL_ERROR(("wl%d: wlc_ampdu_dotxstatus: tx phy error (0x%x)\n", wlc->pub->unit, txs->phyerr));
+                        WL_ERROR("wl%d: wlc_ampdu_dotxstatus: tx phy error (0x%x)\n",
+                                 wlc->pub->unit, txs->phyerr);
 
 #ifdef BCMDBG
                         if (WL_ERROR_ON()) {
                                 prpkt("txpkt (AMPDU)", wlc->osh, p);
-                                wlc_print_txdesc((d11txh_t *) PKTDATA(p));
+                                wlc_print_txdesc((d11txh_t *) p->data);
                                 wlc_print_txstatus(txs);
                         }
 #endif                          /* BCMDBG */
@@ -1142,7 +1086,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
         while (p) {
                 tx_info = IEEE80211_SKB_CB(p);
                 ASSERT(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
-                txh = (d11txh_t *) PKTDATA(p);
+                txh = (d11txh_t *) p->data;
                 mcl = ltoh16(txh->MacTxControlLow);
                 plcp = (u8 *) (txh + 1);
                 h = (struct dot11_header *)(plcp + D11_PHY_HDR_LEN);
@@ -1158,10 +1102,9 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                 if (ba_recd) {
                         bindex = MODSUB_POW2(seq, start_seq, SEQNUM_MAX);
 
-                        WL_AMPDU_TX(("%s: tid %d seq is %d, start_seq is %d, "
-                                     "bindex is %d set %d, index %d\n",
-                                     __func__, tid, seq, start_seq, bindex,
-                                     isset(bitmap, bindex), index));
+                        WL_AMPDU_TX("%s: tid %d seq is %d, start_seq is %d, bindex is %d set %d, index %d\n",
+                                    __func__, tid, seq, start_seq, bindex,
+                                    isset(bitmap, bindex), index);
 
                         /* if acked then clear bit and free packet */
                         if ((bindex < AMPDU_TX_BA_MAX_WSIZE)
@@ -1186,8 +1129,8 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                                      status & TX_STATUS_FRM_RTX_MASK) >>
                                     TX_STATUS_FRM_RTX_SHIFT;
 
-                                PKTPULL(p, D11_PHY_HDR_LEN);
-                                PKTPULL(p, D11_TXH_LEN);
+                                skb_pull(p, D11_PHY_HDR_LEN);
+                                skb_pull(p, D11_TXH_LEN);
 
                                 ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,
                                                             p);
@@ -1212,9 +1155,10 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                                 ieee80211_tx_info_clear_status(tx_info);
                                 tx_info->flags |=
                                     IEEE80211_TX_STAT_AMPDU_NO_BACK;
-                                PKTPULL(p, D11_PHY_HDR_LEN);
-                                PKTPULL(p, D11_TXH_LEN);
-                                WL_ERROR(("%s: BA Timeout, seq %d, in_transit %d\n", SHORTNAME, seq, ini->tx_in_transit));
+                                skb_pull(p, D11_PHY_HDR_LEN);
+                                skb_pull(p, D11_TXH_LEN);
+                                WL_ERROR("%s: BA Timeout, seq %d, in_transit %d\n",
+                                         SHORTNAME, seq, ini->tx_in_transit);
                                 ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,
                                                             p);
                         }
@@ -1242,7 +1186,7 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
 }
 
 static void
-ampdu_cleanup_tid_ini(ampdu_info_t *ampdu, scb_ampdu_t *scb_ampdu, u8 tid,
+ampdu_cleanup_tid_ini(struct ampdu_info *ampdu, scb_ampdu_t *scb_ampdu, u8 tid,
                       bool force)
 {
         scb_ampdu_tid_ini_t *ini;
@@ -1250,8 +1194,8 @@ ampdu_cleanup_tid_ini(ampdu_info_t *ampdu, scb_ampdu_t *scb_ampdu, u8 tid,
         if (!ini)
                 return;
 
-        WL_AMPDU_CTL(("wl%d: ampdu_cleanup_tid_ini: tid %d\n",
-                      ampdu->wlc->pub->unit, tid));
+        WL_AMPDU_CTL("wl%d: ampdu_cleanup_tid_ini: tid %d\n",
+                     ampdu->wlc->pub->unit, tid);
 
         if (ini->tx_in_transit && !force)
                 return;
@@ -1264,7 +1208,7 @@ ampdu_cleanup_tid_ini(ampdu_info_t *ampdu, scb_ampdu_t *scb_ampdu, u8 tid,
 }
 
 /* initialize the initiator code for tid */
-static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(ampdu_info_t *ampdu,
+static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(struct ampdu_info *ampdu,
                                                    scb_ampdu_t *scb_ampdu,
                                                    u8 tid, bool override)
 {
@@ -1277,7 +1221,7 @@ static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(ampdu_info_t *ampdu,
 
         /* check for per-tid control of ampdu */
         if (!ampdu->ini_enable[tid]) {
-                WL_ERROR(("%s: Rejecting tid %d\n", __func__, tid));
+                WL_ERROR("%s: Rejecting tid %d\n", __func__, tid);
                 return NULL;
         }
 
@@ -1290,21 +1234,21 @@ static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(ampdu_info_t *ampdu,
         return ini;
 }
 
-int wlc_ampdu_set(ampdu_info_t *ampdu, bool on)
+int wlc_ampdu_set(struct ampdu_info *ampdu, bool on)
 {
-        wlc_info_t *wlc = ampdu->wlc;
+        struct wlc_info *wlc = ampdu->wlc;
 
         wlc->pub->_ampdu = false;
 
         if (on) {
                 if (!N_ENAB(wlc->pub)) {
-                        WL_AMPDU_ERR(("wl%d: driver not nmode enabled\n",
-                                      wlc->pub->unit));
+                        WL_AMPDU_ERR("wl%d: driver not nmode enabled\n",
+                                     wlc->pub->unit);
                         return BCME_UNSUPPORTED;
                 }
                 if (!wlc_ampdu_cap(ampdu)) {
-                        WL_AMPDU_ERR(("wl%d: device not ampdu capable\n",
-                                      wlc->pub->unit));
+                        WL_AMPDU_ERR("wl%d: device not ampdu capable\n",
+                                     wlc->pub->unit);
                         return BCME_UNSUPPORTED;
                 }
                 wlc->pub->_ampdu = on;
@@ -1313,7 +1257,7 @@ int wlc_ampdu_set(ampdu_info_t *ampdu, bool on)
         return 0;
 }
 
-bool wlc_ampdu_cap(ampdu_info_t *ampdu)
+bool wlc_ampdu_cap(struct ampdu_info *ampdu)
 {
         if (WLC_PHY_11N_CAP(ampdu->wlc->band))
                 return true;
@@ -1321,7 +1265,7 @@ bool wlc_ampdu_cap(ampdu_info_t *ampdu)
                 return false;
 }
 
-static void ampdu_update_max_txlen(ampdu_info_t *ampdu, u8 dur)
+static void ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur)
 {
         u32 rate, mcs;
 
@@ -1343,7 +1287,7 @@ static void ampdu_update_max_txlen(ampdu_info_t *ampdu, u8 dur)
 }
 
 u8 BCMFASTPATH
-wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb,
+wlc_ampdu_null_delim_cnt(struct ampdu_info *ampdu, struct scb *scb,
                          ratespec_t rspec, int phylen)
 {
         scb_ampdu_t *scb_ampdu;
@@ -1379,25 +1323,25 @@ wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb,
                 return 0;
 }
 
-void wlc_ampdu_macaddr_upd(wlc_info_t *wlc)
+void wlc_ampdu_macaddr_upd(struct wlc_info *wlc)
 {
         char template[T_RAM_ACCESS_SZ * 2];
 
         /* driver needs to write the ta in the template; ta is at offset 16 */
-        bzero(template, sizeof(template));
-        bcopy((char *)wlc->pub->cur_etheraddr.octet, template, ETHER_ADDR_LEN);
+        memset(template, 0, sizeof(template));
+        bcopy((char *)wlc->pub->cur_etheraddr.octet, template, ETH_ALEN);
         wlc_write_template_ram(wlc, (T_BA_TPL_BASE + 16), (T_RAM_ACCESS_SZ * 2),
                                template);
 }
 
-bool wlc_aggregatable(wlc_info_t *wlc, u8 tid)
+bool wlc_aggregatable(struct wlc_info *wlc, u8 tid)
 {
         return wlc->ampdu->ini_enable[tid];
 }
 
-void wlc_ampdu_shm_upd(ampdu_info_t *ampdu)
+void wlc_ampdu_shm_upd(struct ampdu_info *ampdu)
 {
-        wlc_info_t *wlc = ampdu->wlc;
+        struct wlc_info *wlc = ampdu->wlc;
 
         /* Extend ucode internal watchdog timer to match larger received frames */
         if ((ampdu->rx_factor & HT_PARAMS_RX_FACTOR_MASK) ==
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h
index c721b16cc706..03457f63f2ab 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.h
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h
@@ -17,24 +17,20 @@
 #ifndef _wlc_ampdu_h_
 #define _wlc_ampdu_h_
 
-extern ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc);
-extern void wlc_ampdu_detach(ampdu_info_t *ampdu);
-extern bool wlc_ampdu_cap(ampdu_info_t *ampdu);
-extern int wlc_ampdu_set(ampdu_info_t *ampdu, bool on);
-extern int wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **aggp,
-                         int prec);
-extern void wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
-                                 tx_status_t *txs);
-extern void wlc_ampdu_reset(ampdu_info_t *ampdu);
-extern void wlc_ampdu_macaddr_upd(wlc_info_t *wlc);
-extern void wlc_ampdu_shm_upd(ampdu_info_t *ampdu);
+extern struct ampdu_info *wlc_ampdu_attach(struct wlc_info *wlc);
+extern void wlc_ampdu_detach(struct ampdu_info *ampdu);
+extern bool wlc_ampdu_cap(struct ampdu_info *ampdu);
+extern int wlc_ampdu_set(struct ampdu_info *ampdu, bool on);
+extern int wlc_sendampdu(struct ampdu_info *ampdu, wlc_txq_info_t *qi,
+                         struct sk_buff **aggp, int prec);
+extern void wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
+                                 struct sk_buff *p, tx_status_t *txs);
+extern void wlc_ampdu_reset(struct ampdu_info *ampdu);
+extern void wlc_ampdu_macaddr_upd(struct wlc_info *wlc);
+extern void wlc_ampdu_shm_upd(struct ampdu_info *ampdu);
 
-extern u8 wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb,
+extern u8 wlc_ampdu_null_delim_cnt(struct ampdu_info *ampdu, struct scb *scb,
                                       ratespec_t rspec, int phylen);
-extern void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb);
-#ifdef WLC_HIGH_ONLY
-extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1,
-                                        u32 s2);
-#endif
+extern void scb_ampdu_cleanup(struct ampdu_info *ampdu, struct scb *scb);
 
 #endif                          /* _wlc_ampdu_h_ */
diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c
index 5ff8831d2fa8..402ddf8f3371 100644
--- a/drivers/staging/brcm80211/sys/wlc_antsel.c
+++ b/drivers/staging/brcm80211/sys/wlc_antsel.c
@@ -19,18 +19,23 @@
 #ifdef WLANTSEL
 
 #include <linux/kernel.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <wlioctl.h>
 
+#include <bcmdevs.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_key.h>
 #include <wlc_pub.h>
 #include <wl_dbg.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_phy_hal.h>
@@ -58,10 +63,11 @@
 #define ANT_SELCFG_DEF_2x4      0x02    /* default antenna configuration */
 
 /* static functions */
-static int wlc_antsel_cfgupd(antsel_info_t *asi, wlc_antselcfg_t *antsel);
-static u8 wlc_antsel_id2antcfg(antsel_info_t *asi, u8 id);
-static u16 wlc_antsel_antcfg2antsel(antsel_info_t *asi, u8 ant_cfg);
-static void wlc_antsel_init_cfg(antsel_info_t *asi, wlc_antselcfg_t *antsel,
+static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel);
+static u8 wlc_antsel_id2antcfg(struct antsel_info *asi, u8 id);
+static u16 wlc_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg);
+static void wlc_antsel_init_cfg(struct antsel_info *asi,
+                                wlc_antselcfg_t *antsel,
                                 bool auto_sel);
 
 const u16 mimo_2x4_div_antselpat_tbl[] = {
@@ -88,14 +94,15 @@ const u8 mimo_2x3_div_antselid_tbl[16] = {
         0, 0, 0, 0, 0, 0, 0, 0  /* pat to antselid */
 };
 
-antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh,
-                                                  wlc_pub_t *pub,
-                                                  wlc_hw_info_t *wlc_hw) {
-        antsel_info_t *asi;
+struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,
+                                      struct osl_info *osh,
+                                      struct wlc_pub *pub,
+                                      struct wlc_hw_info *wlc_hw) {
+        struct antsel_info *asi;
 
-        asi = kzalloc(sizeof(antsel_info_t), GFP_ATOMIC);
+        asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);
         if (!asi) {
-                WL_ERROR(("wl%d: wlc_antsel_attach: out of mem\n", pub->unit));
+                WL_ERROR("wl%d: wlc_antsel_attach: out of mem\n", pub->unit);
                 return NULL;
         }
 
@@ -124,7 +131,7 @@ antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh,
                                 asi->antsel_avail = false;
                         } else {
                                 asi->antsel_avail = false;
-                                WL_ERROR(("wlc_antsel_attach: 2o3 board cfg invalid\n"));
+                                WL_ERROR("wlc_antsel_attach: 2o3 board cfg invalid\n");
                                 ASSERT(0);
                         }
                         break;
@@ -152,7 +159,7 @@ antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh,
         return asi;
 }
 
-void wlc_antsel_detach(antsel_info_t *asi)
+void wlc_antsel_detach(struct antsel_info *asi)
 {
         if (!asi)
                 return;
@@ -160,7 +167,7 @@ void wlc_antsel_detach(antsel_info_t *asi)
         kfree(asi);
 }
 
-void wlc_antsel_init(antsel_info_t *asi)
+void wlc_antsel_init(struct antsel_info *asi)
 {
         if ((asi->antsel_type == ANTSEL_2x3) ||
             (asi->antsel_type == ANTSEL_2x4))
@@ -169,7 +176,7 @@ void wlc_antsel_init(antsel_info_t *asi)
 
 /* boardlevel antenna selection: init antenna selection structure */
 static void
-wlc_antsel_init_cfg(antsel_info_t *asi, wlc_antselcfg_t *antsel,
+wlc_antsel_init_cfg(struct antsel_info *asi, wlc_antselcfg_t *antsel,
                     bool auto_sel)
 {
         if (asi->antsel_type == ANTSEL_2x3) {
@@ -200,7 +207,7 @@ wlc_antsel_init_cfg(antsel_info_t *asi, wlc_antselcfg_t *antsel,
 }
 
 void BCMFASTPATH
-wlc_antsel_antcfg_get(antsel_info_t *asi, bool usedef, bool sel,
+wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef, bool sel,
                       u8 antselid, u8 fbantselid, u8 *antcfg,
                       u8 *fbantcfg)
 {
@@ -232,7 +239,7 @@ wlc_antsel_antcfg_get(antsel_info_t *asi, bool usedef, bool sel,
 }
 
 /* boardlevel antenna selection: convert mimo_antsel (ucode interface) to id */
-u8 wlc_antsel_antsel2id(antsel_info_t *asi, u16 antsel)
+u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel)
 {
         u8 antselid = 0;
 
@@ -251,7 +258,7 @@ u8 wlc_antsel_antsel2id(antsel_info_t *asi, u16 antsel)
 }
 
 /* boardlevel antenna selection: convert id to ant_cfg */
-static u8 wlc_antsel_id2antcfg(antsel_info_t *asi, u8 id)
+static u8 wlc_antsel_id2antcfg(struct antsel_info *asi, u8 id)
 {
         u8 antcfg = ANT_SELCFG_DEF_2x2;
 
@@ -270,7 +277,7 @@ static u8 wlc_antsel_id2antcfg(antsel_info_t *asi, u8 id)
 }
 
 /* boardlevel antenna selection: convert ant_cfg to mimo_antsel (ucode interface) */
-static u16 wlc_antsel_antcfg2antsel(antsel_info_t *asi, u8 ant_cfg)
+static u16 wlc_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg)
 {
         u8 idx = WLC_ANTIDX_11N(WLC_ANTSEL_11N(ant_cfg));
         u16 mimo_antsel = 0;
@@ -290,9 +297,9 @@ static u16 wlc_antsel_antcfg2antsel(antsel_info_t *asi, u8 ant_cfg)
 }
 
 /* boardlevel antenna selection: ucode interface control */
-static int wlc_antsel_cfgupd(antsel_info_t *asi, wlc_antselcfg_t *antsel)
+static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel)
 {
-        wlc_info_t *wlc = asi->wlc;
+        struct wlc_info *wlc = asi->wlc;
         u8 ant_cfg;
         u16 mimo_antsel;
 
diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.h b/drivers/staging/brcm80211/sys/wlc_antsel.h
index 1d048bbea946..8875b5848665 100644
--- a/drivers/staging/brcm80211/sys/wlc_antsel.h
+++ b/drivers/staging/brcm80211/sys/wlc_antsel.h
@@ -16,13 +16,15 @@
 
 #ifndef _wlc_antsel_h_
 #define _wlc_antsel_h_
-extern antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh,
-                                        wlc_pub_t *pub,
-                                        wlc_hw_info_t *wlc_hw);
-extern void wlc_antsel_detach(antsel_info_t *asi);
-extern void wlc_antsel_init(antsel_info_t *asi);
-extern void wlc_antsel_antcfg_get(antsel_info_t *asi, bool usedef, bool sel,
+extern struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,
+                                        struct osl_info *osh,
+                                        struct wlc_pub *pub,
+                                        struct wlc_hw_info *wlc_hw);
+extern void wlc_antsel_detach(struct antsel_info *asi);
+extern void wlc_antsel_init(struct antsel_info *asi);
+extern void wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef,
+                                  bool sel,
                                   u8 id, u8 fbid, u8 *antcfg,
                                   u8 *fbantcfg);
-extern u8 wlc_antsel_antsel2id(antsel_info_t *asi, u16 antsel);
+extern u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel);
 #endif                          /* _wlc_antsel_h_ */
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index b70f9d099233..69f600affa46 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -14,13 +14,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef WLC_LOW
-#error "This file needs WLC_LOW"
-#endif
 
 #include <linux/kernel.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <proto/802.11.h>
@@ -42,12 +42,14 @@
 #include <wlc_channel.h>
 #include <bcmsrom.h>
 #include <wlc_key.h>
+#include <bcmdevs.h>
 /* BMAC_NOTE: a WLC_HIGH compile include of wlc.h adds in more structures and type
  * dependencies. Need to include these to files to allow a clean include of wlc.h
  * with WLC_HIGH defined.
  * At some point we may be able to skip the include of wlc.h and instead just
  * define a stub wlc_info and band struct to allow rpc calls to get the rpc handle.
  */
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_phy_shim.h>
@@ -55,9 +57,6 @@
 #include <wl_export.h>
 #include "wl_ucode.h"
 #include "d11ucode_ext.h"
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#endif
 #include <bcmotp.h>
 
 /* BMAC_NOTE: With WLC_HIGH defined, some fns in this file make calls to high level
@@ -69,6 +68,7 @@
 #include <pcie_core.h>
 
 #include <wlc_alloc.h>
+#include <wl_dbg.h>
 
 #define TIMER_INTERVAL_WATCHDOG_BMAC    1000    /* watchdog timer, in unit of ms */
 
@@ -113,64 +113,65 @@ static u16 xmtfifo_sz[][NFIFO] = {
         {9, 58, 22, 14, 14, 5}, /* corerev 24: 2304, 14848, 5632, 3584, 3584, 1280 */
 };
 
-static void wlc_clkctl_clk(wlc_hw_info_t *wlc, uint mode);
-static void wlc_coreinit(wlc_info_t *wlc);
+static void wlc_clkctl_clk(struct wlc_hw_info *wlc, uint mode);
+static void wlc_coreinit(struct wlc_info *wlc);
 
 /* used by wlc_wakeucode_init() */
-static void wlc_write_inits(wlc_hw_info_t *wlc_hw, const d11init_t *inits);
-static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const u32 ucode[],
+static void wlc_write_inits(struct wlc_hw_info *wlc_hw, const d11init_t *inits);
+static void wlc_ucode_write(struct wlc_hw_info *wlc_hw, const u32 ucode[],
                             const uint nbytes);
-static void wlc_ucode_download(wlc_hw_info_t *wlc);
-static void wlc_ucode_txant_set(wlc_hw_info_t *wlc_hw);
+static void wlc_ucode_download(struct wlc_hw_info *wlc);
+static void wlc_ucode_txant_set(struct wlc_hw_info *wlc_hw);
 
 /* used by wlc_dpc() */
-static bool wlc_bmac_dotxstatus(wlc_hw_info_t *wlc, tx_status_t *txs,
+static bool wlc_bmac_dotxstatus(struct wlc_hw_info *wlc, tx_status_t *txs,
                                 u32 s2);
-static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc);
-static bool wlc_bmac_txstatus(wlc_hw_info_t *wlc, bool bound, bool *fatal);
-static bool wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound);
+static bool wlc_bmac_txstatus_corerev4(struct wlc_hw_info *wlc);
+static bool wlc_bmac_txstatus(struct wlc_hw_info *wlc, bool bound, bool *fatal);
+static bool wlc_bmac_recv(struct wlc_hw_info *wlc_hw, uint fifo, bool bound);
 
 /* used by wlc_down() */
-static void wlc_flushqueues(wlc_info_t *wlc);
+static void wlc_flushqueues(struct wlc_info *wlc);
 
-static void wlc_write_mhf(wlc_hw_info_t *wlc_hw, u16 *mhfs);
-static void wlc_mctrl_reset(wlc_hw_info_t *wlc_hw);
-static void wlc_corerev_fifofixup(wlc_hw_info_t *wlc_hw);
+static void wlc_write_mhf(struct wlc_hw_info *wlc_hw, u16 *mhfs);
+static void wlc_mctrl_reset(struct wlc_hw_info *wlc_hw);
+static void wlc_corerev_fifofixup(struct wlc_hw_info *wlc_hw);
 
 /* Low Level Prototypes */
-static u16 wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset,
+static u16 wlc_bmac_read_objmem(struct wlc_hw_info *wlc_hw, uint offset,
                                    u32 sel);
-static void wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v,
-                                  u32 sel);
-static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme);
-static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw);
-static void wlc_ucode_bsinit(wlc_hw_info_t *wlc_hw);
-static bool wlc_validboardtype(wlc_hw_info_t *wlc);
-static bool wlc_isgoodchip(wlc_hw_info_t *wlc_hw);
-static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw);
-static void wlc_mhfdef(wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init);
-static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw);
-static void wlc_ucode_mute_override_set(wlc_hw_info_t *wlc_hw);
-static void wlc_ucode_mute_override_clear(wlc_hw_info_t *wlc_hw);
-static u32 wlc_wlintrsoff(wlc_info_t *wlc);
-static void wlc_wlintrsrestore(wlc_info_t *wlc, u32 macintmask);
-static void wlc_gpio_init(wlc_info_t *wlc);
-static void wlc_write_hw_bcntemplate0(wlc_hw_info_t *wlc_hw, void *bcn,
+static void wlc_bmac_write_objmem(struct wlc_hw_info *wlc_hw, uint offset,
+                                  u16 v, u32 sel);
+static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme);
+static void wlc_bmac_detach_dmapio(struct wlc_hw_info *wlc_hw);
+static void wlc_ucode_bsinit(struct wlc_hw_info *wlc_hw);
+static bool wlc_validboardtype(struct wlc_hw_info *wlc);
+static bool wlc_isgoodchip(struct wlc_hw_info *wlc_hw);
+static char *wlc_get_macaddr(struct wlc_hw_info *wlc_hw);
+static void wlc_mhfdef(struct wlc_info *wlc, u16 *mhfs, u16 mhf2_init);
+static void wlc_mctrl_write(struct wlc_hw_info *wlc_hw);
+static void wlc_ucode_mute_override_set(struct wlc_hw_info *wlc_hw);
+static void wlc_ucode_mute_override_clear(struct wlc_hw_info *wlc_hw);
+static u32 wlc_wlintrsoff(struct wlc_info *wlc);
+static void wlc_wlintrsrestore(struct wlc_info *wlc, u32 macintmask);
+static void wlc_gpio_init(struct wlc_info *wlc);
+static void wlc_write_hw_bcntemplate0(struct wlc_hw_info *wlc_hw, void *bcn,
                                       int len);
-static void wlc_write_hw_bcntemplate1(wlc_hw_info_t *wlc_hw, void *bcn,
+static void wlc_write_hw_bcntemplate1(struct wlc_hw_info *wlc_hw, void *bcn,
                                       int len);
-static void wlc_bmac_bsinit(wlc_info_t *wlc, chanspec_t chanspec);
-static u32 wlc_setband_inact(wlc_info_t *wlc, uint bandunit);
-static void wlc_bmac_setband(wlc_hw_info_t *wlc_hw, uint bandunit,
+static void wlc_bmac_bsinit(struct wlc_info *wlc, chanspec_t chanspec);
+static u32 wlc_setband_inact(struct wlc_info *wlc, uint bandunit);
+static void wlc_bmac_setband(struct wlc_hw_info *wlc_hw, uint bandunit,
                              chanspec_t chanspec);
-static void wlc_bmac_update_slot_timing(wlc_hw_info_t *wlc_hw, bool shortslot);
-static void wlc_upd_ofdm_pctl1_table(wlc_hw_info_t *wlc_hw);
-static u16 wlc_bmac_ofdm_ratetable_offset(wlc_hw_info_t *wlc_hw,
+static void wlc_bmac_update_slot_timing(struct wlc_hw_info *wlc_hw,
+                                        bool shortslot);
+static void wlc_upd_ofdm_pctl1_table(struct wlc_hw_info *wlc_hw);
+static u16 wlc_bmac_ofdm_ratetable_offset(struct wlc_hw_info *wlc_hw,
                                              u8 rate);
 
 /* === Low Level functions === */
 
-void wlc_bmac_set_shortslot(wlc_hw_info_t *wlc_hw, bool shortslot)
+void wlc_bmac_set_shortslot(struct wlc_hw_info *wlc_hw, bool shortslot)
 {
         wlc_hw->shortslot = shortslot;
 
@@ -186,9 +187,10 @@ void wlc_bmac_set_shortslot(wlc_hw_info_t *wlc_hw, bool shortslot)
  * or shortslot 11g (9us slots)
  * The PSM needs to be suspended for this call.
  */
-static void wlc_bmac_update_slot_timing(wlc_hw_info_t *wlc_hw, bool shortslot)
+static void wlc_bmac_update_slot_timing(struct wlc_hw_info *wlc_hw,
+                                        bool shortslot)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs;
 
         osh = wlc_hw->osh;
@@ -205,7 +207,7 @@ static void wlc_bmac_update_slot_timing(wlc_hw_info_t *wlc_hw, bool shortslot)
         }
 }
 
-static void WLBANDINITFN(wlc_ucode_bsinit) (wlc_hw_info_t *wlc_hw)
+static void WLBANDINITFN(wlc_ucode_bsinit) (struct wlc_hw_info *wlc_hw)
 {
         /* init microcode host flags */
         wlc_write_mhf(wlc_hw, wlc_hw->band->mhfs);
@@ -215,30 +217,32 @@ static void WLBANDINITFN(wlc_ucode_bsinit) (wlc_hw_info_t *wlc_hw)
                 if (WLCISNPHY(wlc_hw->band)) {
                         wlc_write_inits(wlc_hw, d11n0bsinitvals16);
                 } else {
-                        WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         } else {
                 if (D11REV_IS(wlc_hw->corerev, 24)) {
                         if (WLCISLCNPHY(wlc_hw->band)) {
                                 wlc_write_inits(wlc_hw, d11lcn0bsinitvals24);
                         } else
-                                WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n", __func__, wlc_hw->unit, wlc_hw->corerev));
+                                WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                         __func__, wlc_hw->unit,
+                                         wlc_hw->corerev);
                 } else {
-                        WL_ERROR(("%s: wl%d: unsupported corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         }
 }
 
 /* switch to new band but leave it inactive */
-static u32 WLBANDINITFN(wlc_setband_inact) (wlc_info_t *wlc, uint bandunit)
+static u32 WLBANDINITFN(wlc_setband_inact) (struct wlc_info *wlc, uint bandunit)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         u32 macintmask;
         u32 tmp;
 
-        WL_TRACE(("wl%d: wlc_setband_inact\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_setband_inact\n", wlc_hw->unit);
 
         ASSERT(bandunit != wlc_hw->band->bandunit);
         ASSERT(si_iscoreup(wlc_hw->sih));
@@ -269,24 +273,24 @@ static u32 WLBANDINITFN(wlc_setband_inact) (wlc_info_t *wlc, uint bandunit)
  * Param 'bound' indicates max. # frames to process before break out.
  */
 static bool BCMFASTPATH
-wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound)
+wlc_bmac_recv(struct wlc_hw_info *wlc_hw, uint fifo, bool bound)
 {
-        void *p;
-        void *head = NULL;
-        void *tail = NULL;
+        struct sk_buff *p;
+        struct sk_buff *head = NULL;
+        struct sk_buff *tail = NULL;
         uint n = 0;
         uint bound_limit = bound ? wlc_hw->wlc->pub->tunables->rxbnd : -1;
         u32 tsf_h, tsf_l;
         wlc_d11rxhdr_t *wlc_rxhdr = NULL;
 
-        WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__);
         /* gather received frames */
         while ((p = dma_rx(wlc_hw->di[fifo]))) {
 
                 if (!tail)
                         head = tail = p;
                 else {
-                        PKTSETLINK(tail, p);
+                        tail->prev = p;
                         tail = p;
                 }
 
@@ -303,11 +307,11 @@ wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound)
 
         /* process each frame */
         while ((p = head) != NULL) {
-                head = PKTLINK(head);
-                PKTSETLINK(p, NULL);
+                head = head->prev;
+                p->prev = NULL;
 
                 /* record the tsf_l in wlc_rxd11hdr */
-                wlc_rxhdr = (wlc_d11rxhdr_t *) PKTDATA(p);
+                wlc_rxhdr = (wlc_d11rxhdr_t *) p->data;
                 wlc_rxhdr->tsf_l = htol32(tsf_l);
 
                 /* compute the RSSI from d11rxhdr and record it in wlc_rxd11hr */
@@ -323,15 +327,15 @@ wlc_bmac_recv(wlc_hw_info_t *wlc_hw, uint fifo, bool bound)
  *   Return true if another dpc needs to be re-scheduled. false otherwise.
  *   Param 'bounded' indicates if applicable loops should be bounded.
  */
-bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
+bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool bounded)
 {
         u32 macintstatus;
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs = wlc_hw->regs;
         bool fatal = false;
 
         if (DEVICEREMOVED(wlc)) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc_hw->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc_hw->unit, __func__);
                 wl_down(wlc->wl);
                 return false;
         }
@@ -340,8 +344,8 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
         macintstatus = wlc->macintstatus;
         wlc->macintstatus = 0;
 
-        WL_TRACE(("wl%d: wlc_dpc: macintstatus 0x%x\n", wlc_hw->unit,
-                  macintstatus));
+        WL_TRACE("wl%d: wlc_dpc: macintstatus 0x%x\n",
+                 wlc_hw->unit, macintstatus);
 
         if (macintstatus & MI_PRQ) {
                 /* Process probe request FIFO */
@@ -364,7 +368,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
                 if (wlc_bmac_txstatus(wlc->hw, bounded, &fatal))
                         wlc->macintstatus |= MI_TFS;
                 if (fatal) {
-                        WL_ERROR(("MI_TFS: fatal\n"));
+                        WL_ERROR("MI_TFS: fatal\n");
                         goto fatal;
                 }
         }
@@ -374,7 +378,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
 
         /* ATIM window end */
         if (macintstatus & MI_ATIMWINEND) {
-                WL_TRACE(("wlc_isr: end of ATIM window\n"));
+                WL_TRACE("wlc_isr: end of ATIM window\n");
 
                 OR_REG(wlc_hw->osh, &regs->maccommand, wlc->qvalid);
                 wlc->qvalid = 0;
@@ -395,7 +399,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
         /* TX FIFO suspend/flush completion */
         if (macintstatus & MI_TXSTOP) {
                 if (wlc_bmac_tx_fifo_suspended(wlc_hw, TX_DATA_FIFO)) {
-                        /*      WL_ERROR(("dpc: fifo_suspend_comlete\n")); */
+                        /*      WL_ERROR("dpc: fifo_suspend_comlete\n"); */
                 }
         }
 
@@ -405,11 +409,12 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
         }
 
         if (macintstatus & MI_GP0) {
-                WL_ERROR(("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now));
+                WL_ERROR("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n",
+                         wlc_hw->unit, wlc_hw->now);
 
                 printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
-                            __func__, CHIPID(wlc_hw->sih->chip),
-                            CHIPREV(wlc_hw->sih->chiprev));
+                                        __func__, wlc_hw->sih->chip,
+                                        wlc_hw->sih->chiprev);
 
                 WLCNTINCR(wlc->pub->_cnt->psmwds);
 
@@ -427,7 +432,8 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
                 u32 rfd = R_REG(wlc_hw->osh, &regs->phydebug) & PDBG_RFD;
 #endif
 
-                WL_ERROR(("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n", wlc_hw->unit, rfd));
+                WL_ERROR("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n",
+                         wlc_hw->unit, rfd);
 
                 WLCNTINCR(wlc->pub->_cnt->rfdisable);
         }
@@ -452,10 +458,10 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded)
 /* common low-level watchdog code */
 void wlc_bmac_watchdog(void *arg)
 {
-        wlc_info_t *wlc = (wlc_info_t *) arg;
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_info *wlc = (struct wlc_info *) arg;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
 
-        WL_TRACE(("wl%d: wlc_bmac_watchdog\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_watchdog\n", wlc_hw->unit);
 
         if (!wlc_hw->up)
                 return;
@@ -476,13 +482,13 @@ void wlc_bmac_watchdog(void *arg)
 }
 
 void
-wlc_bmac_set_chanspec(wlc_hw_info_t *wlc_hw, chanspec_t chanspec, bool mute,
-                      struct txpwr_limits *txpwr)
+wlc_bmac_set_chanspec(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
+                      bool mute, struct txpwr_limits *txpwr)
 {
         uint bandunit;
 
-        WL_TRACE(("wl%d: wlc_bmac_set_chanspec 0x%x\n", wlc_hw->unit,
-                  chanspec));
+        WL_TRACE("wl%d: wlc_bmac_set_chanspec 0x%x\n",
+                 wlc_hw->unit, chanspec);
 
         wlc_hw->chanspec = chanspec;
 
@@ -520,7 +526,8 @@ wlc_bmac_set_chanspec(wlc_hw_info_t *wlc_hw, chanspec_t chanspec, bool mute,
         }
 }
 
-int wlc_bmac_revinfo_get(wlc_hw_info_t *wlc_hw, wlc_bmac_revinfo_t *revinfo)
+int wlc_bmac_revinfo_get(struct wlc_hw_info *wlc_hw,
+                         wlc_bmac_revinfo_t *revinfo)
 {
         si_t *sih = wlc_hw->sih;
         uint idx;
@@ -558,20 +565,20 @@ int wlc_bmac_revinfo_get(wlc_hw_info_t *wlc_hw, wlc_bmac_revinfo_t *revinfo)
         return 0;
 }
 
-int wlc_bmac_state_get(wlc_hw_info_t *wlc_hw, wlc_bmac_state_t *state)
+int wlc_bmac_state_get(struct wlc_hw_info *wlc_hw, wlc_bmac_state_t *state)
 {
         state->machwcap = wlc_hw->machwcap;
 
         return 0;
 }
 
-static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
+static bool wlc_bmac_attach_dmapio(struct wlc_info *wlc, uint j, bool wme)
 {
         uint i;
         char name[8];
         /* ucode host flag 2 needed for pio mode, independent of band and fifo */
         u16 pio_mhf2 = 0;
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         uint unit = wlc_hw->unit;
         wlc_tunables_t *tune = wlc->pub->tunables;
 
@@ -581,7 +588,7 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
         if (wlc_hw->di[0] == 0) {       /* Init FIFOs */
                 uint addrwidth;
                 int dma_attach_err = 0;
-                osl_t *osh = wlc_hw->osh;
+                struct osl_info *osh = wlc_hw->osh;
 
                 /* Find out the DMA addressing capability and let OS know
                  * All the channels within one DMA core have 'common-minimum' same
@@ -589,10 +596,10 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
                  */
                 addrwidth =
                     dma_addrwidth(wlc_hw->sih, DMAREG(wlc_hw, DMA_TX, 0));
-                OSL_DMADDRWIDTH(osh, addrwidth);
 
                 if (!wl_alloc_dma_resources(wlc_hw->wlc->wl, addrwidth)) {
-                        WL_ERROR(("wl%d: wlc_attach: alloc_dma_resources failed\n", unit));
+                        WL_ERROR("wl%d: wlc_attach: alloc_dma_resources failed\n",
+                                 unit);
                         return false;
                 }
 
@@ -665,8 +672,7 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
 /* Cleaner to leave this as if with AP defined */
 
                 if (dma_attach_err) {
-                        WL_ERROR(("wl%d: wlc_attach: dma_attach failed\n",
-                                  unit));
+                        WL_ERROR("wl%d: wlc_attach: dma_attach failed\n", unit);
                         return false;
                 }
 
@@ -684,7 +690,7 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
         return true;
 }
 
-static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw)
+static void wlc_bmac_detach_dmapio(struct wlc_hw_info *wlc_hw)
 {
         uint j;
 
@@ -702,11 +708,11 @@ static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw)
  *    initialize software state for each core and band
  *    put the whole chip in reset(driver down state), no clock
  */
-int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
-                    bool piomode, osl_t *osh, void *regsva, uint bustype,
-                    void *btparam)
+int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device, uint unit,
+                    bool piomode, struct osl_info *osh, void *regsva,
+                    uint bustype, void *btparam)
 {
-        wlc_hw_info_t *wlc_hw;
+        struct wlc_hw_info *wlc_hw;
         d11regs_t *regs;
         char *macaddr = NULL;
         char *vars;
@@ -715,8 +721,8 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         bool wme = false;
         shared_phy_params_t sha_params;
 
-        WL_TRACE(("wl%d: wlc_bmac_attach: vendor 0x%x device 0x%x\n", unit,
-                  vendor, device));
+        WL_TRACE("wl%d: wlc_bmac_attach: vendor 0x%x device 0x%x\n",
+                 unit, vendor, device);
 
         ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF);
 
@@ -729,7 +735,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         wlc_hw->band = wlc_hw->bandstate[0];
         wlc_hw->_piomode = piomode;
 
-        /* populate wlc_hw_info_t with default values  */
+        /* populate struct wlc_hw_info with default values  */
         wlc_bmac_info_init(wlc_hw);
 
         /*
@@ -740,7 +746,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         wlc_hw->sih = si_attach((uint) device, osh, regsva, bustype, btparam,
                                 &wlc_hw->vars, &wlc_hw->vars_size);
         if (wlc_hw->sih == NULL) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: si_attach failed\n", unit));
+                WL_ERROR("wl%d: wlc_bmac_attach: si_attach failed\n", unit);
                 err = 11;
                 goto fail;
         }
@@ -760,21 +766,22 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
                 var = getvar(vars, "vendid");
                 if (var) {
                         vendor = (u16) simple_strtoul(var, NULL, 0);
-                        WL_ERROR(("Overriding vendor id = 0x%x\n", vendor));
+                        WL_ERROR("Overriding vendor id = 0x%x\n", vendor);
                 }
                 var = getvar(vars, "devid");
                 if (var) {
                         u16 devid = (u16) simple_strtoul(var, NULL, 0);
                         if (devid != 0xffff) {
                                 device = devid;
-                                WL_ERROR(("Overriding device id = 0x%x\n",
-                                          device));
+                                WL_ERROR("Overriding device id = 0x%x\n",
+                                         device);
                         }
                 }
 
                 /* verify again the device is supported */
                 if (!wlc_chipmatch(vendor, device)) {
-                        WL_ERROR(("wl%d: wlc_bmac_attach: Unsupported vendor/device (0x%x/0x%x)\n", unit, vendor, device));
+                        WL_ERROR("wl%d: wlc_bmac_attach: Unsupported vendor/device (0x%x/0x%x)\n",
+                                 unit, vendor, device);
                         err = 12;
                         goto fail;
                 }
@@ -809,7 +816,8 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         wlc_bmac_corereset(wlc_hw, WLC_USE_COREFLAGS);
 
         if (!wlc_bmac_validate_chip_access(wlc_hw)) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: validate_chip_access failed\n", unit));
+                WL_ERROR("wl%d: wlc_bmac_attach: validate_chip_access failed\n",
+                         unit);
                 err = 14;
                 goto fail;
         }
@@ -821,7 +829,8 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
                 j = BOARDREV_PROMOTED;
         wlc_hw->boardrev = (u16) j;
         if (!wlc_validboardtype(wlc_hw)) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: Unsupported Broadcom board type (0x%x)" " or revision level (0x%x)\n", unit, wlc_hw->sih->boardtype, wlc_hw->boardrev));
+                WL_ERROR("wl%d: wlc_bmac_attach: Unsupported Broadcom board type (0x%x)" " or revision level (0x%x)\n",
+                         unit, wlc_hw->sih->boardtype, wlc_hw->boardrev);
                 err = 15;
                 goto fail;
         }
@@ -833,7 +842,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
             || (wlc_hw->boardflags & BFL_NOPLLDOWN))
                 wlc_bmac_pllreq(wlc_hw, true, WLC_PLLREQ_SHARED);
 
-        if ((BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+        if ((wlc_hw->sih->bustype == PCI_BUS)
             && (si_pci_war16165(wlc_hw->sih)))
                 wlc->war16165 = true;
 
@@ -844,7 +853,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         } else
                 wlc_hw->_nbands = 1;
 
-        if ((CHIPID(wlc_hw->sih->chip) == BCM43225_CHIP_ID))
+        if ((wlc_hw->sih->chip == BCM43225_CHIP_ID))
                 wlc_hw->_nbands = 1;
 
         /* BMAC_NOTE: remove init of pub values when wlc_attach() unconditionally does the
@@ -863,8 +872,8 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         wlc_hw->physhim = wlc_phy_shim_attach(wlc_hw, wlc->wl, wlc);
 
         if (wlc_hw->physhim == NULL) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: wlc_phy_shim_attach failed\n",
-                          unit));
+                WL_ERROR("wl%d: wlc_bmac_attach: wlc_phy_shim_attach failed\n",
+                         unit);
                 err = 25;
                 goto fail;
         }
@@ -931,7 +940,8 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
                 wlc_hw->band->pi = wlc_phy_attach(wlc_hw->phy_sh,
                         (void *)regs, wlc_hw->band->bandtype, vars);
                 if (wlc_hw->band->pi == NULL) {
-                        WL_ERROR(("wl%d: wlc_bmac_attach: wlc_phy_attach failed\n", unit));
+                        WL_ERROR("wl%d: wlc_bmac_attach: wlc_phy_attach failed\n",
+                                 unit);
                         err = 17;
                         goto fail;
                 }
@@ -961,7 +971,9 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
                                 goto bad_phy;
                 } else {
  bad_phy:
-                        WL_ERROR(("wl%d: wlc_bmac_attach: unsupported phy type/rev (%d/%d)\n", unit, wlc_hw->band->phytype, wlc_hw->band->phyrev));
+                        WL_ERROR("wl%d: wlc_bmac_attach: unsupported phy type/rev (%d/%d)\n",
+                                 unit,
+                                 wlc_hw->band->phytype, wlc_hw->band->phyrev);
                         err = 18;
                         goto fail;
                 }
@@ -993,7 +1005,7 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         wlc_coredisable(wlc_hw);
 
         /* Match driver "down" state */
-        if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+        if (wlc_hw->sih->bustype == PCI_BUS)
                 si_pci_down(wlc_hw->sih);
 
         /* register sb interrupt callback functions */
@@ -1016,27 +1028,27 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
         /* init etheraddr state variables */
         macaddr = wlc_get_macaddr(wlc_hw);
         if (macaddr == NULL) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: macaddr not found\n", unit));
+                WL_ERROR("wl%d: wlc_bmac_attach: macaddr not found\n", unit);
                 err = 21;
                 goto fail;
         }
         bcm_ether_atoe(macaddr, &wlc_hw->etheraddr);
-        if (ETHER_ISBCAST((char *)&wlc_hw->etheraddr) ||
-            ETHER_ISNULLADDR((char *)&wlc_hw->etheraddr)) {
-                WL_ERROR(("wl%d: wlc_bmac_attach: bad macaddr %s\n", unit,
-                          macaddr));
+        if (is_broadcast_ether_addr(wlc_hw->etheraddr.octet) ||
+            is_zero_ether_addr(wlc_hw->etheraddr.octet)) {
+                WL_ERROR("wl%d: wlc_bmac_attach: bad macaddr %s\n",
+                         unit, macaddr);
                 err = 22;
                 goto fail;
         }
 
-        WL_ERROR(("%s:: deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
-                  __func__, wlc_hw->deviceid, wlc_hw->_nbands,
-                  wlc_hw->sih->boardtype, macaddr));
+        WL_ERROR("%s:: deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
+                 __func__, wlc_hw->deviceid, wlc_hw->_nbands,
+                 wlc_hw->sih->boardtype, macaddr);
 
         return err;
 
  fail:
-        WL_ERROR(("wl%d: wlc_bmac_attach: failed with err %d\n", unit, err));
+        WL_ERROR("wl%d: wlc_bmac_attach: failed with err %d\n", unit, err);
         return err;
 }
 
@@ -1045,9 +1057,9 @@ int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
  * may get overrides later in this function
  *  BMAC_NOTES, move low out and resolve the dangling ones
  */
-void wlc_bmac_info_init(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_info_init(struct wlc_hw_info *wlc_hw)
 {
-        wlc_info_t *wlc = wlc_hw->wlc;
+        struct wlc_info *wlc = wlc_hw->wlc;
 
         /* set default sw macintmask value */
         wlc->defmacintmask = DEF_MACINTMASK;
@@ -1067,11 +1079,11 @@ void wlc_bmac_info_init(wlc_hw_info_t *wlc_hw)
 /*
  * low level detach
  */
-int wlc_bmac_detach(wlc_info_t *wlc)
+int wlc_bmac_detach(struct wlc_info *wlc)
 {
         uint i;
         wlc_hwband_t *band;
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         int callbacks;
 
         callbacks = 0;
@@ -1082,7 +1094,7 @@ int wlc_bmac_detach(wlc_info_t *wlc)
                  */
                 si_deregister_intr_callback(wlc_hw->sih);
 
-                if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+                if (wlc_hw->sih->bustype == PCI_BUS)
                         si_pci_sleep(wlc_hw->sih);
         }
 
@@ -1118,9 +1130,9 @@ int wlc_bmac_detach(wlc_info_t *wlc)
 
 }
 
-void wlc_bmac_reset(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_reset(struct wlc_hw_info *wlc_hw)
 {
-        WL_TRACE(("wl%d: wlc_bmac_reset\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_reset\n", wlc_hw->unit);
 
         WLCNTINCR(wlc_hw->wlc->pub->_cnt->reset);
 
@@ -1135,13 +1147,13 @@ void wlc_bmac_reset(wlc_hw_info_t *wlc_hw)
 }
 
 void
-wlc_bmac_init(wlc_hw_info_t *wlc_hw, chanspec_t chanspec,
+wlc_bmac_init(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
                           bool mute) {
         u32 macintmask;
         bool fastclk;
-        wlc_info_t *wlc = wlc_hw->wlc;
+        struct wlc_info *wlc = wlc_hw->wlc;
 
-        WL_TRACE(("wl%d: wlc_bmac_init\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_init\n", wlc_hw->unit);
 
         /* request FAST clock if not on */
         fastclk = wlc_hw->forcefastclk;
@@ -1186,11 +1198,11 @@ wlc_bmac_init(wlc_hw_info_t *wlc_hw, chanspec_t chanspec,
                 wlc_clkctl_clk(wlc_hw, CLK_DYNAMIC);
 }
 
-int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw)
+int wlc_bmac_up_prep(struct wlc_hw_info *wlc_hw)
 {
         uint coremask;
 
-        WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc_hw->unit, __func__);
 
         ASSERT(wlc_hw->wlc->pub->hw_up && wlc_hw->wlc->macintmask == 0);
 
@@ -1208,7 +1220,7 @@ int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw)
          */
         coremask = (1 << wlc_hw->wlc->core->coreidx);
 
-        if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+        if (wlc_hw->sih->bustype == PCI_BUS)
                 si_pci_setup(wlc_hw->sih, coremask);
 
         ASSERT(si_coreid(wlc_hw->sih) == D11_CORE_ID);
@@ -1219,13 +1231,13 @@ int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw)
          */
         if (wlc_bmac_radio_read_hwdisabled(wlc_hw)) {
                 /* put SB PCI in down state again */
-                if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+                if (wlc_hw->sih->bustype == PCI_BUS)
                         si_pci_down(wlc_hw->sih);
                 wlc_bmac_xtal(wlc_hw, OFF);
                 return BCME_RADIOOFF;
         }
 
-        if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+        if (wlc_hw->sih->bustype == PCI_BUS)
                 si_pci_up(wlc_hw->sih);
 
         /* reset the d11 core */
@@ -1234,9 +1246,9 @@ int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw)
         return 0;
 }
 
-int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw)
+int wlc_bmac_up_finish(struct wlc_hw_info *wlc_hw)
 {
-        WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc_hw->unit, __func__);
 
         wlc_hw->up = true;
         wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
@@ -1248,12 +1260,12 @@ int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw)
         return 0;
 }
 
-int wlc_bmac_down_prep(wlc_hw_info_t *wlc_hw)
+int wlc_bmac_down_prep(struct wlc_hw_info *wlc_hw)
 {
         bool dev_gone;
         uint callbacks = 0;
 
-        WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc_hw->unit, __func__);
 
         if (!wlc_hw->up)
                 return callbacks;
@@ -1276,12 +1288,12 @@ int wlc_bmac_down_prep(wlc_hw_info_t *wlc_hw)
         return callbacks;
 }
 
-int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw)
+int wlc_bmac_down_finish(struct wlc_hw_info *wlc_hw)
 {
         uint callbacks = 0;
         bool dev_gone;
 
-        WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc_hw->unit, __func__);
 
         if (!wlc_hw->up)
                 return callbacks;
@@ -1311,7 +1323,7 @@ int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw)
 
                 /* turn off primary xtal and pll */
                 if (!wlc_hw->noreset) {
-                        if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS)
+                        if (wlc_hw->sih->bustype == PCI_BUS)
                                 si_pci_down(wlc_hw->sih);
                         wlc_bmac_xtal(wlc_hw, OFF);
                 }
@@ -1320,7 +1332,7 @@ int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw)
         return callbacks;
 }
 
-void wlc_bmac_wait_for_wake(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_wait_for_wake(struct wlc_hw_info *wlc_hw)
 {
         if (D11REV_IS(wlc_hw->corerev, 4))      /* no slowclock */
                 udelay(5);
@@ -1336,29 +1348,30 @@ void wlc_bmac_wait_for_wake(wlc_hw_info_t *wlc_hw)
         ASSERT(wlc_bmac_read_shm(wlc_hw, M_UCODE_DBGST) != DBGST_ASLEEP);
 }
 
-void wlc_bmac_hw_etheraddr(wlc_hw_info_t *wlc_hw, struct ether_addr *ea)
+void wlc_bmac_hw_etheraddr(struct wlc_hw_info *wlc_hw, struct ether_addr *ea)
 {
-        bcopy(&wlc_hw->etheraddr, ea, ETHER_ADDR_LEN);
+        bcopy(&wlc_hw->etheraddr, ea, ETH_ALEN);
 }
 
-void wlc_bmac_set_hw_etheraddr(wlc_hw_info_t *wlc_hw, struct ether_addr *ea)
+void wlc_bmac_set_hw_etheraddr(struct wlc_hw_info *wlc_hw,
+                               struct ether_addr *ea)
 {
-        bcopy(ea, &wlc_hw->etheraddr, ETHER_ADDR_LEN);
+        bcopy(ea, &wlc_hw->etheraddr, ETH_ALEN);
 }
 
-int wlc_bmac_bandtype(wlc_hw_info_t *wlc_hw)
+int wlc_bmac_bandtype(struct wlc_hw_info *wlc_hw)
 {
         return wlc_hw->band->bandtype;
 }
 
-void *wlc_cur_phy(wlc_info_t *wlc)
+void *wlc_cur_phy(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         return (void *)wlc_hw->band->pi;
 }
 
 /* control chip clock to save power, enable dynamic clock or force fast clock */
-static void wlc_clkctl_clk(wlc_hw_info_t *wlc_hw, uint mode)
+static void wlc_clkctl_clk(struct wlc_hw_info *wlc_hw, uint mode)
 {
         if (PMUCTL_ENAB(wlc_hw->sih)) {
                 /* new chips with PMU, CCS_FORCEHT will distribute the HT clock on backplane,
@@ -1455,11 +1468,11 @@ static void wlc_clkctl_clk(wlc_hw_info_t *wlc_hw, uint mode)
 
 /* set initial host flags value */
 static void
-wlc_mhfdef(wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init)
+wlc_mhfdef(struct wlc_info *wlc, u16 *mhfs, u16 mhf2_init)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
 
-        bzero(mhfs, sizeof(u16) * MHFMAX);
+        memset(mhfs, 0, MHFMAX * sizeof(u16));
 
         mhfs[MHF2] |= mhf2_init;
 
@@ -1485,7 +1498,7 @@ wlc_mhfdef(wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init)
  *                   WLC_BAND_ALL  <--- All bands
  */
 void
-wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, u8 idx, u16 mask, u16 val,
+wlc_bmac_mhf(struct wlc_hw_info *wlc_hw, u8 idx, u16 mask, u16 val,
              int bands)
 {
         u16 save;
@@ -1539,7 +1552,7 @@ wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, u8 idx, u16 mask, u16 val,
         }
 }
 
-u16 wlc_bmac_mhf_get(wlc_hw_info_t *wlc_hw, u8 idx, int bands)
+u16 wlc_bmac_mhf_get(struct wlc_hw_info *wlc_hw, u8 idx, int bands)
 {
         wlc_hwband_t *band;
         ASSERT(idx < MHFMAX);
@@ -1565,7 +1578,7 @@ u16 wlc_bmac_mhf_get(wlc_hw_info_t *wlc_hw, u8 idx, int bands)
         return band->mhfs[idx];
 }
 
-static void wlc_write_mhf(wlc_hw_info_t *wlc_hw, u16 *mhfs)
+static void wlc_write_mhf(struct wlc_hw_info *wlc_hw, u16 *mhfs)
 {
         u8 idx;
         u16 addr[] = {
@@ -1583,7 +1596,7 @@ static void wlc_write_mhf(wlc_hw_info_t *wlc_hw, u16 *mhfs)
 /* set the maccontrol register to desired reset state and
  * initialize the sw cache of the register
  */
-static void wlc_mctrl_reset(wlc_hw_info_t *wlc_hw)
+static void wlc_mctrl_reset(struct wlc_hw_info *wlc_hw)
 {
         /* IHR accesses are always enabled, PSM disabled, HPS off and WAKE on */
         wlc_hw->maccontrol = 0;
@@ -1594,7 +1607,7 @@ static void wlc_mctrl_reset(wlc_hw_info_t *wlc_hw)
 }
 
 /* set or clear maccontrol bits */
-void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, u32 mask, u32 val)
+void wlc_bmac_mctrl(struct wlc_hw_info *wlc_hw, u32 mask, u32 val)
 {
         u32 maccontrol;
         u32 new_maccontrol;
@@ -1616,7 +1629,7 @@ void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, u32 mask, u32 val)
 }
 
 /* write the software state of maccontrol and overrides to the maccontrol register */
-static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw)
+static void wlc_mctrl_write(struct wlc_hw_info *wlc_hw)
 {
         u32 maccontrol = wlc_hw->maccontrol;
 
@@ -1633,7 +1646,7 @@ static void wlc_mctrl_write(wlc_hw_info_t *wlc_hw)
         W_REG(wlc_hw->osh, &wlc_hw->regs->maccontrol, maccontrol);
 }
 
-void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, u32 override_bit)
+void wlc_ucode_wake_override_set(struct wlc_hw_info *wlc_hw, u32 override_bit)
 {
         ASSERT((wlc_hw->wake_override & override_bit) == 0);
 
@@ -1650,7 +1663,7 @@ void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw, u32 override_bit)
         return;
 }
 
-void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw, u32 override_bit)
+void wlc_ucode_wake_override_clear(struct wlc_hw_info *wlc_hw, u32 override_bit)
 {
         ASSERT(wlc_hw->wake_override & override_bit);
 
@@ -1671,7 +1684,7 @@ void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw, u32 override_bit)
  * STA               0              1 <--- This will ensure no beacons
  * IBSS              0              0
  */
-static void wlc_ucode_mute_override_set(wlc_hw_info_t *wlc_hw)
+static void wlc_ucode_mute_override_set(struct wlc_hw_info *wlc_hw)
 {
         wlc_hw->mute_override = 1;
 
@@ -1687,7 +1700,7 @@ static void wlc_ucode_mute_override_set(wlc_hw_info_t *wlc_hw)
 }
 
 /* Clear the override on AP and INFRA bits */
-static void wlc_ucode_mute_override_clear(wlc_hw_info_t *wlc_hw)
+static void wlc_ucode_mute_override_clear(struct wlc_hw_info *wlc_hw)
 {
         if (wlc_hw->mute_override == 0)
                 return;
@@ -1707,16 +1720,16 @@ static void wlc_ucode_mute_override_clear(wlc_hw_info_t *wlc_hw)
  * Write a MAC address to the rcmta structure
  */
 void
-wlc_bmac_set_rcmta(wlc_hw_info_t *wlc_hw, int idx,
+wlc_bmac_set_rcmta(struct wlc_hw_info *wlc_hw, int idx,
                    const struct ether_addr *addr)
 {
         d11regs_t *regs = wlc_hw->regs;
         volatile u16 *objdata16 = (volatile u16 *)&regs->objdata;
         u32 mac_hm;
         u16 mac_l;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__);
 
         ASSERT(wlc_hw->corerev > 4);
 
@@ -1740,16 +1753,16 @@ wlc_bmac_set_rcmta(wlc_hw_info_t *wlc_hw, int idx,
  * Write a MAC address to the given match reg offset in the RXE match engine.
  */
 void
-wlc_bmac_set_addrmatch(wlc_hw_info_t *wlc_hw, int match_reg_offset,
+wlc_bmac_set_addrmatch(struct wlc_hw_info *wlc_hw, int match_reg_offset,
                        const struct ether_addr *addr)
 {
         d11regs_t *regs;
         u16 mac_l;
         u16 mac_m;
         u16 mac_h;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: wlc_bmac_set_addrmatch\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_set_addrmatch\n", wlc_hw->unit);
 
         ASSERT((match_reg_offset < RCM_SIZE) || (wlc_hw->corerev == 4));
 
@@ -1769,7 +1782,7 @@ wlc_bmac_set_addrmatch(wlc_hw_info_t *wlc_hw, int match_reg_offset,
 }
 
 void
-wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len,
+wlc_bmac_write_template_ram(struct wlc_hw_info *wlc_hw, int offset, int len,
                             void *buf)
 {
         d11regs_t *regs;
@@ -1778,9 +1791,9 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len,
 #ifdef IL_BIGENDIAN
         volatile u16 *dptr = NULL;
 #endif                          /* IL_BIGENDIAN */
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: wlc_bmac_write_template_ram\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_write_template_ram\n", wlc_hw->unit);
 
         regs = wlc_hw->regs;
         osh = wlc_hw->osh;
@@ -1812,9 +1825,9 @@ wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset, int len,
         }
 }
 
-void wlc_bmac_set_cwmin(wlc_hw_info_t *wlc_hw, u16 newmin)
+void wlc_bmac_set_cwmin(struct wlc_hw_info *wlc_hw, u16 newmin)
 {
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = wlc_hw->osh;
         wlc_hw->band->CWmin = newmin;
@@ -1824,9 +1837,9 @@ void wlc_bmac_set_cwmin(wlc_hw_info_t *wlc_hw, u16 newmin)
         W_REG(osh, &wlc_hw->regs->objdata, newmin);
 }
 
-void wlc_bmac_set_cwmax(wlc_hw_info_t *wlc_hw, u16 newmax)
+void wlc_bmac_set_cwmax(struct wlc_hw_info *wlc_hw, u16 newmax)
 {
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = wlc_hw->osh;
         wlc_hw->band->CWmax = newmax;
@@ -1836,7 +1849,7 @@ void wlc_bmac_set_cwmax(wlc_hw_info_t *wlc_hw, u16 newmax)
         W_REG(osh, &wlc_hw->regs->objdata, newmax);
 }
 
-void wlc_bmac_bw_set(wlc_hw_info_t *wlc_hw, u16 bw)
+void wlc_bmac_bw_set(struct wlc_hw_info *wlc_hw, u16 bw)
 {
         bool fastclk;
         u32 tmp;
@@ -1861,7 +1874,7 @@ void wlc_bmac_bw_set(wlc_hw_info_t *wlc_hw, u16 bw)
 }
 
 static void
-wlc_write_hw_bcntemplate0(wlc_hw_info_t *wlc_hw, void *bcn, int len)
+wlc_write_hw_bcntemplate0(struct wlc_hw_info *wlc_hw, void *bcn, int len)
 {
         d11regs_t *regs = wlc_hw->regs;
 
@@ -1875,7 +1888,7 @@ wlc_write_hw_bcntemplate0(wlc_hw_info_t *wlc_hw, void *bcn, int len)
 }
 
 static void
-wlc_write_hw_bcntemplate1(wlc_hw_info_t *wlc_hw, void *bcn, int len)
+wlc_write_hw_bcntemplate1(struct wlc_hw_info *wlc_hw, void *bcn, int len)
 {
         d11regs_t *regs = wlc_hw->regs;
 
@@ -1890,7 +1903,7 @@ wlc_write_hw_bcntemplate1(wlc_hw_info_t *wlc_hw, void *bcn, int len)
 
 /* mac is assumed to be suspended at this point */
 void
-wlc_bmac_write_hw_bcntemplates(wlc_hw_info_t *wlc_hw, void *bcn, int len,
+wlc_bmac_write_hw_bcntemplates(struct wlc_hw_info *wlc_hw, void *bcn, int len,
                                bool both)
 {
         d11regs_t *regs = wlc_hw->regs;
@@ -1911,10 +1924,10 @@ wlc_bmac_write_hw_bcntemplates(wlc_hw_info_t *wlc_hw, void *bcn, int len,
         }
 }
 
-static void WLBANDINITFN(wlc_bmac_upd_synthpu) (wlc_hw_info_t *wlc_hw)
+static void WLBANDINITFN(wlc_bmac_upd_synthpu) (struct wlc_hw_info *wlc_hw)
 {
         u16 v;
-        wlc_info_t *wlc = wlc_hw->wlc;
+        struct wlc_info *wlc = wlc_hw->wlc;
         /* update SYNTHPU_DLY */
 
         if (WLCISLCNPHY(wlc->band)) {
@@ -1930,12 +1943,12 @@ static void WLBANDINITFN(wlc_bmac_upd_synthpu) (wlc_hw_info_t *wlc_hw)
 
 /* band-specific init */
 static void
-WLBANDINITFN(wlc_bmac_bsinit) (wlc_info_t *wlc, chanspec_t chanspec)
+WLBANDINITFN(wlc_bmac_bsinit) (struct wlc_info *wlc, chanspec_t chanspec)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
 
-        WL_TRACE(("wl%d: wlc_bmac_bsinit: bandunit %d\n", wlc_hw->unit,
-                  wlc_hw->band->bandunit));
+        WL_TRACE("wl%d: wlc_bmac_bsinit: bandunit %d\n",
+                 wlc_hw->unit, wlc_hw->band->bandunit);
 
         /* sanity check */
         if (PHY_TYPE(R_REG(wlc_hw->osh, &wlc_hw->regs->phyversion)) !=
@@ -1969,9 +1982,9 @@ WLBANDINITFN(wlc_bmac_bsinit) (wlc_info_t *wlc, chanspec_t chanspec)
         wlc_bmac_upd_synthpu(wlc_hw);
 }
 
-void wlc_bmac_core_phy_clk(wlc_hw_info_t *wlc_hw, bool clk)
+void wlc_bmac_core_phy_clk(struct wlc_hw_info *wlc_hw, bool clk)
 {
-        WL_TRACE(("wl%d: wlc_bmac_core_phy_clk: clk %d\n", wlc_hw->unit, clk));
+        WL_TRACE("wl%d: wlc_bmac_core_phy_clk: clk %d\n", wlc_hw->unit, clk);
 
         wlc_hw->phyclk = clk;
 
@@ -1994,9 +2007,9 @@ void wlc_bmac_core_phy_clk(wlc_hw_info_t *wlc_hw, bool clk)
 }
 
 /* Perform a soft reset of the PHY PLL */
-void wlc_bmac_core_phypll_reset(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_core_phypll_reset(struct wlc_hw_info *wlc_hw)
 {
-        WL_TRACE(("wl%d: wlc_bmac_core_phypll_reset\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_core_phypll_reset\n", wlc_hw->unit);
 
         si_corereg(wlc_hw->sih, SI_CC_IDX,
                    offsetof(chipcregs_t, chipcontrol_addr), ~0, 0);
@@ -2015,7 +2028,7 @@ void wlc_bmac_core_phypll_reset(wlc_hw_info_t *wlc_hw)
 /* light way to turn on phy clock without reset for NPHY only
  *  refer to wlc_bmac_core_phy_clk for full version
  */
-void wlc_bmac_phyclk_fgc(wlc_hw_info_t *wlc_hw, bool clk)
+void wlc_bmac_phyclk_fgc(struct wlc_hw_info *wlc_hw, bool clk)
 {
         /* support(necessary for NPHY and HYPHY) only */
         if (!WLCISNPHY(wlc_hw->band))
@@ -2028,7 +2041,7 @@ void wlc_bmac_phyclk_fgc(wlc_hw_info_t *wlc_hw, bool clk)
 
 }
 
-void wlc_bmac_macphyclk_set(wlc_hw_info_t *wlc_hw, bool clk)
+void wlc_bmac_macphyclk_set(struct wlc_hw_info *wlc_hw, bool clk)
 {
         if (ON == clk)
                 si_core_cflags(wlc_hw->sih, SICF_MPCLKE, SICF_MPCLKE);
@@ -2036,13 +2049,13 @@ void wlc_bmac_macphyclk_set(wlc_hw_info_t *wlc_hw, bool clk)
                 si_core_cflags(wlc_hw->sih, SICF_MPCLKE, 0);
 }
 
-void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_phy_reset(struct wlc_hw_info *wlc_hw)
 {
         wlc_phy_t *pih = wlc_hw->band->pi;
         u32 phy_bw_clkbits;
         bool phy_in_reset = false;
 
-        WL_TRACE(("wl%d: wlc_bmac_phy_reset\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_phy_reset\n", wlc_hw->unit);
 
         if (pih == NULL)
                 return;
@@ -2080,9 +2093,9 @@ void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw)
 
 /* switch to and initialize new band */
 static void
-WLBANDINITFN(wlc_bmac_setband) (wlc_hw_info_t *wlc_hw, uint bandunit,
+WLBANDINITFN(wlc_bmac_setband) (struct wlc_hw_info *wlc_hw, uint bandunit,
                                 chanspec_t chanspec) {
-        wlc_info_t *wlc = wlc_hw->wlc;
+        struct wlc_info *wlc = wlc_hw->wlc;
         u32 macintmask;
 
         ASSERT(NBANDS_HW(wlc_hw) > 1);
@@ -2122,9 +2135,9 @@ WLBANDINITFN(wlc_bmac_setband) (wlc_hw_info_t *wlc_hw, uint bandunit,
 }
 
 /* low-level band switch utility routine */
-void WLBANDINITFN(wlc_setxband) (wlc_hw_info_t *wlc_hw, uint bandunit)
+void WLBANDINITFN(wlc_setxband) (struct wlc_hw_info *wlc_hw, uint bandunit)
 {
-        WL_TRACE(("wl%d: wlc_setxband: bandunit %d\n", wlc_hw->unit, bandunit));
+        WL_TRACE("wl%d: wlc_setxband: bandunit %d\n", wlc_hw->unit, bandunit);
 
         wlc_hw->band = wlc_hw->bandstate[bandunit];
 
@@ -2138,19 +2151,19 @@ void WLBANDINITFN(wlc_setxband) (wlc_hw_info_t *wlc_hw, uint bandunit)
         }
 }
 
-static bool wlc_isgoodchip(wlc_hw_info_t *wlc_hw)
+static bool wlc_isgoodchip(struct wlc_hw_info *wlc_hw)
 {
 
         /* reject unsupported corerev */
         if (!VALID_COREREV(wlc_hw->corerev)) {
-                WL_ERROR(("unsupported core rev %d\n", wlc_hw->corerev));
+                WL_ERROR("unsupported core rev %d\n", wlc_hw->corerev);
                 return false;
         }
 
         return true;
 }
 
-static bool wlc_validboardtype(wlc_hw_info_t *wlc_hw)
+static bool wlc_validboardtype(struct wlc_hw_info *wlc_hw)
 {
         bool goodboard = true;
         uint boardrev = wlc_hw->boardrev;
@@ -2174,7 +2187,7 @@ static bool wlc_validboardtype(wlc_hw_info_t *wlc_hw)
         return goodboard;
 }
 
-static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw)
+static char *wlc_get_macaddr(struct wlc_hw_info *wlc_hw)
 {
         const char *varname = "macaddr";
         char *macaddr;
@@ -2191,7 +2204,8 @@ static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw)
 
         macaddr = getvar(wlc_hw->vars, varname);
         if (macaddr == NULL) {
-                WL_ERROR(("wl%d: wlc_get_macaddr: macaddr getvar(%s) not found\n", wlc_hw->unit, varname));
+                WL_ERROR("wl%d: wlc_get_macaddr: macaddr getvar(%s) not found\n",
+                         wlc_hw->unit, varname);
         }
 
         return macaddr;
@@ -2203,7 +2217,7 @@ static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw)
  * this function could be called when driver is down and w/o clock
  * it operates on different registers depending on corerev and boardflag.
  */
-bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw)
+bool wlc_bmac_radio_read_hwdisabled(struct wlc_hw_info *wlc_hw)
 {
         bool v, clk, xtal;
         u32 resetbits = 0, flags = 0;
@@ -2226,9 +2240,9 @@ bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw)
                         flags |= SICF_PCLKE;
 
                 /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
-                if ((CHIPID(wlc_hw->sih->chip) == BCM43224_CHIP_ID) ||
-                    (CHIPID(wlc_hw->sih->chip) == BCM43225_CHIP_ID) ||
-                    (CHIPID(wlc_hw->sih->chip) == BCM43421_CHIP_ID))
+                if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+                    (wlc_hw->sih->chip == BCM43225_CHIP_ID) ||
+                    (wlc_hw->sih->chip == BCM43421_CHIP_ID))
                         wlc_hw->regs =
                             (d11regs_t *) si_setcore(wlc_hw->sih, D11_CORE_ID,
                                                      0);
@@ -2249,12 +2263,12 @@ bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw)
 }
 
 /* Initialize just the hardware when coming out of POR or S3/S5 system states */
-void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_hw_up(struct wlc_hw_info *wlc_hw)
 {
         if (wlc_hw->wlc->pub->hw_up)
                 return;
 
-        WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc_hw->unit, __func__);
 
         /*
          * Enable pll and xtal, initialize the power control registers,
@@ -2264,13 +2278,13 @@ void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw)
         si_clkctl_init(wlc_hw->sih);
         wlc_clkctl_clk(wlc_hw, CLK_FAST);
 
-        if (BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS) {
+        if (wlc_hw->sih->bustype == PCI_BUS) {
                 si_pci_fixcfg(wlc_hw->sih);
 
                 /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
-                if ((CHIPID(wlc_hw->sih->chip) == BCM43224_CHIP_ID) ||
-                    (CHIPID(wlc_hw->sih->chip) == BCM43225_CHIP_ID) ||
-                    (CHIPID(wlc_hw->sih->chip) == BCM43421_CHIP_ID))
+                if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+                    (wlc_hw->sih->chip == BCM43225_CHIP_ID) ||
+                    (wlc_hw->sih->chip == BCM43421_CHIP_ID))
                         wlc_hw->regs =
                             (d11regs_t *) si_setcore(wlc_hw->sih, D11_CORE_ID,
                                                      0);
@@ -2283,7 +2297,7 @@ void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw)
         wlc_hw->wlc->pub->hw_up = true;
 
         if ((wlc_hw->boardflags & BFL_FEM)
-            && (CHIPID(wlc_hw->sih->chip) == BCM4313_CHIP_ID)) {
+            && (wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
                 if (!
                     (wlc_hw->boardrev >= 0x1250
                      && (wlc_hw->boardflags & BFL_FEM_BT)))
@@ -2291,10 +2305,10 @@ void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw)
         }
 }
 
-static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo)
+static bool wlc_dma_rxreset(struct wlc_hw_info *wlc_hw, uint fifo)
 {
-        hnddma_t *di = wlc_hw->di[fifo];
-        osl_t *osh;
+        struct hnddma_pub *di = wlc_hw->di[fifo];
+        struct osl_info *osh;
 
         if (D11REV_LT(wlc_hw->corerev, 12)) {
                 bool rxidle = true;
@@ -2309,7 +2323,8 @@ static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo)
                          50000);
 
                 if (!rxidle && (rcv_frm_cnt != 0))
-                        WL_ERROR(("wl%d: %s: rxdma[%d] not idle && rcv_frm_cnt(%d) not zero\n", wlc_hw->unit, __func__, fifo, rcv_frm_cnt));
+                        WL_ERROR("wl%d: %s: rxdma[%d] not idle && rcv_frm_cnt(%d) not zero\n",
+                                 wlc_hw->unit, __func__, fifo, rcv_frm_cnt);
                 mdelay(2);
         }
 
@@ -2324,7 +2339,7 @@ static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo)
  *   clear software macintstatus for fresh new start
  * one testing hack wlc_hw->noreset will bypass the d11/phy reset
  */
-void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags)
+void wlc_bmac_corereset(struct wlc_hw_info *wlc_hw, u32 flags)
 {
         d11regs_t *regs;
         uint i;
@@ -2334,7 +2349,7 @@ void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags)
         if (flags == WLC_USE_COREFLAGS)
                 flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
 
-        WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__);
 
         regs = wlc_hw->regs;
 
@@ -2347,17 +2362,20 @@ void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags)
         if (si_iscoreup(wlc_hw->sih)) {
                 for (i = 0; i < NFIFO; i++)
                         if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i]))) {
-                                WL_ERROR(("wl%d: %s: dma_txreset[%d]: cannot stop dma\n", wlc_hw->unit, __func__, i));
+                                WL_ERROR("wl%d: %s: dma_txreset[%d]: cannot stop dma\n",
+                                         wlc_hw->unit, __func__, i);
                         }
 
                 if ((wlc_hw->di[RX_FIFO])
                     && (!wlc_dma_rxreset(wlc_hw, RX_FIFO))) {
-                        WL_ERROR(("wl%d: %s: dma_rxreset[%d]: cannot stop dma\n", wlc_hw->unit, __func__, RX_FIFO));
+                        WL_ERROR("wl%d: %s: dma_rxreset[%d]: cannot stop dma\n",
+                                 wlc_hw->unit, __func__, RX_FIFO);
                 }
                 if (D11REV_IS(wlc_hw->corerev, 4)
                     && wlc_hw->di[RX_TXSTATUS_FIFO]
                     && (!wlc_dma_rxreset(wlc_hw, RX_TXSTATUS_FIFO))) {
-                        WL_ERROR(("wl%d: %s: dma_rxreset[%d]: cannot stop dma\n", wlc_hw->unit, __func__, RX_TXSTATUS_FIFO));
+                        WL_ERROR("wl%d: %s: dma_rxreset[%d]: cannot stop dma\n",
+                                 wlc_hw->unit, __func__, RX_TXSTATUS_FIFO);
                 }
         }
         /* if noreset, just stop the psm and return */
@@ -2413,14 +2431,14 @@ void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags)
  * txfifo sizes needs to be modified(increased) since the newer cores
  * have more memory.
  */
-static void wlc_corerev_fifofixup(wlc_hw_info_t *wlc_hw)
+static void wlc_corerev_fifofixup(struct wlc_hw_info *wlc_hw)
 {
         d11regs_t *regs = wlc_hw->regs;
         u16 fifo_nu;
         u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;
         u16 txfifo_def, txfifo_def1;
         u16 txfifo_cmd;
-        osl_t *osh;
+        struct osl_info *osh;
 
         if (D11REV_LT(wlc_hw->corerev, 9))
                 goto exit;
@@ -2473,22 +2491,22 @@ static void wlc_corerev_fifofixup(wlc_hw_info_t *wlc_hw)
  *   config other core registers
  *   init dma
  */
-static void wlc_coreinit(wlc_info_t *wlc)
+static void wlc_coreinit(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs;
         u32 sflags;
         uint bcnint_us;
         uint i = 0;
         bool fifosz_fixup = false;
-        osl_t *osh;
+        struct osl_info *osh;
         int err = 0;
         u16 buf[NFIFO];
 
         regs = wlc_hw->regs;
         osh = wlc_hw->osh;
 
-        WL_TRACE(("wl%d: wlc_coreinit\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_coreinit\n", wlc_hw->unit);
 
         /* reset PSM */
         wlc_bmac_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE));
@@ -2511,8 +2529,8 @@ static void wlc_coreinit(wlc_info_t *wlc)
         SPINWAIT(((R_REG(osh, &regs->macintstatus) & MI_MACSSPNDD) == 0),
                  1000 * 1000);
         if ((R_REG(osh, &regs->macintstatus) & MI_MACSSPNDD) == 0)
-                WL_ERROR(("wl%d: wlc_coreinit: ucode did not self-suspend!\n",
-                          wlc_hw->unit));
+                WL_ERROR("wl%d: wlc_coreinit: ucode did not self-suspend!\n",
+                         wlc_hw->unit);
 
         wlc_gpio_init(wlc);
 
@@ -2522,18 +2540,18 @@ static void wlc_coreinit(wlc_info_t *wlc)
                 if (WLCISNPHY(wlc_hw->band))
                         wlc_write_inits(wlc_hw, d11n0initvals16);
                 else
-                        WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
         } else if (D11REV_IS(wlc_hw->corerev, 24)) {
                 if (WLCISLCNPHY(wlc_hw->band)) {
                         wlc_write_inits(wlc_hw, d11lcn0initvals24);
                 } else {
-                        WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         } else {
-                WL_ERROR(("%s: wl%d: unsupported corerev %d\n",
-                          __func__, wlc_hw->unit, wlc_hw->corerev));
+                WL_ERROR("%s: wl%d: unsupported corerev %d\n",
+                         __func__, wlc_hw->unit, wlc_hw->corerev);
         }
 
         /* For old ucode, txfifo sizes needs to be modified(increased) for Corerev >= 9 */
@@ -2575,7 +2593,8 @@ static void wlc_coreinit(wlc_info_t *wlc)
                 err = -1;
         }
         if (err != 0) {
-                WL_ERROR(("wlc_coreinit: txfifo mismatch: ucode size %d driver size %d index %d\n", buf[i], wlc_hw->xmtfifo_sz[i], i));
+                WL_ERROR("wlc_coreinit: txfifo mismatch: ucode size %d driver size %d index %d\n",
+                         buf[i], wlc_hw->xmtfifo_sz[i], i);
                 /* DO NOT ASSERT corerev < 4 even there is a mismatch
                  * shmem, since driver don't overwrite those chip and
                  * ucode initialize data will be used.
@@ -2684,15 +2703,15 @@ static void wlc_coreinit(wlc_info_t *wlc)
  *  - 559241 = 0x88889 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x8889
  */
 
-void wlc_bmac_switch_macfreq(wlc_hw_info_t *wlc_hw, u8 spurmode)
+void wlc_bmac_switch_macfreq(struct wlc_hw_info *wlc_hw, u8 spurmode)
 {
         d11regs_t *regs;
-        osl_t *osh;
+        struct osl_info *osh;
         regs = wlc_hw->regs;
         osh = wlc_hw->osh;
 
-        if ((CHIPID(wlc_hw->sih->chip) == BCM43224_CHIP_ID) ||
-            (CHIPID(wlc_hw->sih->chip) == BCM43225_CHIP_ID)) {
+        if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+            (wlc_hw->sih->chip == BCM43225_CHIP_ID)) {
                 if (spurmode == WL_SPURAVOID_ON2) {     /* 126Mhz */
                         W_REG(osh, &regs->tsf_clk_frac_l, 0x2082);
                         W_REG(osh, &regs->tsf_clk_frac_h, 0x8);
@@ -2715,12 +2734,12 @@ void wlc_bmac_switch_macfreq(wlc_hw_info_t *wlc_hw, u8 spurmode)
 }
 
 /* Initialize GPIOs that are controlled by D11 core */
-static void wlc_gpio_init(wlc_info_t *wlc)
+static void wlc_gpio_init(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs;
         u32 gc, gm;
-        osl_t *osh;
+        struct osl_info *osh;
 
         regs = wlc_hw->regs;
         osh = wlc_hw->osh;
@@ -2780,9 +2799,9 @@ static void wlc_gpio_init(wlc_info_t *wlc)
         si_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);
 }
 
-static void wlc_ucode_download(wlc_hw_info_t *wlc_hw)
+static void wlc_ucode_download(struct wlc_hw_info *wlc_hw)
 {
-        wlc_info_t *wlc;
+        struct wlc_info *wlc;
         wlc = wlc_hw->wlc;
 
         if (wlc_hw->ucode_loaded)
@@ -2794,30 +2813,30 @@ static void wlc_ucode_download(wlc_hw_info_t *wlc_hw)
                                         bcm43xx_16_mimosz);
                         wlc_hw->ucode_loaded = true;
                 } else
-                        WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
         } else if (D11REV_IS(wlc_hw->corerev, 24)) {
                 if (WLCISLCNPHY(wlc_hw->band)) {
                         wlc_ucode_write(wlc_hw, bcm43xx_24_lcn,
                                         bcm43xx_24_lcnsz);
                         wlc_hw->ucode_loaded = true;
                 } else {
-                        WL_ERROR(("%s: wl%d: unsupported phy in corerev %d\n",
-                                  __func__, wlc_hw->unit, wlc_hw->corerev));
+                        WL_ERROR("%s: wl%d: unsupported phy in corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         }
 }
 
-static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const u32 ucode[],
+static void wlc_ucode_write(struct wlc_hw_info *wlc_hw, const u32 ucode[],
                               const uint nbytes) {
-        osl_t *osh;
+        struct osl_info *osh;
         d11regs_t *regs = wlc_hw->regs;
         uint i;
         uint count;
 
         osh = wlc_hw->osh;
 
-        WL_TRACE(("wl%d: wlc_ucode_write\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_ucode_write\n", wlc_hw->unit);
 
         ASSERT(IS_ALIGNED(nbytes, sizeof(u32)));
 
@@ -2829,13 +2848,13 @@ static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const u32 ucode[],
                 W_REG(osh, &regs->objdata, ucode[i]);
 }
 
-static void wlc_write_inits(wlc_hw_info_t *wlc_hw, const d11init_t *inits)
+static void wlc_write_inits(struct wlc_hw_info *wlc_hw, const d11init_t *inits)
 {
         int i;
-        osl_t *osh;
+        struct osl_info *osh;
         volatile u8 *base;
 
-        WL_TRACE(("wl%d: wlc_write_inits\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_write_inits\n", wlc_hw->unit);
 
         osh = wlc_hw->osh;
         base = (volatile u8 *)wlc_hw->regs;
@@ -2852,7 +2871,7 @@ static void wlc_write_inits(wlc_hw_info_t *wlc_hw, const d11init_t *inits)
         }
 }
 
-static void wlc_ucode_txant_set(wlc_hw_info_t *wlc_hw)
+static void wlc_ucode_txant_set(struct wlc_hw_info *wlc_hw)
 {
         u16 phyctl;
         u16 phytxant = wlc_hw->bmac_phytxant;
@@ -2869,7 +2888,7 @@ static void wlc_ucode_txant_set(wlc_hw_info_t *wlc_hw)
         wlc_bmac_write_shm(wlc_hw, M_RSP_PCTLWD, phyctl);
 }
 
-void wlc_bmac_txant_set(wlc_hw_info_t *wlc_hw, u16 phytxant)
+void wlc_bmac_txant_set(struct wlc_hw_info *wlc_hw, u16 phytxant)
 {
         /* update sw state */
         wlc_hw->bmac_phytxant = phytxant;
@@ -2881,12 +2900,12 @@ void wlc_bmac_txant_set(wlc_hw_info_t *wlc_hw, u16 phytxant)
 
 }
 
-u16 wlc_bmac_get_txant(wlc_hw_info_t *wlc_hw)
+u16 wlc_bmac_get_txant(struct wlc_hw_info *wlc_hw)
 {
         return (u16) wlc_hw->wlc->stf->txant;
 }
 
-void wlc_bmac_antsel_type_set(wlc_hw_info_t *wlc_hw, u8 antsel_type)
+void wlc_bmac_antsel_type_set(struct wlc_hw_info *wlc_hw, u8 antsel_type)
 {
         wlc_hw->antsel_type = antsel_type;
 
@@ -2894,7 +2913,7 @@ void wlc_bmac_antsel_type_set(wlc_hw_info_t *wlc_hw, u8 antsel_type)
         wlc_phy_antsel_type_set(wlc_hw->band->pi, antsel_type);
 }
 
-void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw)
+void wlc_bmac_fifoerrors(struct wlc_hw_info *wlc_hw)
 {
         bool fatal = false;
         uint unit;
@@ -2911,44 +2930,45 @@ void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw)
                 if (!intstatus)
                         continue;
 
-                WL_TRACE(("wl%d: wlc_bmac_fifoerrors: intstatus%d 0x%x\n", unit,
-                          idx, intstatus));
+                WL_TRACE("wl%d: wlc_bmac_fifoerrors: intstatus%d 0x%x\n",
+                         unit, idx, intstatus);
 
                 if (intstatus & I_RO) {
-                        WL_ERROR(("wl%d: fifo %d: receive fifo overflow\n",
-                                  unit, idx));
+                        WL_ERROR("wl%d: fifo %d: receive fifo overflow\n",
+                                 unit, idx);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->rxoflo);
                         fatal = true;
                 }
 
                 if (intstatus & I_PC) {
-                        WL_ERROR(("wl%d: fifo %d: descriptor error\n", unit,
-                                  idx));
+                        WL_ERROR("wl%d: fifo %d: descriptor error\n",
+                                 unit, idx);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmade);
                         fatal = true;
                 }
 
                 if (intstatus & I_PD) {
-                        WL_ERROR(("wl%d: fifo %d: data error\n", unit, idx));
+                        WL_ERROR("wl%d: fifo %d: data error\n", unit, idx);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmada);
                         fatal = true;
                 }
 
                 if (intstatus & I_DE) {
-                        WL_ERROR(("wl%d: fifo %d: descriptor protocol error\n",
-                                  unit, idx));
+                        WL_ERROR("wl%d: fifo %d: descriptor protocol error\n",
+                                 unit, idx);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmape);
                         fatal = true;
                 }
 
                 if (intstatus & I_RU) {
-                        WL_ERROR(("wl%d: fifo %d: receive descriptor underflow\n", unit, idx));
+                        WL_ERROR("wl%d: fifo %d: receive descriptor underflow\n",
+                                 idx, unit);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->rxuflo[idx]);
                 }
 
                 if (intstatus & I_XU) {
-                        WL_ERROR(("wl%d: fifo %d: transmit fifo underflow\n",
-                                  idx, unit));
+                        WL_ERROR("wl%d: fifo %d: transmit fifo underflow\n",
+                                 idx, unit);
                         WLCNTINCR(wlc_hw->wlc->pub->_cnt->txuflo);
                         fatal = true;
                 }
@@ -2962,9 +2982,9 @@ void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw)
         }
 }
 
-void wlc_intrson(wlc_info_t *wlc)
+void wlc_intrson(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         ASSERT(wlc->defmacintmask);
         wlc->macintmask = wlc->defmacintmask;
         W_REG(wlc_hw->osh, &wlc_hw->regs->macintmask, wlc->macintmask);
@@ -2975,7 +2995,7 @@ void wlc_intrson(wlc_info_t *wlc)
  *  but also because per-port code may require sync with valid interrupt.
  */
 
-static u32 wlc_wlintrsoff(wlc_info_t *wlc)
+static u32 wlc_wlintrsoff(struct wlc_info *wlc)
 {
         if (!wlc->hw->up)
                 return 0;
@@ -2983,7 +3003,7 @@ static u32 wlc_wlintrsoff(wlc_info_t *wlc)
         return wl_intrsoff(wlc->wl);
 }
 
-static void wlc_wlintrsrestore(wlc_info_t *wlc, u32 macintmask)
+static void wlc_wlintrsrestore(struct wlc_info *wlc, u32 macintmask)
 {
         if (!wlc->hw->up)
                 return;
@@ -2991,9 +3011,9 @@ static void wlc_wlintrsrestore(wlc_info_t *wlc, u32 macintmask)
         wl_intrsrestore(wlc->wl, macintmask);
 }
 
-u32 wlc_intrsoff(wlc_info_t *wlc)
+u32 wlc_intrsoff(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         u32 macintmask;
 
         if (!wlc_hw->clk)
@@ -3010,9 +3030,9 @@ u32 wlc_intrsoff(wlc_info_t *wlc)
         return wlc->macintstatus ? 0 : macintmask;
 }
 
-void wlc_intrsrestore(wlc_info_t *wlc, u32 macintmask)
+void wlc_intrsrestore(struct wlc_info *wlc, u32 macintmask)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         if (!wlc_hw->clk)
                 return;
 
@@ -3020,7 +3040,7 @@ void wlc_intrsrestore(wlc_info_t *wlc, u32 macintmask)
         W_REG(wlc_hw->osh, &wlc_hw->regs->macintmask, wlc->macintmask);
 }
 
-void wlc_bmac_mute(wlc_hw_info_t *wlc_hw, bool on, mbool flags)
+void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool on, mbool flags)
 {
         struct ether_addr null_ether_addr = { {0, 0, 0, 0, 0, 0} };
 
@@ -3056,12 +3076,12 @@ void wlc_bmac_mute(wlc_hw_info_t *wlc_hw, bool on, mbool flags)
                 wlc_ucode_mute_override_clear(wlc_hw);
 }
 
-void wlc_bmac_set_deaf(wlc_hw_info_t *wlc_hw, bool user_flag)
+void wlc_bmac_set_deaf(struct wlc_hw_info *wlc_hw, bool user_flag)
 {
         wlc_phy_set_deaf(wlc_hw->band->pi, user_flag);
 }
 
-int wlc_bmac_xmtfifo_sz_get(wlc_hw_info_t *wlc_hw, uint fifo, uint *blocks)
+int wlc_bmac_xmtfifo_sz_get(struct wlc_hw_info *wlc_hw, uint fifo, uint *blocks)
 {
         if (fifo >= NFIFO)
                 return BCME_RANGE;
@@ -3071,7 +3091,7 @@ int wlc_bmac_xmtfifo_sz_get(wlc_hw_info_t *wlc_hw, uint fifo, uint *blocks)
         return 0;
 }
 
-int wlc_bmac_xmtfifo_sz_set(wlc_hw_info_t *wlc_hw, uint fifo, uint blocks)
+int wlc_bmac_xmtfifo_sz_set(struct wlc_hw_info *wlc_hw, uint fifo, uint blocks)
 {
         if (fifo >= NFIFO || blocks > 299)
                 return BCME_RANGE;
@@ -3091,7 +3111,7 @@ int wlc_bmac_xmtfifo_sz_set(wlc_hw_info_t *wlc_hw, uint fifo, uint blocks)
  * be pulling data into a tx fifo, by the time the MAC acks the suspend
  * request.
  */
-bool wlc_bmac_tx_fifo_suspended(wlc_hw_info_t *wlc_hw, uint tx_fifo)
+bool wlc_bmac_tx_fifo_suspended(struct wlc_hw_info *wlc_hw, uint tx_fifo)
 {
         /* check that a suspend has been requested and is no longer pending */
 
@@ -3110,7 +3130,7 @@ bool wlc_bmac_tx_fifo_suspended(wlc_hw_info_t *wlc_hw, uint tx_fifo)
         return false;
 }
 
-void wlc_bmac_tx_fifo_suspend(wlc_hw_info_t *wlc_hw, uint tx_fifo)
+void wlc_bmac_tx_fifo_suspend(struct wlc_hw_info *wlc_hw, uint tx_fifo)
 {
         u8 fifo = 1 << tx_fifo;
 
@@ -3141,7 +3161,7 @@ void wlc_bmac_tx_fifo_suspend(wlc_hw_info_t *wlc_hw, uint tx_fifo)
         }
 }
 
-void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo)
+void wlc_bmac_tx_fifo_resume(struct wlc_hw_info *wlc_hw, uint tx_fifo)
 {
         /* BMAC_NOTE: WLC_TX_FIFO_ENAB is done in wlc_dpc() for DMA case but need to be done
          * here for PIO otherwise the watchdog will catch the inconsistency and fire
@@ -3169,20 +3189,20 @@ void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo)
  *   0 if the interrupt is not for us, or we are in some special cases;
  *   device interrupt status bits otherwise.
  */
-static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
+static inline u32 wlc_intstatus(struct wlc_info *wlc, bool in_isr)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs = wlc_hw->regs;
         u32 macintstatus;
         u32 intstatus_rxfifo, intstatus_txsfifo;
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = wlc_hw->osh;
 
         /* macintstatus includes a DMA interrupt summary bit */
         macintstatus = R_REG(osh, &regs->macintstatus);
 
-        WL_TRACE(("wl%d: macintstatus: 0x%x\n", wlc_hw->unit, macintstatus));
+        WL_TRACE("wl%d: macintstatus: 0x%x\n", wlc_hw->unit, macintstatus);
 
         /* detect cardbus removed, in power down(suspend) and in reset */
         if (DEVICEREMOVED(wlc))
@@ -3207,9 +3227,7 @@ static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
          */
         /* turn off the interrupts */
         W_REG(osh, &regs->macintmask, 0);
-#ifndef BCMSDIO
         (void)R_REG(osh, &regs->macintmask);    /* sync readback */
-#endif
         wlc->macintmask = 0;
 
         /* clear device interrupts */
@@ -3224,7 +3242,9 @@ static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
                             R_REG(osh,
                                   &regs->intctrlregs[RX_TXSTATUS_FIFO].
                                   intstatus);
-                        WL_TRACE(("wl%d: intstatus_rxfifo 0x%x, intstatus_txsfifo 0x%x\n", wlc_hw->unit, intstatus_rxfifo, intstatus_txsfifo));
+                        WL_TRACE("wl%d: intstatus_rxfifo 0x%x, intstatus_txsfifo 0x%x\n",
+                                 wlc_hw->unit,
+                                 intstatus_rxfifo, intstatus_txsfifo);
 
                         /* defer unsolicited interrupt hints */
                         intstatus_rxfifo &= DEF_RXINTMASK;
@@ -3261,7 +3281,7 @@ static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
 
 /* Update wlc->macintstatus and wlc->intstatus[]. */
 /* Return true if they are updated successfully. false otherwise */
-bool wlc_intrsupd(wlc_info_t *wlc)
+bool wlc_intrsupd(struct wlc_info *wlc)
 {
         u32 macintstatus;
 
@@ -3286,9 +3306,9 @@ bool wlc_intrsupd(wlc_info_t *wlc)
  * *wantdpc will be set to true if further wlc_dpc() processing is required,
  * false otherwise.
  */
-bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc)
+bool BCMFASTPATH wlc_isr(struct wlc_info *wlc, bool *wantdpc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         u32 macintstatus;
 
         *wantdpc = false;
@@ -3300,7 +3320,7 @@ bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc)
         macintstatus = wlc_intstatus(wlc, true);
 
         if (macintstatus == 0xffffffff)
-                WL_ERROR(("DEVICEREMOVED detected in the ISR code path.\n"));
+                WL_ERROR("DEVICEREMOVED detected in the ISR code path\n");
 
         /* it is not for us */
         if (macintstatus == 0)
@@ -3317,20 +3337,20 @@ bool BCMFASTPATH wlc_isr(wlc_info_t *wlc, bool *wantdpc)
 }
 
 /* process tx completion events for corerev < 5 */
-static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc_hw)
+static bool wlc_bmac_txstatus_corerev4(struct wlc_hw_info *wlc_hw)
 {
-        void *status_p;
+        struct sk_buff *status_p;
         tx_status_t *txs;
-        osl_t *osh;
+        struct osl_info *osh;
         bool fatal = false;
 
-        WL_TRACE(("wl%d: wlc_txstatusrecv\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_txstatusrecv\n", wlc_hw->unit);
 
         osh = wlc_hw->osh;
 
         while (!fatal && (status_p = dma_rx(wlc_hw->di[RX_TXSTATUS_FIFO]))) {
 
-                txs = (tx_status_t *) PKTDATA(status_p);
+                txs = (tx_status_t *) status_p->data;
                 /* MAC uses little endian only */
                 ltoh16_buf((void *)txs, sizeof(tx_status_t));
 
@@ -3340,7 +3360,7 @@ static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc_hw)
 
                 fatal = wlc_bmac_dotxstatus(wlc_hw, txs, 0);
 
-                PKTFREE(osh, status_p, false);
+                pkt_buf_free_skb(osh, status_p, false);
         }
 
         if (fatal)
@@ -3353,7 +3373,7 @@ static bool wlc_bmac_txstatus_corerev4(wlc_hw_info_t *wlc_hw)
 }
 
 static bool BCMFASTPATH
-wlc_bmac_dotxstatus(wlc_hw_info_t *wlc_hw, tx_status_t *txs, u32 s2)
+wlc_bmac_dotxstatus(struct wlc_hw_info *wlc_hw, tx_status_t *txs, u32 s2)
 {
         /* discard intermediate indications for ucode with one legitimate case:
          *   e.g. if "useRTS" is set. ucode did a successful rts/cts exchange, but the subsequent
@@ -3372,12 +3392,12 @@ wlc_bmac_dotxstatus(wlc_hw_info_t *wlc_hw, tx_status_t *txs, u32 s2)
  * Return true if more tx status need to be processed. false otherwise.
  */
 static bool BCMFASTPATH
-wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal)
+wlc_bmac_txstatus(struct wlc_hw_info *wlc_hw, bool bound, bool *fatal)
 {
         bool morepending = false;
-        wlc_info_t *wlc = wlc_hw->wlc;
+        struct wlc_info *wlc = wlc_hw->wlc;
 
-        WL_TRACE(("wl%d: wlc_bmac_txstatus\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_txstatus\n", wlc_hw->unit);
 
         if (D11REV_IS(wlc_hw->corerev, 4)) {
                 /* to retire soon */
@@ -3388,7 +3408,7 @@ wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal)
         } else {
                 /* corerev >= 5 */
                 d11regs_t *regs;
-                osl_t *osh;
+                struct osl_info *osh;
                 tx_status_t txstatus, *txs;
                 u32 s1, s2;
                 uint n = 0;
@@ -3402,8 +3422,8 @@ wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal)
                        && (s1 = R_REG(osh, &regs->frmtxstatus)) & TXS_V) {
 
                         if (s1 == 0xffffffff) {
-                                WL_ERROR(("wl%d: %s: dead chip\n",
-                                          wlc_hw->unit, __func__));
+                                WL_ERROR("wl%d: %s: dead chip\n",
+                                         wlc_hw->unit, __func__);
                                 ASSERT(s1 != 0xffffffff);
                                 return morepending;
                         }
@@ -3436,15 +3456,15 @@ wlc_bmac_txstatus(wlc_hw_info_t *wlc_hw, bool bound, bool *fatal)
         return morepending;
 }
 
-void wlc_suspend_mac_and_wait(wlc_info_t *wlc)
+void wlc_suspend_mac_and_wait(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs = wlc_hw->regs;
         u32 mc, mi;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: wlc_suspend_mac_and_wait: bandunit %d\n", wlc_hw->unit,
-                  wlc_hw->band->bandunit));
+        WL_TRACE("wl%d: wlc_suspend_mac_and_wait: bandunit %d\n",
+                 wlc_hw->unit, wlc_hw->band->bandunit);
 
         /*
          * Track overlapping suspend requests
@@ -3461,7 +3481,7 @@ void wlc_suspend_mac_and_wait(wlc_info_t *wlc)
         mc = R_REG(osh, &regs->maccontrol);
 
         if (mc == 0xffffffff) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc_hw->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc_hw->unit, __func__);
                 wl_down(wlc->wl);
                 return;
         }
@@ -3471,7 +3491,7 @@ void wlc_suspend_mac_and_wait(wlc_info_t *wlc)
 
         mi = R_REG(osh, &regs->macintstatus);
         if (mi == 0xffffffff) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc_hw->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc_hw->unit, __func__);
                 wl_down(wlc->wl);
                 return;
         }
@@ -3483,15 +3503,18 @@ void wlc_suspend_mac_and_wait(wlc_info_t *wlc)
                  WLC_MAX_MAC_SUSPEND);
 
         if (!(R_REG(osh, &regs->macintstatus) & MI_MACSSPNDD)) {
-                WL_ERROR(("wl%d: wlc_suspend_mac_and_wait: waited %d uS and "
-                          "MI_MACSSPNDD is still not on.\n",
-                          wlc_hw->unit, WLC_MAX_MAC_SUSPEND));
-                WL_ERROR(("wl%d: psmdebug 0x%08x, phydebug 0x%08x, psm_brc 0x%04x\n", wlc_hw->unit, R_REG(osh, &regs->psmdebug), R_REG(osh, &regs->phydebug), R_REG(osh, &regs->psm_brc)));
+                WL_ERROR("wl%d: wlc_suspend_mac_and_wait: waited %d uS and MI_MACSSPNDD is still not on.\n",
+                         wlc_hw->unit, WLC_MAX_MAC_SUSPEND);
+                WL_ERROR("wl%d: psmdebug 0x%08x, phydebug 0x%08x, psm_brc 0x%04x\n",
+                         wlc_hw->unit,
+                         R_REG(osh, &regs->psmdebug),
+                         R_REG(osh, &regs->phydebug),
+                         R_REG(osh, &regs->psm_brc));
         }
 
         mc = R_REG(osh, &regs->maccontrol);
         if (mc == 0xffffffff) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc_hw->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc_hw->unit, __func__);
                 wl_down(wlc->wl);
                 return;
         }
@@ -3500,15 +3523,15 @@ void wlc_suspend_mac_and_wait(wlc_info_t *wlc)
         ASSERT(!(mc & MCTL_EN_MAC));
 }
 
-void wlc_enable_mac(wlc_info_t *wlc)
+void wlc_enable_mac(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         d11regs_t *regs = wlc_hw->regs;
         u32 mc, mi;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: wlc_enable_mac: bandunit %d\n", wlc_hw->unit,
-                  wlc->band->bandunit));
+        WL_TRACE("wl%d: wlc_enable_mac: bandunit %d\n",
+                 wlc_hw->unit, wlc->band->bandunit);
 
         /*
          * Track overlapping suspend requests
@@ -3539,7 +3562,7 @@ void wlc_enable_mac(wlc_info_t *wlc)
         wlc_ucode_wake_override_clear(wlc_hw, WLC_WAKE_OVERRIDE_MACSUSPEND);
 }
 
-void wlc_bmac_ifsctl_edcrs_set(wlc_hw_info_t *wlc_hw, bool abie, bool isht)
+void wlc_bmac_ifsctl_edcrs_set(struct wlc_hw_info *wlc_hw, bool abie, bool isht)
 {
         if (!(WLCISNPHY(wlc_hw->band) && (D11REV_GE(wlc_hw->corerev, 16))))
                 return;
@@ -3575,7 +3598,7 @@ void wlc_bmac_ifsctl_edcrs_set(wlc_hw_info_t *wlc_hw, bool abie, bool isht)
         }
 }
 
-static void wlc_upd_ofdm_pctl1_table(wlc_hw_info_t *wlc_hw)
+static void wlc_upd_ofdm_pctl1_table(struct wlc_hw_info *wlc_hw)
 {
         u8 rate;
         u8 rates[8] = {
@@ -3609,7 +3632,7 @@ static void wlc_upd_ofdm_pctl1_table(wlc_hw_info_t *wlc_hw)
         }
 }
 
-static u16 wlc_bmac_ofdm_ratetable_offset(wlc_hw_info_t *wlc_hw, u8 rate)
+static u16 wlc_bmac_ofdm_ratetable_offset(struct wlc_hw_info *wlc_hw, u8 rate)
 {
         uint i;
         u8 plcp_rate = 0;
@@ -3642,7 +3665,7 @@ static u16 wlc_bmac_ofdm_ratetable_offset(wlc_hw_info_t *wlc_hw, u8 rate)
         return 2 * wlc_bmac_read_shm(wlc_hw, M_RT_DIRMAP_A + (plcp_rate * 2));
 }
 
-void wlc_bmac_band_stf_ss_set(wlc_hw_info_t *wlc_hw, u8 stf_mode)
+void wlc_bmac_band_stf_ss_set(struct wlc_hw_info *wlc_hw, u8 stf_mode)
 {
         wlc_hw->hw_stf_ss_opmode = stf_mode;
 
@@ -3651,7 +3674,7 @@ void wlc_bmac_band_stf_ss_set(wlc_hw_info_t *wlc_hw, u8 stf_mode)
 }
 
 void BCMFASTPATH
-wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr,
+wlc_bmac_read_tsf(struct wlc_hw_info *wlc_hw, u32 *tsf_l_ptr,
                   u32 *tsf_h_ptr)
 {
         d11regs_t *regs = wlc_hw->regs;
@@ -3663,14 +3686,14 @@ wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr,
         return;
 }
 
-bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
+bool wlc_bmac_validate_chip_access(struct wlc_hw_info *wlc_hw)
 {
         d11regs_t *regs;
         u32 w, val;
         volatile u16 *reg16;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: validate_chip_access\n", wlc_hw->unit));
+        WL_TRACE("wl%d: validate_chip_access\n", wlc_hw->unit);
 
         regs = wlc_hw->regs;
         osh = wlc_hw->osh;
@@ -3690,7 +3713,8 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
         (void)R_REG(osh, &regs->objaddr);
         val = R_REG(osh, &regs->objdata);
         if (val != (u32) 0xaa5555aa) {
-                WL_ERROR(("wl%d: validate_chip_access: SHM = 0x%x, expected 0xaa5555aa\n", wlc_hw->unit, val));
+                WL_ERROR("wl%d: validate_chip_access: SHM = 0x%x, expected 0xaa5555aa\n",
+                         wlc_hw->unit, val);
                 return false;
         }
 
@@ -3702,7 +3726,8 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
         (void)R_REG(osh, &regs->objaddr);
         val = R_REG(osh, &regs->objdata);
         if (val != (u32) 0x55aaaa55) {
-                WL_ERROR(("wl%d: validate_chip_access: SHM = 0x%x, expected 0x55aaaa55\n", wlc_hw->unit, val));
+                WL_ERROR("wl%d: validate_chip_access: SHM = 0x%x, expected 0x55aaaa55\n",
+                         wlc_hw->unit, val);
                 return false;
         }
 
@@ -3732,12 +3757,14 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
                 /* verify with the 16 bit registers that have no side effects */
                 val = R_REG(osh, &regs->tsf_cfpstrt_l);
                 if (val != (uint) 0xBBBB) {
-                        WL_ERROR(("wl%d: validate_chip_access: tsf_cfpstrt_l = 0x%x, expected" " 0x%x\n", wlc_hw->unit, val, 0xBBBB));
+                        WL_ERROR("wl%d: validate_chip_access: tsf_cfpstrt_l = 0x%x, expected 0x%x\n",
+                                 wlc_hw->unit, val, 0xBBBB);
                         return false;
                 }
                 val = R_REG(osh, &regs->tsf_cfpstrt_h);
                 if (val != (uint) 0xCCCC) {
-                        WL_ERROR(("wl%d: validate_chip_access: tsf_cfpstrt_h = 0x%x, expected" " 0x%x\n", wlc_hw->unit, val, 0xCCCC));
+                        WL_ERROR("wl%d: validate_chip_access: tsf_cfpstrt_h = 0x%x, expected 0x%x\n",
+                                 wlc_hw->unit, val, 0xCCCC);
                         return false;
                 }
 
@@ -3749,7 +3776,10 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
         w = R_REG(osh, &regs->maccontrol);
         if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &&
             (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {
-                WL_ERROR(("wl%d: validate_chip_access: maccontrol = 0x%x, expected 0x%x or 0x%x\n", wlc_hw->unit, w, (MCTL_IHR_EN | MCTL_WAKE), (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE)));
+                WL_ERROR("wl%d: validate_chip_access: maccontrol = 0x%x, expected 0x%x or 0x%x\n",
+                         wlc_hw->unit, w,
+                         (MCTL_IHR_EN | MCTL_WAKE),
+                         (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE));
                 return false;
         }
 
@@ -3758,13 +3788,13 @@ bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
 
 #define PHYPLL_WAIT_US  100000
 
-void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on)
+void wlc_bmac_core_phypll_ctl(struct wlc_hw_info *wlc_hw, bool on)
 {
         d11regs_t *regs;
-        osl_t *osh;
+        struct osl_info *osh;
         u32 tmp;
 
-        WL_TRACE(("wl%d: wlc_bmac_core_phypll_ctl\n", wlc_hw->unit));
+        WL_TRACE("wl%d: wlc_bmac_core_phypll_ctl\n", wlc_hw->unit);
 
         tmp = 0;
         regs = wlc_hw->regs;
@@ -3785,8 +3815,8 @@ void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on)
                         tmp = R_REG(osh, &regs->clk_ctl_st);
                         if ((tmp & (CCS_ERSRC_AVAIL_HT)) !=
                             (CCS_ERSRC_AVAIL_HT)) {
-                                WL_ERROR(("%s: turn on PHY PLL failed\n",
-                                          __func__));
+                                WL_ERROR("%s: turn on PHY PLL failed\n",
+                                         __func__);
                                 ASSERT(0);
                         }
                 } else {
@@ -3803,8 +3833,8 @@ void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on)
                              (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
                             !=
                             (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL)) {
-                                WL_ERROR(("%s: turn on PHY PLL failed\n",
-                                          __func__));
+                                WL_ERROR("%s: turn on PHY PLL failed\n",
+                                         __func__);
                                 ASSERT(0);
                         }
                 }
@@ -3817,11 +3847,11 @@ void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on)
         }
 }
 
-void wlc_coredisable(wlc_hw_info_t *wlc_hw)
+void wlc_coredisable(struct wlc_hw_info *wlc_hw)
 {
         bool dev_gone;
 
-        WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__);
 
         ASSERT(!wlc_hw->up);
 
@@ -3857,9 +3887,9 @@ void wlc_coredisable(wlc_hw_info_t *wlc_hw)
 }
 
 /* power both the pll and external oscillator on/off */
-void wlc_bmac_xtal(wlc_hw_info_t *wlc_hw, bool want)
+void wlc_bmac_xtal(struct wlc_hw_info *wlc_hw, bool want)
 {
-        WL_TRACE(("wl%d: wlc_bmac_xtal: want %d\n", wlc_hw->unit, want));
+        WL_TRACE("wl%d: wlc_bmac_xtal: want %d\n", wlc_hw->unit, want);
 
         /* dont power down if plldown is false or we must poll hw radio disable */
         if (!want && wlc_hw->pllreq)
@@ -3876,9 +3906,9 @@ void wlc_bmac_xtal(wlc_hw_info_t *wlc_hw, bool want)
         }
 }
 
-static void wlc_flushqueues(wlc_info_t *wlc)
+static void wlc_flushqueues(struct wlc_info *wlc)
 {
-        wlc_hw_info_t *wlc_hw = wlc->hw;
+        struct wlc_hw_info *wlc_hw = wlc->hw;
         uint i;
 
         wlc->txpend16165war = 0;
@@ -3888,8 +3918,8 @@ static void wlc_flushqueues(wlc_info_t *wlc)
                 if (wlc_hw->di[i]) {
                         dma_txreclaim(wlc_hw->di[i], HNDDMA_RANGE_ALL);
                         TXPKTPENDCLR(wlc, i);
-                        WL_TRACE(("wlc_flushqueues: pktpend fifo %d cleared\n",
-                                  i));
+                        WL_TRACE("wlc_flushqueues: pktpend fifo %d cleared\n",
+                                 i);
                 }
 
         /* free any posted rx packets */
@@ -3898,12 +3928,12 @@ static void wlc_flushqueues(wlc_info_t *wlc)
                 dma_rxreclaim(wlc_hw->di[RX_TXSTATUS_FIFO]);
 }
 
-u16 wlc_bmac_read_shm(wlc_hw_info_t *wlc_hw, uint offset)
+u16 wlc_bmac_read_shm(struct wlc_hw_info *wlc_hw, uint offset)
 {
         return wlc_bmac_read_objmem(wlc_hw, offset, OBJADDR_SHM_SEL);
 }
 
-void wlc_bmac_write_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v)
+void wlc_bmac_write_shm(struct wlc_hw_info *wlc_hw, uint offset, u16 v)
 {
         wlc_bmac_write_objmem(wlc_hw, offset, v, OBJADDR_SHM_SEL);
 }
@@ -3912,7 +3942,7 @@ void wlc_bmac_write_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v)
  * SHM 'offset' needs to be an even address and
  * Buffer length 'len' must be an even number of bytes
  */
-void wlc_bmac_set_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v, int len)
+void wlc_bmac_set_shm(struct wlc_hw_info *wlc_hw, uint offset, u16 v, int len)
 {
         int i;
 
@@ -3929,7 +3959,7 @@ void wlc_bmac_set_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v, int len)
 }
 
 static u16
-wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, u32 sel)
+wlc_bmac_read_objmem(struct wlc_hw_info *wlc_hw, uint offset, u32 sel)
 {
         d11regs_t *regs = wlc_hw->regs;
         volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
@@ -3950,7 +3980,7 @@ wlc_bmac_read_objmem(wlc_hw_info_t *wlc_hw, uint offset, u32 sel)
 }
 
 static void
-wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, u32 sel)
+wlc_bmac_write_objmem(struct wlc_hw_info *wlc_hw, uint offset, u16 v, u32 sel)
 {
         d11regs_t *regs = wlc_hw->regs;
         volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
@@ -3973,7 +4003,7 @@ wlc_bmac_write_objmem(wlc_hw_info_t *wlc_hw, uint offset, u16 v, u32 sel)
  * 'sel' selects the type of memory
  */
 void
-wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw, uint offset, const void *buf,
+wlc_bmac_copyto_objmem(struct wlc_hw_info *wlc_hw, uint offset, const void *buf,
                        int len, u32 sel)
 {
         u16 v;
@@ -3999,7 +4029,7 @@ wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw, uint offset, const void *buf,
  * 'sel' selects the type of memory
  */
 void
-wlc_bmac_copyfrom_objmem(wlc_hw_info_t *wlc_hw, uint offset, void *buf,
+wlc_bmac_copyfrom_objmem(struct wlc_hw_info *wlc_hw, uint offset, void *buf,
                          int len, u32 sel)
 {
         u16 v;
@@ -4020,16 +4050,16 @@ wlc_bmac_copyfrom_objmem(wlc_hw_info_t *wlc_hw, uint offset, void *buf,
         }
 }
 
-void wlc_bmac_copyfrom_vars(wlc_hw_info_t *wlc_hw, char **buf, uint *len)
+void wlc_bmac_copyfrom_vars(struct wlc_hw_info *wlc_hw, char **buf, uint *len)
 {
-        WL_TRACE(("wlc_bmac_copyfrom_vars, nvram vars totlen=%d\n",
-                  wlc_hw->vars_size));
+        WL_TRACE("wlc_bmac_copyfrom_vars, nvram vars totlen=%d\n",
+                 wlc_hw->vars_size);
 
         *buf = wlc_hw->vars;
         *len = wlc_hw->vars_size;
 }
 
-void wlc_bmac_retrylimit_upd(wlc_hw_info_t *wlc_hw, u16 SRL, u16 LRL)
+void wlc_bmac_retrylimit_upd(struct wlc_hw_info *wlc_hw, u16 SRL, u16 LRL)
 {
         wlc_hw->SRL = SRL;
         wlc_hw->LRL = LRL;
@@ -4047,17 +4077,17 @@ void wlc_bmac_retrylimit_upd(wlc_hw_info_t *wlc_hw, u16 SRL, u16 LRL)
         }
 }
 
-void wlc_bmac_set_noreset(wlc_hw_info_t *wlc_hw, bool noreset_flag)
+void wlc_bmac_set_noreset(struct wlc_hw_info *wlc_hw, bool noreset_flag)
 {
         wlc_hw->noreset = noreset_flag;
 }
 
-void wlc_bmac_set_ucode_loaded(wlc_hw_info_t *wlc_hw, bool ucode_loaded)
+void wlc_bmac_set_ucode_loaded(struct wlc_hw_info *wlc_hw, bool ucode_loaded)
 {
         wlc_hw->ucode_loaded = ucode_loaded;
 }
 
-void wlc_bmac_pllreq(wlc_hw_info_t *wlc_hw, bool set, mbool req_bit)
+void wlc_bmac_pllreq(struct wlc_hw_info *wlc_hw, bool set, mbool req_bit)
 {
         ASSERT(req_bit);
 
@@ -4088,7 +4118,7 @@ void wlc_bmac_pllreq(wlc_hw_info_t *wlc_hw, bool set, mbool req_bit)
         return;
 }
 
-void wlc_bmac_set_clk(wlc_hw_info_t *wlc_hw, bool on)
+void wlc_bmac_set_clk(struct wlc_hw_info *wlc_hw, bool on)
 {
         if (on) {
                 /* power up pll and oscillator */
@@ -4110,7 +4140,7 @@ void wlc_bmac_set_clk(wlc_hw_info_t *wlc_hw, bool on)
 }
 
 /* this will be true for all ai chips */
-bool wlc_bmac_taclear(wlc_hw_info_t *wlc_hw, bool ta_ok)
+bool wlc_bmac_taclear(struct wlc_hw_info *wlc_hw, bool ta_ok)
 {
         return true;
 }
@@ -4118,7 +4148,7 @@ bool wlc_bmac_taclear(wlc_hw_info_t *wlc_hw, bool ta_ok)
 /* Lower down relevant GPIOs like LED when going down w/o
  * doing PCI config cycles or touching interrupts
  */
-void wlc_gpio_fast_deinit(wlc_hw_info_t *wlc_hw)
+void wlc_gpio_fast_deinit(struct wlc_hw_info *wlc_hw)
 {
         if ((wlc_hw == NULL) || (wlc_hw->sih == NULL))
                 return;
@@ -4126,17 +4156,17 @@ void wlc_gpio_fast_deinit(wlc_hw_info_t *wlc_hw)
         /* Only chips with internal bus or PCIE cores or certain PCI cores
          * are able to switch cores w/o disabling interrupts
          */
-        if (!((BUSTYPE(wlc_hw->sih->bustype) == SI_BUS) ||
-              ((BUSTYPE(wlc_hw->sih->bustype) == PCI_BUS) &&
+        if (!((wlc_hw->sih->bustype == SI_BUS) ||
+              ((wlc_hw->sih->bustype == PCI_BUS) &&
                ((wlc_hw->sih->buscoretype == PCIE_CORE_ID) ||
                 (wlc_hw->sih->buscorerev >= 13)))))
                 return;
 
-        WL_TRACE(("wl%d: %s\n", wlc_hw->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__);
         return;
 }
 
-bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable)
+bool wlc_bmac_radio_hw(struct wlc_hw_info *wlc_hw, bool enable)
 {
         /* Do not access Phy registers if core is not up */
         if (si_iscoreup(wlc_hw->sih) == false)
@@ -4171,7 +4201,7 @@ bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable)
         return true;
 }
 
-u16 wlc_bmac_rate_shm_offset(wlc_hw_info_t *wlc_hw, u8 rate)
+u16 wlc_bmac_rate_shm_offset(struct wlc_hw_info *wlc_hw, u8 rate)
 {
         u16 table_ptr;
         u8 phy_rate, index;
@@ -4195,12 +4225,12 @@ u16 wlc_bmac_rate_shm_offset(wlc_hw_info_t *wlc_hw, u8 rate)
         return 2 * wlc_bmac_read_shm(wlc_hw, table_ptr + (index * 2));
 }
 
-void wlc_bmac_set_txpwr_percent(wlc_hw_info_t *wlc_hw, u8 val)
+void wlc_bmac_set_txpwr_percent(struct wlc_hw_info *wlc_hw, u8 val)
 {
         wlc_phy_txpwr_percent_set(wlc_hw->band->pi, val);
 }
 
-void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, u32 antsel_avail)
+void wlc_bmac_antsel_set(struct wlc_hw_info *wlc_hw, u32 antsel_avail)
 {
         wlc_hw->antsel_avail = antsel_avail;
 }
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.h b/drivers/staging/brcm80211/sys/wlc_bmac.h
index 872bc8d866d2..98150aaff3a3 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.h
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.h
@@ -57,7 +57,8 @@ typedef struct wlc_bmac_revinfo {
         } band[MAXBANDS];
 } wlc_bmac_revinfo_t;
 
-/* dup state between BMAC(wlc_hw_info_t) and HIGH(wlc_info_t) driver */
+/* dup state between BMAC(struct wlc_hw_info) and HIGH(struct wlc_info)
+   driver */
 typedef struct wlc_bmac_state {
         u32 machwcap;   /* mac hw capibility */
         u32 preamble_ovr;       /* preamble override */
@@ -130,148 +131,143 @@ typedef enum {
         WLCHW_STATE_LAST
 } wlc_bmac_state_id_t;
 
-extern int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device,
-                           uint unit, bool piomode, osl_t *osh, void *regsva,
-                           uint bustype, void *btparam);
-extern int wlc_bmac_detach(wlc_info_t *wlc);
+extern int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device,
+                           uint unit, bool piomode, struct osl_info *osh,
+                           void *regsva, uint bustype, void *btparam);
+extern int wlc_bmac_detach(struct wlc_info *wlc);
 extern void wlc_bmac_watchdog(void *arg);
-extern void wlc_bmac_info_init(wlc_hw_info_t *wlc_hw);
+extern void wlc_bmac_info_init(struct wlc_hw_info *wlc_hw);
 
 /* up/down, reset, clk */
-#ifdef WLC_LOW
-extern void wlc_bmac_xtal(wlc_hw_info_t *wlc_hw, bool want);
-#endif
+extern void wlc_bmac_xtal(struct wlc_hw_info *wlc_hw, bool want);
 
-extern void wlc_bmac_copyto_objmem(wlc_hw_info_t *wlc_hw,
+extern void wlc_bmac_copyto_objmem(struct wlc_hw_info *wlc_hw,
                                    uint offset, const void *buf, int len,
                                    u32 sel);
-extern void wlc_bmac_copyfrom_objmem(wlc_hw_info_t *wlc_hw, uint offset,
+extern void wlc_bmac_copyfrom_objmem(struct wlc_hw_info *wlc_hw, uint offset,
                                      void *buf, int len, u32 sel);
 #define wlc_bmac_copyfrom_shm(wlc_hw, offset, buf, len)                 \
         wlc_bmac_copyfrom_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
 #define wlc_bmac_copyto_shm(wlc_hw, offset, buf, len)                   \
         wlc_bmac_copyto_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
 
-extern void wlc_bmac_core_phy_clk(wlc_hw_info_t *wlc_hw, bool clk);
-extern void wlc_bmac_core_phypll_reset(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_core_phypll_ctl(wlc_hw_info_t *wlc_hw, bool on);
-extern void wlc_bmac_phyclk_fgc(wlc_hw_info_t *wlc_hw, bool clk);
-extern void wlc_bmac_macphyclk_set(wlc_hw_info_t *wlc_hw, bool clk);
-extern void wlc_bmac_phy_reset(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags);
-extern void wlc_bmac_reset(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_init(wlc_hw_info_t *wlc_hw, chanspec_t chanspec,
+extern void wlc_bmac_core_phy_clk(struct wlc_hw_info *wlc_hw, bool clk);
+extern void wlc_bmac_core_phypll_reset(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_core_phypll_ctl(struct wlc_hw_info *wlc_hw, bool on);
+extern void wlc_bmac_phyclk_fgc(struct wlc_hw_info *wlc_hw, bool clk);
+extern void wlc_bmac_macphyclk_set(struct wlc_hw_info *wlc_hw, bool clk);
+extern void wlc_bmac_phy_reset(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_corereset(struct wlc_hw_info *wlc_hw, u32 flags);
+extern void wlc_bmac_reset(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_init(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
                           bool mute);
-extern int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw);
-extern int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw);
-extern int wlc_bmac_down_prep(wlc_hw_info_t *wlc_hw);
-extern int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags);
-extern void wlc_bmac_switch_macfreq(wlc_hw_info_t *wlc_hw, u8 spurmode);
+extern int wlc_bmac_up_prep(struct wlc_hw_info *wlc_hw);
+extern int wlc_bmac_up_finish(struct wlc_hw_info *wlc_hw);
+extern int wlc_bmac_down_prep(struct wlc_hw_info *wlc_hw);
+extern int wlc_bmac_down_finish(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_corereset(struct wlc_hw_info *wlc_hw, u32 flags);
+extern void wlc_bmac_switch_macfreq(struct wlc_hw_info *wlc_hw, u8 spurmode);
 
 /* chanspec, ucode interface */
-extern int wlc_bmac_bandtype(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_set_chanspec(wlc_hw_info_t *wlc_hw, chanspec_t chanspec,
+extern int wlc_bmac_bandtype(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_set_chanspec(struct wlc_hw_info *wlc_hw,
+                                  chanspec_t chanspec,
                                   bool mute, struct txpwr_limits *txpwr);
 
-extern void wlc_bmac_txfifo(wlc_hw_info_t *wlc_hw, uint fifo, void *p,
+extern void wlc_bmac_txfifo(struct wlc_hw_info *wlc_hw, uint fifo, void *p,
                             bool commit, u16 frameid, u8 txpktpend);
-extern int wlc_bmac_xmtfifo_sz_get(wlc_hw_info_t *wlc_hw, uint fifo,
+extern int wlc_bmac_xmtfifo_sz_get(struct wlc_hw_info *wlc_hw, uint fifo,
                                    uint *blocks);
-extern void wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, u8 idx, u16 mask,
+extern void wlc_bmac_mhf(struct wlc_hw_info *wlc_hw, u8 idx, u16 mask,
                          u16 val, int bands);
-extern void wlc_bmac_mctrl(wlc_hw_info_t *wlc_hw, u32 mask, u32 val);
-extern u16 wlc_bmac_mhf_get(wlc_hw_info_t *wlc_hw, u8 idx, int bands);
-extern int wlc_bmac_xmtfifo_sz_set(wlc_hw_info_t *wlc_hw, uint fifo,
+extern void wlc_bmac_mctrl(struct wlc_hw_info *wlc_hw, u32 mask, u32 val);
+extern u16 wlc_bmac_mhf_get(struct wlc_hw_info *wlc_hw, u8 idx, int bands);
+extern int wlc_bmac_xmtfifo_sz_set(struct wlc_hw_info *wlc_hw, uint fifo,
                                    uint blocks);
-extern void wlc_bmac_txant_set(wlc_hw_info_t *wlc_hw, u16 phytxant);
-extern u16 wlc_bmac_get_txant(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_antsel_type_set(wlc_hw_info_t *wlc_hw, u8 antsel_type);
-extern int wlc_bmac_revinfo_get(wlc_hw_info_t *wlc_hw,
+extern void wlc_bmac_txant_set(struct wlc_hw_info *wlc_hw, u16 phytxant);
+extern u16 wlc_bmac_get_txant(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_antsel_type_set(struct wlc_hw_info *wlc_hw,
+                                     u8 antsel_type);
+extern int wlc_bmac_revinfo_get(struct wlc_hw_info *wlc_hw,
                                 wlc_bmac_revinfo_t *revinfo);
-extern int wlc_bmac_state_get(wlc_hw_info_t *wlc_hw, wlc_bmac_state_t *state);
-extern void wlc_bmac_write_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v);
-extern u16 wlc_bmac_read_shm(wlc_hw_info_t *wlc_hw, uint offset);
-extern void wlc_bmac_set_shm(wlc_hw_info_t *wlc_hw, uint offset, u16 v,
+extern int wlc_bmac_state_get(struct wlc_hw_info *wlc_hw,
+                              wlc_bmac_state_t *state);
+extern void wlc_bmac_write_shm(struct wlc_hw_info *wlc_hw, uint offset, u16 v);
+extern u16 wlc_bmac_read_shm(struct wlc_hw_info *wlc_hw, uint offset);
+extern void wlc_bmac_set_shm(struct wlc_hw_info *wlc_hw, uint offset, u16 v,
                              int len);
-extern void wlc_bmac_write_template_ram(wlc_hw_info_t *wlc_hw, int offset,
+extern void wlc_bmac_write_template_ram(struct wlc_hw_info *wlc_hw, int offset,
                                         int len, void *buf);
-extern void wlc_bmac_copyfrom_vars(wlc_hw_info_t *wlc_hw, char **buf,
+extern void wlc_bmac_copyfrom_vars(struct wlc_hw_info *wlc_hw, char **buf,
                                    uint *len);
 
-extern void wlc_bmac_process_ps_switch(wlc_hw_info_t *wlc,
+extern void wlc_bmac_process_ps_switch(struct wlc_hw_info *wlc,
                                        struct ether_addr *ea, s8 ps_on);
-extern void wlc_bmac_hw_etheraddr(wlc_hw_info_t *wlc_hw,
+extern void wlc_bmac_hw_etheraddr(struct wlc_hw_info *wlc_hw,
                                   struct ether_addr *ea);
-extern void wlc_bmac_set_hw_etheraddr(wlc_hw_info_t *wlc_hw,
+extern void wlc_bmac_set_hw_etheraddr(struct wlc_hw_info *wlc_hw,
                                       struct ether_addr *ea);
-extern bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw);
+extern bool wlc_bmac_validate_chip_access(struct wlc_hw_info *wlc_hw);
 
-extern bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw);
-extern void wlc_bmac_set_shortslot(wlc_hw_info_t *wlc_hw, bool shortslot);
-extern void wlc_bmac_mute(wlc_hw_info_t *wlc_hw, bool want, mbool flags);
-extern void wlc_bmac_set_deaf(wlc_hw_info_t *wlc_hw, bool user_flag);
-extern void wlc_bmac_band_stf_ss_set(wlc_hw_info_t *wlc_hw, u8 stf_mode);
+extern bool wlc_bmac_radio_read_hwdisabled(struct wlc_hw_info *wlc_hw);
+extern void wlc_bmac_set_shortslot(struct wlc_hw_info *wlc_hw, bool shortslot);
+extern void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool want, mbool flags);
+extern void wlc_bmac_set_deaf(struct wlc_hw_info *wlc_hw, bool user_flag);
+extern void wlc_bmac_band_stf_ss_set(struct wlc_hw_info *wlc_hw, u8 stf_mode);
 
-extern void wlc_bmac_wait_for_wake(wlc_hw_info_t *wlc_hw);
-extern bool wlc_bmac_tx_fifo_suspended(wlc_hw_info_t *wlc_hw, uint tx_fifo);
-extern void wlc_bmac_tx_fifo_suspend(wlc_hw_info_t *wlc_hw, uint tx_fifo);
-extern void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo);
+extern void wlc_bmac_wait_for_wake(struct wlc_hw_info *wlc_hw);
+extern bool wlc_bmac_tx_fifo_suspended(struct wlc_hw_info *wlc_hw,
+                                       uint tx_fifo);
+extern void wlc_bmac_tx_fifo_suspend(struct wlc_hw_info *wlc_hw, uint tx_fifo);
+extern void wlc_bmac_tx_fifo_resume(struct wlc_hw_info *wlc_hw, uint tx_fifo);
 
-extern void wlc_ucode_wake_override_set(wlc_hw_info_t *wlc_hw,
+extern void wlc_ucode_wake_override_set(struct wlc_hw_info *wlc_hw,
                                         u32 override_bit);
-extern void wlc_ucode_wake_override_clear(wlc_hw_info_t *wlc_hw,
+extern void wlc_ucode_wake_override_clear(struct wlc_hw_info *wlc_hw,
                                           u32 override_bit);
 
-extern void wlc_bmac_set_rcmta(wlc_hw_info_t *wlc_hw, int idx,
+extern void wlc_bmac_set_rcmta(struct wlc_hw_info *wlc_hw, int idx,
                                const struct ether_addr *addr);
-extern void wlc_bmac_set_addrmatch(wlc_hw_info_t *wlc_hw, int match_reg_offset,
+extern void wlc_bmac_set_addrmatch(struct wlc_hw_info *wlc_hw,
+                                   int match_reg_offset,
                                    const struct ether_addr *addr);
-extern void wlc_bmac_write_hw_bcntemplates(wlc_hw_info_t *wlc_hw, void *bcn,
-                                           int len, bool both);
+extern void wlc_bmac_write_hw_bcntemplates(struct wlc_hw_info *wlc_hw,
+                                           void *bcn, int len, bool both);
 
-extern void wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr,
+extern void wlc_bmac_read_tsf(struct wlc_hw_info *wlc_hw, u32 *tsf_l_ptr,
                               u32 *tsf_h_ptr);
-extern void wlc_bmac_set_cwmin(wlc_hw_info_t *wlc_hw, u16 newmin);
-extern void wlc_bmac_set_cwmax(wlc_hw_info_t *wlc_hw, u16 newmax);
-extern void wlc_bmac_set_noreset(wlc_hw_info_t *wlc, bool noreset_flag);
-extern void wlc_bmac_set_ucode_loaded(wlc_hw_info_t *wlc, bool ucode_loaded);
+extern void wlc_bmac_set_cwmin(struct wlc_hw_info *wlc_hw, u16 newmin);
+extern void wlc_bmac_set_cwmax(struct wlc_hw_info *wlc_hw, u16 newmax);
+extern void wlc_bmac_set_noreset(struct wlc_hw_info *wlc, bool noreset_flag);
+extern void wlc_bmac_set_ucode_loaded(struct wlc_hw_info *wlc,
+                                      bool ucode_loaded);
 
-extern void wlc_bmac_retrylimit_upd(wlc_hw_info_t *wlc_hw, u16 SRL,
+extern void wlc_bmac_retrylimit_upd(struct wlc_hw_info *wlc_hw, u16 SRL,
                                     u16 LRL);
 
-extern void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw);
+extern void wlc_bmac_fifoerrors(struct wlc_hw_info *wlc_hw);
 
-#ifdef WLC_HIGH_ONLY
-extern void wlc_bmac_dngl_reboot(rpc_info_t *);
-extern void wlc_bmac_dngl_rpc_agg(rpc_info_t *, u16 agg);
-extern void wlc_bmac_dngl_rpc_msglevel(rpc_info_t *, u16 level);
-extern void wlc_bmac_dngl_rpc_txq_wm_set(rpc_info_t *rpc, u32 wm);
-extern void wlc_bmac_dngl_rpc_txq_wm_get(rpc_info_t *rpc, u32 *wm);
-extern void wlc_bmac_dngl_rpc_agg_limit_set(rpc_info_t *rpc, u32 val);
-extern void wlc_bmac_dngl_rpc_agg_limit_get(rpc_info_t *rpc, u32 *pval);
-extern int wlc_bmac_debug_template(wlc_hw_info_t *wlc_hw);
-#endif
 
 /* API for BMAC driver (e.g. wlc_phy.c etc) */
 
-extern void wlc_bmac_bw_set(wlc_hw_info_t *wlc_hw, u16 bw);
-extern void wlc_bmac_pllreq(wlc_hw_info_t *wlc_hw, bool set, mbool req_bit);
-extern void wlc_bmac_set_clk(wlc_hw_info_t *wlc_hw, bool on);
-extern bool wlc_bmac_taclear(wlc_hw_info_t *wlc_hw, bool ta_ok);
+extern void wlc_bmac_bw_set(struct wlc_hw_info *wlc_hw, u16 bw);
+extern void wlc_bmac_pllreq(struct wlc_hw_info *wlc_hw, bool set,
+                            mbool req_bit);
+extern void wlc_bmac_set_clk(struct wlc_hw_info *wlc_hw, bool on);
+extern bool wlc_bmac_taclear(struct wlc_hw_info *wlc_hw, bool ta_ok);
 extern void wlc_bmac_hw_up(struct wlc_hw_info *wlc_hw);
 
-extern void wlc_bmac_dump(wlc_hw_info_t *wlc_hw, struct bcmstrbuf *b,
+extern void wlc_bmac_dump(struct wlc_hw_info *wlc_hw, struct bcmstrbuf *b,
                           wlc_bmac_dump_id_t dump_id);
-extern void wlc_gpio_fast_deinit(wlc_hw_info_t *wlc_hw);
+extern void wlc_gpio_fast_deinit(struct wlc_hw_info *wlc_hw);
 
-extern bool wlc_bmac_radio_hw(wlc_hw_info_t *wlc_hw, bool enable);
-extern u16 wlc_bmac_rate_shm_offset(wlc_hw_info_t *wlc_hw, u8 rate);
+extern bool wlc_bmac_radio_hw(struct wlc_hw_info *wlc_hw, bool enable);
+extern u16 wlc_bmac_rate_shm_offset(struct wlc_hw_info *wlc_hw, u8 rate);
 
-extern void wlc_bmac_assert_type_set(wlc_hw_info_t *wlc_hw, u32 type);
-extern void wlc_bmac_set_txpwr_percent(wlc_hw_info_t *wlc_hw, u8 val);
-extern void wlc_bmac_blink_sync(wlc_hw_info_t *wlc_hw, u32 led_pins);
-extern void wlc_bmac_ifsctl_edcrs_set(wlc_hw_info_t *wlc_hw, bool abie,
+extern void wlc_bmac_assert_type_set(struct wlc_hw_info *wlc_hw, u32 type);
+extern void wlc_bmac_set_txpwr_percent(struct wlc_hw_info *wlc_hw, u8 val);
+extern void wlc_bmac_blink_sync(struct wlc_hw_info *wlc_hw, u32 led_pins);
+extern void wlc_bmac_ifsctl_edcrs_set(struct wlc_hw_info *wlc_hw, bool abie,
                                       bool isht);
 
-extern void wlc_bmac_antsel_set(wlc_hw_info_t *wlc_hw, u32 antsel_avail);
+extern void wlc_bmac_antsel_set(struct wlc_hw_info *wlc_hw, u32 antsel_avail);
diff --git a/drivers/staging/brcm80211/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/sys/wlc_bsscfg.h
index ae5542ab0334..d6a1971c69a0 100644
--- a/drivers/staging/brcm80211/sys/wlc_bsscfg.h
+++ b/drivers/staging/brcm80211/sys/wlc_bsscfg.h
@@ -34,7 +34,8 @@ typedef struct wlc_bsscfg wlc_bsscfg_t;
 #define MAXMACLIST              64      /* max # source MAC matches */
 #define BCN_TEMPLATE_COUNT      2
 
-/* Iterator for "associated" STA bss configs:  (wlc_info_t *wlc, int idx, wlc_bsscfg_t *cfg) */
+/* Iterator for "associated" STA bss configs:
+   (struct wlc_info *wlc, int idx, wlc_bsscfg_t *cfg) */
 #define FOREACH_AS_STA(wlc, idx, cfg) \
         for (idx = 0; (int) idx < WLC_MAXBSSCFG; idx++) \
                 if ((cfg = (wlc)->bsscfg[idx]) && BSSCFG_STA(cfg) && cfg->associated)
diff --git a/drivers/staging/brcm80211/sys/wlc_cfg.h b/drivers/staging/brcm80211/sys/wlc_cfg.h
index a415e1fd2c05..3decb7d1a5e5 100644
--- a/drivers/staging/brcm80211/sys/wlc_cfg.h
+++ b/drivers/staging/brcm80211/sys/wlc_cfg.h
@@ -23,14 +23,6 @@
 
 #define IS_SINGLEBAND_5G(device)        0
 
-/* Keep WLC_HIGH_ONLY, WLC_SPLIT for USB extension later on */
-#if !defined(WLC_LOW)
-#define WLC_HIGH_ONLY
-#endif
-#if !defined(WLC_LOW)
-#define WLC_SPLIT
-#endif
-
 /* **** Core type/rev defaults **** */
 #define D11_DEFAULT     0x0fffffb0      /* Supported  D11 revs: 4, 5, 7-27
                                          * also need to update wlc.h MAXCOREREV
@@ -61,22 +53,6 @@
                                          *      3       5356a0
                                          */
 
-#ifdef BCMSDIO
-#define D11CONF 0x100000
-#define SSLPNCONF 2
-#define GCCONF  0
-#define ACCONF  0
-#define NCONF   0
-#define LPCONF  0
-#define LCNCONF 0
-#define NTXD 32
-#define NRXD 16
-#define NRXBUFPOST 8
-#define WLC_DATAHIWAT 32
-#define RXBND 8
-#define MAXPKTCB 64
-#define AMPDU_NUM_MPDU 8
-#endif
 
 /* For undefined values, use defaults */
 #ifndef D11CONF
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c
index 509280337e34..a35c15214880 100644
--- a/drivers/staging/brcm80211/sys/wlc_channel.c
+++ b/drivers/staging/brcm80211/sys/wlc_channel.c
@@ -19,16 +19,21 @@
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <wlioctl.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_stf.h>
 #include <wlc_channel.h>
+#include <wl_dbg.h>
 
 typedef struct wlc_cm_band {
         u8 locale_flags;        /* locale_info_t flags */
@@ -39,8 +44,8 @@ typedef struct wlc_cm_band {
 } wlc_cm_band_t;
 
 struct wlc_cm_info {
-        wlc_pub_t *pub;
-        wlc_info_t *wlc;
+        struct wlc_pub *pub;
+        struct wlc_info *wlc;
         char srom_ccode[WLC_CNTRY_BUF_SZ];      /* Country Code in SROM */
         uint srom_regrev;       /* Regulatory Rev for the SROM ccode */
         const country_info_t *country;  /* current country def */
@@ -377,7 +382,7 @@ void wlc_locale_get_channels(const locale_info_t *locale, chanvec_t *channels)
 {
         u8 i;
 
-        bzero(channels, sizeof(chanvec_t));
+        memset(channels, 0, sizeof(chanvec_t));
 
         for (i = 0; i < ARRAY_SIZE(g_table_locale_base); i++) {
                 if (locale->valid_channels & (1 << i)) {
@@ -562,8 +567,8 @@ struct chan20_info chan20_info[] = {
 const locale_info_t *wlc_get_locale_2g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_locale_2g_table)) {
-                WL_ERROR(("%s: locale 2g index size out of range %d\n",
-                          __func__, locale_idx));
+                WL_ERROR("%s: locale 2g index size out of range %d\n",
+                         __func__, locale_idx);
                 ASSERT(locale_idx < ARRAY_SIZE(g_locale_2g_table));
                 return NULL;
         }
@@ -573,8 +578,8 @@ const locale_info_t *wlc_get_locale_2g(u8 locale_idx)
 const locale_info_t *wlc_get_locale_5g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_locale_5g_table)) {
-                WL_ERROR(("%s: locale 5g index size out of range %d\n",
-                          __func__, locale_idx));
+                WL_ERROR("%s: locale 5g index size out of range %d\n",
+                         __func__, locale_idx);
                 ASSERT(locale_idx < ARRAY_SIZE(g_locale_5g_table));
                 return NULL;
         }
@@ -584,8 +589,8 @@ const locale_info_t *wlc_get_locale_5g(u8 locale_idx)
 const locale_mimo_info_t *wlc_get_mimo_2g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_mimo_2g_table)) {
-                WL_ERROR(("%s: mimo 2g index size out of range %d\n", __func__,
-                          locale_idx));
+                WL_ERROR("%s: mimo 2g index size out of range %d\n",
+                         __func__, locale_idx);
                 return NULL;
         }
         return g_mimo_2g_table[locale_idx];
@@ -594,26 +599,26 @@ const locale_mimo_info_t *wlc_get_mimo_2g(u8 locale_idx)
 const locale_mimo_info_t *wlc_get_mimo_5g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_mimo_5g_table)) {
-                WL_ERROR(("%s: mimo 5g index size out of range %d\n", __func__,
-                          locale_idx));
+                WL_ERROR("%s: mimo 5g index size out of range %d\n",
+                         __func__, locale_idx);
                 return NULL;
         }
         return g_mimo_5g_table[locale_idx];
 }
 
-wlc_cm_info_t *wlc_channel_mgr_attach(wlc_info_t *wlc)
+wlc_cm_info_t *wlc_channel_mgr_attach(struct wlc_info *wlc)
 {
         wlc_cm_info_t *wlc_cm;
         char country_abbrev[WLC_CNTRY_BUF_SZ];
         const country_info_t *country;
-        wlc_pub_t *pub = wlc->pub;
+        struct wlc_pub *pub = wlc->pub;
         char *ccode;
 
-        WL_TRACE(("wl%d: wlc_channel_mgr_attach\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_channel_mgr_attach\n", wlc->pub->unit);
 
         wlc_cm = kzalloc(sizeof(wlc_cm_info_t), GFP_ATOMIC);
         if (wlc_cm == NULL) {
-                WL_ERROR(("wl%d: %s: out of memory", pub->unit, __func__));
+                WL_ERROR("wl%d: %s: out of memory", pub->unit, __func__);
                 return NULL;
         }
         wlc_cm->pub = pub;
@@ -624,12 +629,13 @@ wlc_cm_info_t *wlc_channel_mgr_attach(wlc_info_t *wlc)
         ccode = getvar(wlc->pub->vars, "ccode");
         if (ccode) {
                 strncpy(wlc->pub->srom_ccode, ccode, WLC_CNTRY_BUF_SZ - 1);
-                WL_NONE(("%s: SROM country code is %c%c\n", __func__,
-                         wlc->pub->srom_ccode[0], wlc->pub->srom_ccode[1]));
+                WL_NONE("%s: SROM country code is %c%c\n",
+                        __func__,
+                        wlc->pub->srom_ccode[0], wlc->pub->srom_ccode[1]);
         }
 
         /* internal country information which must match regulatory constraints in firmware */
-        bzero(country_abbrev, WLC_CNTRY_BUF_SZ);
+        memset(country_abbrev, 0, WLC_CNTRY_BUF_SZ);
         strncpy(country_abbrev, "X2", sizeof(country_abbrev) - 1);
         country = wlc_country_lookup(wlc, country_abbrev);
 
@@ -659,7 +665,7 @@ const char *wlc_channel_country_abbrev(wlc_cm_info_t *wlc_cm)
 
 u8 wlc_channel_locale_flags(wlc_cm_info_t *wlc_cm)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
 
         return wlc_cm->bandstate[wlc->band->bandunit].locale_flags;
 }
@@ -711,7 +717,9 @@ wlc_set_countrycode_rev(wlc_cm_info_t *wlc_cm,
         char mapped_ccode[WLC_CNTRY_BUF_SZ];
         uint mapped_regrev;
 
-        WL_NONE(("%s: (country_abbrev \"%s\", ccode \"%s\", regrev %d) SPROM \"%s\"/%u\n", __func__, country_abbrev, ccode, regrev, wlc_cm->srom_ccode, wlc_cm->srom_regrev));
+        WL_NONE("%s: (country_abbrev \"%s\", ccode \"%s\", regrev %d) SPROM \"%s\"/%u\n",
+                __func__, country_abbrev, ccode, regrev,
+                wlc_cm->srom_ccode, wlc_cm->srom_regrev);
 
         /* if regrev is -1, lookup the mapped country code,
          * otherwise use the ccode and regrev directly
@@ -750,7 +758,7 @@ wlc_set_country_common(wlc_cm_info_t *wlc_cm,
 {
         const locale_mimo_info_t *li_mimo;
         const locale_info_t *locale;
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         char prev_country_abbrev[WLC_CNTRY_BUF_SZ];
 
         ASSERT(country != NULL);
@@ -758,7 +766,7 @@ wlc_set_country_common(wlc_cm_info_t *wlc_cm,
         /* save current country state */
         wlc_cm->country = country;
 
-        bzero(&prev_country_abbrev, WLC_CNTRY_BUF_SZ);
+        memset(&prev_country_abbrev, 0, WLC_CNTRY_BUF_SZ);
         strncpy(prev_country_abbrev, wlc_cm->country_abbrev,
                 WLC_CNTRY_BUF_SZ - 1);
 
@@ -814,7 +822,7 @@ static const country_info_t *wlc_countrycode_map(wlc_cm_info_t *wlc_cm,
                                                  char *mapped_ccode,
                                                  uint *mapped_regrev)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         const country_info_t *country;
         uint srom_regrev = wlc_cm->srom_regrev;
         const char *srom_ccode = wlc_cm->srom_ccode;
@@ -822,8 +830,8 @@ static const country_info_t *wlc_countrycode_map(wlc_cm_info_t *wlc_cm,
 
         /* check for currently supported ccode size */
         if (strlen(ccode) > (WLC_CNTRY_BUF_SZ - 1)) {
-                WL_ERROR(("wl%d: %s: ccode \"%s\" too long for match\n",
-                          wlc->pub->unit, __func__, ccode));
+                WL_ERROR("wl%d: %s: ccode \"%s\" too long for match\n",
+                         wlc->pub->unit, __func__, ccode);
                 return NULL;
         }
 
@@ -838,7 +846,7 @@ static const country_info_t *wlc_countrycode_map(wlc_cm_info_t *wlc_cm,
         if (!strcmp(srom_ccode, ccode)) {
                 *mapped_regrev = srom_regrev;
                 mapped = 0;
-                WL_ERROR(("srom_code == ccode %s\n", __func__));
+                WL_ERROR("srom_code == ccode %s\n", __func__);
                 ASSERT(0);
         } else {
                 mapped =
@@ -890,7 +898,7 @@ static const country_info_t *wlc_country_lookup_direct(const char *ccode,
                 }
         }
 
-        WL_ERROR(("%s: Returning NULL\n", __func__));
+        WL_ERROR("%s: Returning NULL\n", __func__);
         ASSERT(0);
         return NULL;
 }
@@ -898,9 +906,9 @@ static const country_info_t *wlc_country_lookup_direct(const char *ccode,
 static int
 wlc_channels_init(wlc_cm_info_t *wlc_cm, const country_info_t *country)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         uint i, j;
-        wlcband_t *band;
+        struct wlcband *band;
         const locale_info_t *li;
         chanvec_t sup_chan;
         const locale_mimo_info_t *li_mimo;
@@ -952,7 +960,7 @@ wlc_channels_init(wlc_cm_info_t *wlc_cm, const country_info_t *country)
  */
 static void wlc_channels_commit(wlc_cm_info_t *wlc_cm)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         uint chan;
         struct txpwr_limits txpwr;
 
@@ -969,7 +977,9 @@ static void wlc_channels_commit(wlc_cm_info_t *wlc_cm)
         if (chan == INVCHANNEL) {
                 /* country/locale with no valid channels, set the radio disable bit */
                 mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
-                WL_ERROR(("wl%d: %s: no valid channel for \"%s\" nbands %d bandlocked %d\n", wlc->pub->unit, __func__, wlc_cm->country_abbrev, NBANDS(wlc), wlc->bandlocked));
+                WL_ERROR("wl%d: %s: no valid channel for \"%s\" nbands %d bandlocked %d\n",
+                         wlc->pub->unit, __func__,
+                         wlc_cm->country_abbrev, NBANDS(wlc), wlc->bandlocked);
         } else
             if (mboolisset(wlc->pub->radio_disabled,
                 WL_RADIO_COUNTRY_DISABLE)) {
@@ -998,12 +1008,12 @@ static void wlc_channels_commit(wlc_cm_info_t *wlc_cm)
 /* reset the quiet channels vector to the union of the restricted and radar channel sets */
 void wlc_quiet_channels_reset(wlc_cm_info_t *wlc_cm)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         uint i, j;
-        wlcband_t *band;
+        struct wlcband *band;
         const chanvec_t *chanvec;
 
-        bzero(&wlc_cm->quiet_channels, sizeof(chanvec_t));
+        memset(&wlc_cm->quiet_channels, 0, sizeof(chanvec_t));
 
         band = wlc->band;
         for (i = 0; i < NBANDS(wlc);
@@ -1036,7 +1046,7 @@ bool wlc_quiet_chanspec(wlc_cm_info_t *wlc_cm, chanspec_t chspec)
  */
 bool wlc_valid_channel20_db(wlc_cm_info_t *wlc_cm, uint val)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
 
         return VALID_CHANNEL20(wlc, val) ||
                 (!wlc->bandlocked
@@ -1054,7 +1064,7 @@ wlc_valid_channel20_in_band(wlc_cm_info_t *wlc_cm, uint bandunit, uint val)
 /* Is the channel valid for the current locale and current band? */
 bool wlc_valid_channel20(wlc_cm_info_t *wlc_cm, uint val)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
 
         return ((val < MAXCHANNEL) &&
                 isset(wlc_cm->bandstate[wlc->band->bandunit].valid_channels.vec,
@@ -1064,7 +1074,7 @@ bool wlc_valid_channel20(wlc_cm_info_t *wlc_cm, uint val)
 /* Is the 40 MHz allowed for the current locale and specified band? */
 bool wlc_valid_40chanspec_in_band(wlc_cm_info_t *wlc_cm, uint bandunit)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
 
         return (((wlc_cm->bandstate[bandunit].
                   locale_flags & (WLC_NO_MIMO | WLC_NO_40MHZ)) == 0)
@@ -1162,7 +1172,7 @@ void
 wlc_channel_set_chanspec(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
                          u8 local_constraint_qdbm)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         struct txpwr_limits txpwr;
 
         wlc_channel_reg_limits(wlc_cm, chanspec, &txpwr);
@@ -1179,7 +1189,7 @@ int
 wlc_channel_set_txpower_limit(wlc_cm_info_t *wlc_cm,
                               u8 local_constraint_qdbm)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         struct txpwr_limits txpwr;
 
         wlc_channel_reg_limits(wlc_cm, wlc->chanspec, &txpwr);
@@ -1299,13 +1309,13 @@ void
 wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
                        txpwr_limits_t *txpwr)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         uint i;
         uint chan;
         int maxpwr;
         int delta;
         const country_info_t *country;
-        wlcband_t *band;
+        struct wlcband *band;
         const locale_info_t *li;
         int conducted_max;
         int conducted_ofdm_max;
@@ -1314,7 +1324,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
         int maxpwr_idx;
         uint j;
 
-        bzero(txpwr, sizeof(txpwr_limits_t));
+        memset(txpwr, 0, sizeof(txpwr_limits_t));
 
         if (!wlc_valid_chanspec_db(wlc_cm, chanspec)) {
                 country = wlc_country_lookup(wlc, wlc->autocountry_default);
@@ -1528,13 +1538,13 @@ static bool wlc_japan_ccode(const char *ccode)
 static bool
 wlc_valid_chanspec_ext(wlc_cm_info_t *wlc_cm, chanspec_t chspec, bool dualband)
 {
-        wlc_info_t *wlc = wlc_cm->wlc;
+        struct wlc_info *wlc = wlc_cm->wlc;
         u8 channel = CHSPEC_CHANNEL(chspec);
 
         /* check the chanspec */
         if (wf_chspec_malformed(chspec)) {
-                WL_ERROR(("wl%d: malformed chanspec 0x%x\n", wlc->pub->unit,
-                          chspec));
+                WL_ERROR("wl%d: malformed chanspec 0x%x\n",
+                         wlc->pub->unit, chspec);
                 ASSERT(0);
                 return false;
         }
diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c
index 7e1bf0e2ecdd..dabd7094cd73 100644
--- a/drivers/staging/brcm80211/sys/wlc_event.c
+++ b/drivers/staging/brcm80211/sys/wlc_event.c
@@ -16,9 +16,13 @@
 
 #include <linux/kernel.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <wlioctl.h>
 #include <wlc_cfg.h>
 #include <wlc_pub.h>
@@ -32,6 +36,7 @@
 #ifdef MSGTRACE
 #include <msgtrace.h>
 #endif
+#include <wl_dbg.h>
 
 /* Local prototypes */
 static void wlc_timer_cb(void *arg);
@@ -42,7 +47,7 @@ struct wlc_eventq {
         wlc_event_t *tail;
         struct wlc_info *wlc;
         void *wl;
-        wlc_pub_t *pub;
+        struct wlc_pub *pub;
         bool tpending;
         bool workpending;
         struct wl_timer *timer;
@@ -53,7 +58,8 @@ struct wlc_eventq {
 /*
  * Export functions
  */
-wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc, void *wl,
+wlc_eventq_t *wlc_eventq_attach(struct wlc_pub *pub, struct wlc_info *wlc,
+                                void *wl,
                                 wlc_eventq_cb_t cb)
 {
         wlc_eventq_t *eq;
@@ -69,8 +75,8 @@ wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc, void *wl,
 
         eq->timer = wl_init_timer(eq->wl, wlc_timer_cb, eq, "eventq");
         if (!eq->timer) {
-                WL_ERROR(("wl%d: wlc_eventq_attach: timer failed\n",
-                          pub->unit));
+                WL_ERROR("wl%d: wlc_eventq_attach: timer failed\n",
+                         pub->unit);
                 kfree(eq);
                 return NULL;
         }
diff --git a/drivers/staging/brcm80211/sys/wlc_event.h b/drivers/staging/brcm80211/sys/wlc_event.h
index e443dae258b7..e75582dcdd93 100644
--- a/drivers/staging/brcm80211/sys/wlc_event.h
+++ b/drivers/staging/brcm80211/sys/wlc_event.h
@@ -21,7 +21,8 @@ typedef struct wlc_eventq wlc_eventq_t;
 
 typedef void (*wlc_eventq_cb_t) (void *arg);
 
-extern wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc,
+extern wlc_eventq_t *wlc_eventq_attach(struct wlc_pub *pub,
+                                       struct wlc_info *wlc,
                                        void *wl, wlc_eventq_cb_t cb);
 extern int wlc_eventq_detach(wlc_eventq_t *eq);
 extern int wlc_eventq_down(wlc_eventq_t *eq);
@@ -38,7 +39,7 @@ extern int wlc_eventq_query_ind(wlc_eventq_t *eq, void *bitvect);
 extern int wlc_eventq_test_ind(wlc_eventq_t *eq, int et);
 extern int wlc_eventq_set_ind(wlc_eventq_t *eq, uint et, bool on);
 extern void wlc_eventq_flush(wlc_eventq_t *eq);
-extern void wlc_assign_event_msg(wlc_info_t *wlc, wl_event_msg_t *msg,
+extern void wlc_assign_event_msg(struct wlc_info *wlc, wl_event_msg_t *msg,
                                  const wlc_event_t *e, u8 *data,
                                  u32 len);
 
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index feaffcc64ec6..1d5d01ac0a9b 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -15,9 +15,10 @@
  */
 #include <linux/kernel.h>
 #include <linux/ctype.h>
+#include <linux/etherdevice.h>
 #include <bcmdefs.h>
+#include <bcmdevs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
@@ -27,7 +28,7 @@
 #include <pcicfg.h>
 #include <bcmsrom.h>
 #include <wlioctl.h>
-#include <epivers.h>
+#include <sbhndpio.h>
 #include <sbhnddma.h>
 #include <hnddma.h>
 #include <hndpmu.h>
@@ -37,6 +38,7 @@
 #include <wlc_key.h>
 #include <wlc_bsscfg.h>
 #include <wlc_channel.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_bmac.h>
 #include <wlc_scb.h>
@@ -47,27 +49,11 @@
 #include <wlc_ampdu.h>
 #include <wlc_event.h>
 #include <wl_export.h>
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#else
 #include "d11ucode_ext.h"
-#endif
-#ifdef WLC_HIGH_ONLY
-#include <bcm_rpc_tp.h>
-#include <bcm_rpc.h>
-#include <bcm_xdr.h>
-#include <wlc_rpc.h>
-#include <wlc_rpctx.h>
-#endif                          /* WLC_HIGH_ONLY */
 #include <wlc_alloc.h>
 #include <net/mac80211.h>
+#include <wl_dbg.h>
 
-#ifdef WLC_HIGH_ONLY
-#undef R_REG
-#undef W_REG
-#define R_REG(osh, r) RPC_READ_REG(osh, r)
-#define W_REG(osh, r, v) RPC_WRITE_REG(osh, r, v)
-#endif
 
 /*
  * buffer length needed for wlc_format_ssid
@@ -107,12 +93,8 @@
 /* To inform the ucode of the last mcast frame posted so that it can clear moredata bit */
 #define BCMCFID(wlc, fid) wlc_bmac_write_shm((wlc)->hw, M_BCMC_FID, (fid))
 
-#ifndef WLC_HIGH_ONLY
-#define WLC_WAR16165(wlc) (BUSTYPE(wlc->pub->sih->bustype) == PCI_BUS && \
+#define WLC_WAR16165(wlc) (wlc->pub->sih->bustype == PCI_BUS && \
                                 (!AP_ENAB(wlc->pub)) && (wlc->war16165))
-#else
-#define WLC_WAR16165(wlc) (false)
-#endif                          /* WLC_HIGH_ONLY */
 
 /* debug/trace */
 uint wl_msg_level =
@@ -135,9 +117,11 @@ uint wl_msg_level =
 
 #define SCAN_IN_PROGRESS(x)     0
 
+#define EPI_VERSION_NUM         0x054b0b00
+
 #ifdef BCMDBG
 /* pointer to most recently allocated wl/wlc */
-static wlc_info_t *wlc_info_dbg = (wlc_info_t *) (NULL);
+static struct wlc_info *wlc_info_dbg = (struct wlc_info *) (NULL);
 #endif
 
 /* IOVar table */
@@ -238,91 +222,91 @@ static const u8 acbitmap2maxprio[] = {
 #define WLC_REPLAY_CNTRS_VALUE  WPA_CAP_16_REPLAY_CNTRS
 
 /* local prototypes */
-extern void wlc_txq_enq(void *ctx, struct scb *scb, void *sdu, uint prec);
-static u16 BCMFASTPATH wlc_d11hdrs_mac80211(wlc_info_t *wlc,
-                                               struct ieee80211_hw *hw, void *p,
+static u16 BCMFASTPATH wlc_d11hdrs_mac80211(struct wlc_info *wlc,
+                                               struct ieee80211_hw *hw,
+                                               struct sk_buff *p,
                                                struct scb *scb, uint frag,
                                                uint nfrags, uint queue,
                                                uint next_frag_len,
                                                wsec_key_t *key,
                                                ratespec_t rspec_override);
-bool wlc_sendpkt_mac80211(wlc_info_t *wlc, void *sdu, struct ieee80211_hw *hw);
-void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend);
-static void wlc_bss_default_init(wlc_info_t *wlc);
-static void wlc_ucode_mac_upd(wlc_info_t *wlc);
-static ratespec_t mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band,
-                                         u32 int_val);
-static void wlc_tx_prec_map_init(wlc_info_t *wlc);
+
+static void wlc_bss_default_init(struct wlc_info *wlc);
+static void wlc_ucode_mac_upd(struct wlc_info *wlc);
+static ratespec_t mac80211_wlc_set_nrate(struct wlc_info *wlc,
+                                         struct wlcband *cur_band, u32 int_val);
+static void wlc_tx_prec_map_init(struct wlc_info *wlc);
 static void wlc_watchdog(void *arg);
 static void wlc_watchdog_by_timer(void *arg);
-static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg);
-static int wlc_iovar_rangecheck(wlc_info_t *wlc, u32 val,
+static int wlc_set_rateset(struct wlc_info *wlc, wlc_rateset_t *rs_arg);
+static int wlc_iovar_rangecheck(struct wlc_info *wlc, u32 val,
                                 const bcm_iovar_t *vi);
-static u8 wlc_local_constraint_qdbm(wlc_info_t *wlc);
+static u8 wlc_local_constraint_qdbm(struct wlc_info *wlc);
 
 /* send and receive */
-static wlc_txq_info_t *wlc_txq_alloc(wlc_info_t *wlc, osl_t *osh);
-static void wlc_txq_free(wlc_info_t *wlc, osl_t *osh, wlc_txq_info_t *qi);
-static void wlc_txflowcontrol_signal(wlc_info_t *wlc, wlc_txq_info_t *qi,
+static wlc_txq_info_t *wlc_txq_alloc(struct wlc_info *wlc,
+                                     struct osl_info *osh);
+static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
+                         wlc_txq_info_t *qi);
+static void wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi,
                                      bool on, int prio);
-static void wlc_txflowcontrol_reset(wlc_info_t *wlc);
-static u16 wlc_compute_airtime(wlc_info_t *wlc, ratespec_t rspec,
+static void wlc_txflowcontrol_reset(struct wlc_info *wlc);
+static u16 wlc_compute_airtime(struct wlc_info *wlc, ratespec_t rspec,
                                   uint length);
 static void wlc_compute_cck_plcp(ratespec_t rate, uint length, u8 *plcp);
 static void wlc_compute_ofdm_plcp(ratespec_t rate, uint length, u8 *plcp);
 static void wlc_compute_mimo_plcp(ratespec_t rate, uint length, u8 *plcp);
-static u16 wlc_compute_frame_dur(wlc_info_t *wlc, ratespec_t rate,
+static u16 wlc_compute_frame_dur(struct wlc_info *wlc, ratespec_t rate,
                                     u8 preamble_type, uint next_frag_len);
-static void wlc_recvctl(wlc_info_t *wlc, osl_t *osh, d11rxhdr_t *rxh,
-                        void *p);
-static uint wlc_calc_frame_len(wlc_info_t *wlc, ratespec_t rate,
+static void wlc_recvctl(struct wlc_info *wlc, struct osl_info *osh,
+                        d11rxhdr_t *rxh, struct sk_buff *p);
+static uint wlc_calc_frame_len(struct wlc_info *wlc, ratespec_t rate,
                                u8 preamble_type, uint dur);
-static uint wlc_calc_ack_time(wlc_info_t *wlc, ratespec_t rate,
+static uint wlc_calc_ack_time(struct wlc_info *wlc, ratespec_t rate,
                               u8 preamble_type);
-static uint wlc_calc_cts_time(wlc_info_t *wlc, ratespec_t rate,
+static uint wlc_calc_cts_time(struct wlc_info *wlc, ratespec_t rate,
                               u8 preamble_type);
 /* interrupt, up/down, band */
-static void wlc_setband(wlc_info_t *wlc, uint bandunit);
-static chanspec_t wlc_init_chanspec(wlc_info_t *wlc);
-static void wlc_bandinit_ordered(wlc_info_t *wlc, chanspec_t chanspec);
-static void wlc_bsinit(wlc_info_t *wlc);
-static int wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM,
+static void wlc_setband(struct wlc_info *wlc, uint bandunit);
+static chanspec_t wlc_init_chanspec(struct wlc_info *wlc);
+static void wlc_bandinit_ordered(struct wlc_info *wlc, chanspec_t chanspec);
+static void wlc_bsinit(struct wlc_info *wlc);
+static int wlc_duty_cycle_set(struct wlc_info *wlc, int duty_cycle, bool isOFDM,
                               bool writeToShm);
-static void wlc_radio_hwdisable_upd(wlc_info_t *wlc);
-static bool wlc_radio_monitor_start(wlc_info_t *wlc);
+static void wlc_radio_hwdisable_upd(struct wlc_info *wlc);
+static bool wlc_radio_monitor_start(struct wlc_info *wlc);
 static void wlc_radio_timer(void *arg);
-static void wlc_radio_enable(wlc_info_t *wlc);
-static void wlc_radio_upd(wlc_info_t *wlc);
+static void wlc_radio_enable(struct wlc_info *wlc);
+static void wlc_radio_upd(struct wlc_info *wlc);
 
 /* scan, association, BSS */
-static uint wlc_calc_ba_time(wlc_info_t *wlc, ratespec_t rate,
+static uint wlc_calc_ba_time(struct wlc_info *wlc, ratespec_t rate,
                              u8 preamble_type);
-static void wlc_update_mimo_band_bwcap(wlc_info_t *wlc, u8 bwcap);
-static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val);
-void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode);
-static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val);
-static void wlc_war16165(wlc_info_t *wlc, bool tx);
+static void wlc_update_mimo_band_bwcap(struct wlc_info *wlc, u8 bwcap);
+static void wlc_ht_update_sgi_rx(struct wlc_info *wlc, int val);
+static void wlc_ht_update_ldpc(struct wlc_info *wlc, s8 val);
+static void wlc_war16165(struct wlc_info *wlc, bool tx);
 
 static void wlc_process_eventq(void *arg);
-static void wlc_wme_retries_write(wlc_info_t *wlc);
-static bool wlc_attach_stf_ant_init(wlc_info_t *wlc);
-static uint wlc_attach_module(wlc_info_t *wlc);
-static void wlc_detach_module(wlc_info_t *wlc);
-static void wlc_timers_deinit(wlc_info_t *wlc);
-static void wlc_down_led_upd(wlc_info_t *wlc);
-static uint wlc_down_del_timer(wlc_info_t *wlc);
-static void wlc_ofdm_rateset_war(wlc_info_t *wlc);
-static int _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len,
+static void wlc_wme_retries_write(struct wlc_info *wlc);
+static bool wlc_attach_stf_ant_init(struct wlc_info *wlc);
+static uint wlc_attach_module(struct wlc_info *wlc);
+static void wlc_detach_module(struct wlc_info *wlc);
+static void wlc_timers_deinit(struct wlc_info *wlc);
+static void wlc_down_led_upd(struct wlc_info *wlc);
+static uint wlc_down_del_timer(struct wlc_info *wlc);
+static void wlc_ofdm_rateset_war(struct wlc_info *wlc);
+static int _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                       struct wlc_if *wlcif);
 
 #if defined(BCMDBG)
-void wlc_get_rcmta(wlc_info_t *wlc, int idx, struct ether_addr *addr)
+void wlc_get_rcmta(struct wlc_info *wlc, int idx, struct ether_addr *addr)
 {
         d11regs_t *regs = wlc->regs;
         u32 v32;
-        osl_t *osh;
+        struct osl_info *osh;
 
-        WL_TRACE(("wl%d: %s\n", WLCWLUNIT(wlc), __func__));
+        WL_TRACE("wl%d: %s\n", WLCWLUNIT(wlc), __func__);
 
         ASSERT(wlc->pub->corerev > 4);
 
@@ -344,14 +328,14 @@ void wlc_get_rcmta(wlc_info_t *wlc, int idx, struct ether_addr *addr)
 #endif                          /* defined(BCMDBG) */
 
 /* keep the chip awake if needed */
-bool wlc_stay_awake(wlc_info_t *wlc)
+bool wlc_stay_awake(struct wlc_info *wlc)
 {
         return true;
 }
 
 /* conditions under which the PM bit should be set in outgoing frames and STAY_AWAKE is meaningful
  */
-bool wlc_ps_allowed(wlc_info_t *wlc)
+bool wlc_ps_allowed(struct wlc_info *wlc)
 {
         int idx;
         wlc_bsscfg_t *cfg;
@@ -378,9 +362,9 @@ bool wlc_ps_allowed(wlc_info_t *wlc)
         return true;
 }
 
-void wlc_reset(wlc_info_t *wlc)
+void wlc_reset(struct wlc_info *wlc)
 {
-        WL_TRACE(("wl%d: wlc_reset\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_reset\n", wlc->pub->unit);
 
         wlc->check_for_unaligned_tbtt = false;
 
@@ -389,34 +373,19 @@ void wlc_reset(wlc_info_t *wlc)
                 wlc_statsupd(wlc);
 
                 /* reset our snapshot of macstat counters */
-                bzero((char *)wlc->core->macstat_snapshot, sizeof(macstat_t));
+                memset((char *)wlc->core->macstat_snapshot, 0,
+                        sizeof(macstat_t));
         }
 
         wlc_bmac_reset(wlc->hw);
         wlc_ampdu_reset(wlc->ampdu);
         wlc->txretried = 0;
 
-#ifdef WLC_HIGH_ONLY
-        /* Need to set a flag(to be cleared asynchronously by BMAC driver with high call)
-         *  in order to prevent wlc_rpctx_txreclaim() from screwing wlc_rpctx_getnexttxp(),
-         *  which could be invoked by already QUEUED high call(s) from BMAC driver before
-         *  wlc_bmac_reset() finishes.
-         * It's not needed before in monolithic driver model because d11core interrupts would
-         *  have been cleared instantly in wlc_bmac_reset() and no txstatus interrupt
-         *  will come to driver to fetch those flushed dma pkt pointers.
-         */
-        wlc->reset_bmac_pending = true;
-
-        wlc_rpctx_txreclaim(wlc->rpctx);
-
-        wlc_stf_phy_txant_upd(wlc);
-        wlc_phy_ant_rxdiv_set(wlc->band->pi, wlc->stf->ant_rx_ovr);
-#endif
 }
 
-void wlc_fatal_error(wlc_info_t *wlc)
+void wlc_fatal_error(struct wlc_info *wlc)
 {
-        WL_ERROR(("wl%d: fatal error, reinitializing\n", wlc->pub->unit));
+        WL_ERROR("wl%d: fatal error, reinitializing\n", wlc->pub->unit);
         wl_init(wlc->wl);
 }
 
@@ -425,7 +394,7 @@ void wlc_fatal_error(wlc_info_t *wlc)
  * if other configurations are in conflict (bandlocked, 11n mode disabled,
  * invalid channel for current country, etc.)
  */
-static chanspec_t wlc_init_chanspec(wlc_info_t *wlc)
+static chanspec_t wlc_init_chanspec(struct wlc_info *wlc)
 {
         chanspec_t chanspec =
             1 | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE |
@@ -441,7 +410,7 @@ static chanspec_t wlc_init_chanspec(wlc_info_t *wlc)
 
 struct scb global_scb;
 
-static void wlc_init_scb(wlc_info_t *wlc, struct scb *scb)
+static void wlc_init_scb(struct wlc_info *wlc, struct scb *scb)
 {
         int i;
         scb->flags = SCB_WMECAP | SCB_HTCAP;
@@ -449,7 +418,7 @@ static void wlc_init_scb(wlc_info_t *wlc, struct scb *scb)
                 scb->seqnum[i] = 0;
 }
 
-void wlc_init(wlc_info_t *wlc)
+void wlc_init(struct wlc_info *wlc)
 {
         d11regs_t *regs;
         chanspec_t chanspec;
@@ -457,7 +426,7 @@ void wlc_init(wlc_info_t *wlc)
         wlc_bsscfg_t *bsscfg;
         bool mute = false;
 
-        WL_TRACE(("wl%d: wlc_init\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_init\n", wlc->pub->unit);
 
         regs = wlc->regs;
 
@@ -583,13 +552,13 @@ void wlc_init(wlc_info_t *wlc)
         }
 }
 
-void wlc_mac_bcn_promisc_change(wlc_info_t *wlc, bool promisc)
+void wlc_mac_bcn_promisc_change(struct wlc_info *wlc, bool promisc)
 {
         wlc->bcnmisc_monitor = promisc;
         wlc_mac_bcn_promisc(wlc);
 }
 
-void wlc_mac_bcn_promisc(wlc_info_t *wlc)
+void wlc_mac_bcn_promisc(struct wlc_info *wlc)
 {
         if ((AP_ENAB(wlc->pub) && (N_ENAB(wlc->pub) || wlc->band->gmode)) ||
             wlc->bcnmisc_ibss || wlc->bcnmisc_scan || wlc->bcnmisc_monitor)
@@ -599,7 +568,7 @@ void wlc_mac_bcn_promisc(wlc_info_t *wlc)
 }
 
 /* set or clear maccontrol bits MCTL_PROMISC and MCTL_KEEPCONTROL */
-void wlc_mac_promisc(wlc_info_t *wlc)
+void wlc_mac_promisc(struct wlc_info *wlc)
 {
         u32 promisc_bits = 0;
 
@@ -621,7 +590,7 @@ void wlc_mac_promisc(wlc_info_t *wlc)
 }
 
 /* check if hps and wake states of sw and hw are in sync */
-bool wlc_ps_check(wlc_info_t *wlc)
+bool wlc_ps_check(struct wlc_info *wlc)
 {
         bool res = true;
         bool hps, wake;
@@ -636,8 +605,8 @@ bool wlc_ps_check(wlc_info_t *wlc)
                  * to avoid assert
                  */
                 if (tmp == 0xffffffff) {
-                        WL_ERROR(("wl%d: %s: dead chip\n", wlc->pub->unit,
-                                  __func__));
+                        WL_ERROR("wl%d: %s: dead chip\n",
+                                 wlc->pub->unit, __func__);
                         return DEVICEREMOVED(wlc);
                 }
 
@@ -646,7 +615,8 @@ bool wlc_ps_check(wlc_info_t *wlc)
                 if (hps != ((tmp & MCTL_HPS) != 0)) {
                         int idx;
                         wlc_bsscfg_t *cfg;
-                        WL_ERROR(("wl%d: hps not sync, sw %d, maccontrol 0x%x\n", wlc->pub->unit, hps, tmp));
+                        WL_ERROR("wl%d: hps not sync, sw %d, maccontrol 0x%x\n",
+                                 wlc->pub->unit, hps, tmp);
                         FOREACH_BSS(wlc, idx, cfg) {
                                 if (!BSSCFG_STA(cfg))
                                         continue;
@@ -654,23 +624,14 @@ bool wlc_ps_check(wlc_info_t *wlc)
 
                         res = false;
                 }
-#ifdef WLC_LOW
                 /* For a monolithic build the wake check can be exact since it looks at wake
                  * override bits. The MCTL_WAKE bit should match the 'wake' value.
                  */
                 wake = STAY_AWAKE(wlc) || wlc->hw->wake_override;
                 wake_ok = (wake == ((tmp & MCTL_WAKE) != 0));
-#else
-                /* For a split build we will not have access to any wake overrides from the low
-                 * level. The check can only make sure the MCTL_WAKE bit is on if the high
-                 * level 'wake' value is true. If the high level 'wake' is false, the MCTL_WAKE
-                 * may be either true or false due to the low level override.
-                 */
-                wake = STAY_AWAKE(wlc);
-                wake_ok = (wake && ((tmp & MCTL_WAKE) != 0)) || !wake;
-#endif
                 if (hps && !wake_ok) {
-                        WL_ERROR(("wl%d: wake not sync, sw %d maccontrol 0x%x\n", wlc->pub->unit, wake, tmp));
+                        WL_ERROR("wl%d: wake not sync, sw %d maccontrol 0x%x\n",
+                                 wlc->pub->unit, wake, tmp);
                         res = false;
                 }
         }
@@ -679,7 +640,7 @@ bool wlc_ps_check(wlc_info_t *wlc)
 }
 
 /* push sw hps and wake state through hardware */
-void wlc_set_ps_ctrl(wlc_info_t *wlc)
+void wlc_set_ps_ctrl(struct wlc_info *wlc)
 {
         u32 v1, v2;
         bool hps, wake;
@@ -688,8 +649,8 @@ void wlc_set_ps_ctrl(wlc_info_t *wlc)
         hps = PS_ALLOWED(wlc);
         wake = hps ? (STAY_AWAKE(wlc)) : true;
 
-        WL_TRACE(("wl%d: wlc_set_ps_ctrl: hps %d wake %d\n", wlc->pub->unit,
-                  hps, wake));
+        WL_TRACE("wl%d: wlc_set_ps_ctrl: hps %d wake %d\n",
+                 wlc->pub->unit, hps, wake);
 
         v1 = R_REG(wlc->osh, &wlc->regs->maccontrol);
         v2 = 0;
@@ -714,7 +675,7 @@ void wlc_set_ps_ctrl(wlc_info_t *wlc)
 int wlc_set_mac(wlc_bsscfg_t *cfg)
 {
         int err = 0;
-        wlc_info_t *wlc = cfg->wlc;
+        struct wlc_info *wlc = cfg->wlc;
 
         if (cfg == wlc->cfg) {
                 /* enter the MAC addr into the RXE match registers */
@@ -731,7 +692,7 @@ int wlc_set_mac(wlc_bsscfg_t *cfg)
  */
 void wlc_set_bssid(wlc_bsscfg_t *cfg)
 {
-        wlc_info_t *wlc = cfg->wlc;
+        struct wlc_info *wlc = cfg->wlc;
 
         /* if primary config, we need to update BSSID in RXE match registers */
         if (cfg == wlc->cfg) {
@@ -748,7 +709,7 @@ void wlc_set_bssid(wlc_bsscfg_t *cfg)
  * Suspend the the MAC and update the slot timing
  * for standard 11b/g (20us slots) or shortslot 11g (9us slots).
  */
-void wlc_switch_shortslot(wlc_info_t *wlc, bool shortslot)
+void wlc_switch_shortslot(struct wlc_info *wlc, bool shortslot)
 {
         int idx;
         wlc_bsscfg_t *cfg;
@@ -776,7 +737,7 @@ void wlc_switch_shortslot(wlc_info_t *wlc, bool shortslot)
         wlc_bmac_set_shortslot(wlc->hw, shortslot);
 }
 
-static u8 wlc_local_constraint_qdbm(wlc_info_t *wlc)
+static u8 wlc_local_constraint_qdbm(struct wlc_info *wlc)
 {
         u8 local;
         s16 local_max;
@@ -803,7 +764,7 @@ static u8 wlc_local_constraint_qdbm(wlc_info_t *wlc)
 }
 
 /* propagate home chanspec to all bsscfgs in case bsscfg->current_bss->chanspec is referenced */
-void wlc_set_home_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
+void wlc_set_home_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
 {
         if (wlc->home_chanspec != chanspec) {
                 int idx;
@@ -821,7 +782,7 @@ void wlc_set_home_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
         }
 }
 
-static void wlc_set_phy_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
+static void wlc_set_phy_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
 {
         /* Save our copy of the chanspec */
         wlc->chanspec = chanspec;
@@ -840,15 +801,15 @@ static void wlc_set_phy_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
 
 }
 
-void wlc_set_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
+void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
 {
         uint bandunit;
         bool switchband = false;
         chanspec_t old_chanspec = wlc->chanspec;
 
         if (!wlc_valid_chanspec_db(wlc->cmi, chanspec)) {
-                WL_ERROR(("wl%d: %s: Bad channel %d\n",
-                          wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec)));
+                WL_ERROR("wl%d: %s: Bad channel %d\n",
+                         wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec));
                 ASSERT(wlc_valid_chanspec_db(wlc->cmi, chanspec));
                 return;
         }
@@ -859,7 +820,9 @@ void wlc_set_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
                 if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {
                         switchband = true;
                         if (wlc->bandlocked) {
-                                WL_ERROR(("wl%d: %s: chspec %d band is locked!\n", wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec)));
+                                WL_ERROR("wl%d: %s: chspec %d band is locked!\n",
+                                         wlc->pub->unit, __func__,
+                                         CHSPEC_CHANNEL(chanspec));
                                 return;
                         }
                         /* BMAC_NOTE: should the setband call come after the wlc_bmac_chanspec() ?
@@ -895,7 +858,7 @@ void wlc_set_chanspec(wlc_info_t *wlc, chanspec_t chanspec)
 }
 
 #if defined(BCMDBG)
-static int wlc_get_current_txpwr(wlc_info_t *wlc, void *pwr, uint len)
+static int wlc_get_current_txpwr(struct wlc_info *wlc, void *pwr, uint len)
 {
         txpwr_limits_t txpwr;
         tx_power_t power;
@@ -909,7 +872,7 @@ static int wlc_get_current_txpwr(wlc_info_t *wlc, void *pwr, uint len)
         else if (len < sizeof(tx_power_t))
                 return BCME_BUFTOOSHORT;
 
-        bzero(&power, sizeof(tx_power_t));
+        memset(&power, 0, sizeof(tx_power_t));
 
         power.chanspec = WLC_BAND_PI_RADIO_CHANSPEC;
         if (wlc->pub->associated)
@@ -1031,7 +994,7 @@ static int wlc_get_current_txpwr(wlc_info_t *wlc, void *pwr, uint len)
         } else {
                 int band_idx = CHSPEC_IS2G(power.chanspec) ? 0 : 1;
 
-                bzero(old_power, sizeof(tx_power_legacy_t));
+                memset(old_power, 0, sizeof(tx_power_legacy_t));
 
                 old_power->txpwr_local_max = power.local_max;
                 old_power->txpwr_local_constraint = power.local_constraint;
@@ -1064,7 +1027,7 @@ static int wlc_get_current_txpwr(wlc_info_t *wlc, void *pwr, uint len)
 }
 #endif                          /* defined(BCMDBG) */
 
-static u32 wlc_watchdog_backup_bi(wlc_info_t *wlc)
+static u32 wlc_watchdog_backup_bi(struct wlc_info *wlc)
 {
         u32 bi;
         bi = 2 * wlc->cfg->current_bss->dtim_period *
@@ -1083,7 +1046,7 @@ static u32 wlc_watchdog_backup_bi(wlc_info_t *wlc)
 /* Change to run the watchdog either from a periodic timer or from tbtt handler.
  * Call watchdog from tbtt handler if tbtt is true, watchdog timer otherwise.
  */
-void wlc_watchdog_upd(wlc_info_t *wlc, bool tbtt)
+void wlc_watchdog_upd(struct wlc_info *wlc, bool tbtt)
 {
         /* make sure changing watchdog driver is allowed */
         if (!wlc->pub->up || !wlc->pub->align_wd_tbtt)
@@ -1112,7 +1075,7 @@ void wlc_watchdog_upd(wlc_info_t *wlc, bool tbtt)
         }
 }
 
-ratespec_t wlc_lowest_basic_rspec(wlc_info_t *wlc, wlc_rateset_t *rs)
+ratespec_t wlc_lowest_basic_rspec(struct wlc_info *wlc, wlc_rateset_t *rs)
 {
         ratespec_t lowest_basic_rspec;
         uint i;
@@ -1140,7 +1103,7 @@ ratespec_t wlc_lowest_basic_rspec(wlc_info_t *wlc, wlc_rateset_t *rs)
  *  ratespec     CCK            ant = wlc->stf->txant
  *              OFDM            ant = 3
  */
-void wlc_beacon_phytxctl_txant_upd(wlc_info_t *wlc, ratespec_t bcn_rspec)
+void wlc_beacon_phytxctl_txant_upd(struct wlc_info *wlc, ratespec_t bcn_rspec)
 {
         u16 phyctl;
         u16 phytxant = wlc->stf->phytxant;
@@ -1159,9 +1122,9 @@ void wlc_beacon_phytxctl_txant_upd(wlc_info_t *wlc, ratespec_t bcn_rspec)
 /* centralized protection config change function to simplify debugging, no consistency checking
  * this should be called only on changes to avoid overhead in periodic function
 */
-void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val)
+void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val)
 {
-        WL_TRACE(("wlc_protection_upd: idx %d, val %d\n", idx, val));
+        WL_TRACE("wlc_protection_upd: idx %d, val %d\n", idx, val);
 
         switch (idx) {
         case WLC_PROT_G_SPEC:
@@ -1205,7 +1168,7 @@ void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val)
 
 }
 
-static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val)
+static void wlc_ht_update_sgi_rx(struct wlc_info *wlc, int val)
 {
         wlc->ht_cap.cap &= ~(HT_CAP_SHORT_GI_20 | HT_CAP_SHORT_GI_40);
         wlc->ht_cap.cap |= (val & WLC_N_SGI_20) ? HT_CAP_SHORT_GI_20 : 0;
@@ -1217,7 +1180,7 @@ static void wlc_ht_update_sgi_rx(wlc_info_t *wlc, int val)
         }
 }
 
-static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val)
+static void wlc_ht_update_ldpc(struct wlc_info *wlc, s8 val)
 {
         wlc->stf->ldpc = val;
 
@@ -1236,7 +1199,7 @@ static void wlc_ht_update_ldpc(wlc_info_t *wlc, s8 val)
  * ucode, hwmac update
  *    Channel dependent updates for ucode and hw
  */
-static void wlc_ucode_mac_upd(wlc_info_t *wlc)
+static void wlc_ucode_mac_upd(struct wlc_info *wlc)
 {
         /* enable or disable any active IBSSs depending on whether or not
          * we are on the home channel
@@ -1263,13 +1226,13 @@ static void wlc_ucode_mac_upd(wlc_info_t *wlc)
         wlc_mac_promisc(wlc);
 }
 
-static void wlc_bandinit_ordered(wlc_info_t *wlc, chanspec_t chanspec)
+static void wlc_bandinit_ordered(struct wlc_info *wlc, chanspec_t chanspec)
 {
         wlc_rateset_t default_rateset;
         uint parkband;
         uint i, band_order[2];
 
-        WL_TRACE(("wl%d: wlc_bandinit_ordered\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_bandinit_ordered\n", wlc->pub->unit);
         /*
          * We might have been bandlocked during down and the chip power-cycled (hibernate).
          * figure out the right band to park on
@@ -1310,10 +1273,10 @@ static void wlc_bandinit_ordered(wlc_info_t *wlc, chanspec_t chanspec)
 }
 
 /* band-specific init */
-static void WLBANDINITFN(wlc_bsinit) (wlc_info_t *wlc)
+static void WLBANDINITFN(wlc_bsinit) (struct wlc_info *wlc)
 {
-        WL_TRACE(("wl%d: wlc_bsinit: bandunit %d\n", wlc->pub->unit,
-                  wlc->band->bandunit));
+        WL_TRACE("wl%d: wlc_bsinit: bandunit %d\n",
+                 wlc->pub->unit, wlc->band->bandunit);
 
         /* write ucode ACK/CTS rate table */
         wlc_set_ratetable(wlc);
@@ -1328,7 +1291,7 @@ static void WLBANDINITFN(wlc_bsinit) (wlc_info_t *wlc)
 }
 
 /* switch to and initialize new band */
-static void WLBANDINITFN(wlc_setband) (wlc_info_t *wlc, uint bandunit)
+static void WLBANDINITFN(wlc_setband) (struct wlc_info *wlc, uint bandunit)
 {
         int idx;
         wlc_bsscfg_t *cfg;
@@ -1353,7 +1316,7 @@ static void WLBANDINITFN(wlc_setband) (wlc_info_t *wlc, uint bandunit)
 }
 
 /* Initialize a WME Parameter Info Element with default STA parameters from WMM Spec, Table 12 */
-void wlc_wme_initparams_sta(wlc_info_t *wlc, wme_param_ie_t *pe)
+void wlc_wme_initparams_sta(struct wlc_info *wlc, wme_param_ie_t *pe)
 {
         static const wme_param_ie_t stadef = {
                 WME_OUI,
@@ -1378,7 +1341,7 @@ void wlc_wme_initparams_sta(wlc_info_t *wlc, wme_param_ie_t *pe)
         memcpy(pe, &stadef, sizeof(*pe));
 }
 
-void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend)
+void wlc_wme_setparams(struct wlc_info *wlc, u16 aci, void *arg, bool suspend)
 {
         int i;
         shm_acparams_t acp_shm;
@@ -1389,7 +1352,7 @@ void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend)
 
         /* Only apply params if the core is out of reset and has clocks */
         if (!wlc->clk) {
-                WL_ERROR(("wl%d: %s : no-clock\n", wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s : no-clock\n", wlc->pub->unit, __func__);
                 return;
         }
 
@@ -1402,7 +1365,7 @@ void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend)
         wlc->wme_admctl = 0;
 
         do {
-                bzero((char *)&acp_shm, sizeof(shm_acparams_t));
+                memset((char *)&acp_shm, 0, sizeof(shm_acparams_t));
                 /* find out which ac this set of params applies to */
                 ASSERT(aci < AC_COUNT);
                 /* set the admission control policy for this AC */
@@ -1421,8 +1384,8 @@ void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend)
 
                 if (acp_shm.aifs < EDCF_AIFSN_MIN
                     || acp_shm.aifs > EDCF_AIFSN_MAX) {
-                        WL_ERROR(("wl%d: wlc_edcf_setparams: bad aifs %d\n",
-                                  wlc->pub->unit, acp_shm.aifs));
+                        WL_ERROR("wl%d: wlc_edcf_setparams: bad aifs %d\n",
+                                 wlc->pub->unit, acp_shm.aifs);
                         continue;
                 }
 
@@ -1459,7 +1422,7 @@ void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg, bool suspend)
 
 void wlc_edcf_setparams(wlc_bsscfg_t *cfg, bool suspend)
 {
-        wlc_info_t *wlc = cfg->wlc;
+        struct wlc_info *wlc = cfg->wlc;
         uint aci, i, j;
         edcf_acparam_t *edcf_acp;
         shm_acparams_t acp_shm;
@@ -1483,7 +1446,7 @@ void wlc_edcf_setparams(wlc_bsscfg_t *cfg, bool suspend)
         wlc->wme_admctl = 0;
 
         for (i = 0; i < AC_COUNT; i++, edcf_acp++) {
-                bzero((char *)&acp_shm, sizeof(shm_acparams_t));
+                memset((char *)&acp_shm, 0, sizeof(shm_acparams_t));
                 /* find out which ac this set of params applies to */
                 aci = (edcf_acp->ACI & EDCF_ACI_MASK) >> EDCF_ACI_SHIFT;
                 ASSERT(aci < AC_COUNT);
@@ -1505,8 +1468,8 @@ void wlc_edcf_setparams(wlc_bsscfg_t *cfg, bool suspend)
 
                 if (acp_shm.aifs < EDCF_AIFSN_MIN
                     || acp_shm.aifs > EDCF_AIFSN_MAX) {
-                        WL_ERROR(("wl%d: wlc_edcf_setparams: bad aifs %d\n",
-                                  wlc->pub->unit, acp_shm.aifs));
+                        WL_ERROR("wl%d: wlc_edcf_setparams: bad aifs %d\n",
+                                 wlc->pub->unit, acp_shm.aifs);
                         continue;
                 }
 
@@ -1548,20 +1511,19 @@ void wlc_edcf_setparams(wlc_bsscfg_t *cfg, bool suspend)
 
 }
 
-bool wlc_timers_init(wlc_info_t *wlc, int unit)
+bool wlc_timers_init(struct wlc_info *wlc, int unit)
 {
         wlc->wdtimer = wl_init_timer(wlc->wl, wlc_watchdog_by_timer,
                 wlc, "watchdog");
         if (!wlc->wdtimer) {
-                WL_ERROR(("wl%d:  wl_init_timer for wdtimer failed\n", unit));
+                WL_ERROR("wl%d:  wl_init_timer for wdtimer failed\n", unit);
                 goto fail;
         }
 
         wlc->radio_timer = wl_init_timer(wlc->wl, wlc_radio_timer,
                 wlc, "radio");
         if (!wlc->radio_timer) {
-                WL_ERROR(("wl%d:  wl_init_timer for radio_timer failed\n",
-                          unit));
+                WL_ERROR("wl%d:  wl_init_timer for radio_timer failed\n", unit);
                 goto fail;
         }
 
@@ -1575,7 +1537,7 @@ bool wlc_timers_init(wlc_info_t *wlc, int unit)
  * Initialize wlc_info default values ...
  * may get overrides later in this function
  */
-void wlc_info_init(wlc_info_t *wlc, int unit)
+void wlc_info_init(struct wlc_info *wlc, int unit)
 {
         int i;
         /* Assume the device is there until proven otherwise */
@@ -1686,7 +1648,7 @@ void wlc_info_init(wlc_info_t *wlc, int unit)
         wlc->pr80838_war = true;
 }
 
-static bool wlc_state_bmac_sync(wlc_info_t *wlc)
+static bool wlc_state_bmac_sync(struct wlc_info *wlc)
 {
         wlc_bmac_state_t state_bmac;
 
@@ -1700,7 +1662,7 @@ static bool wlc_state_bmac_sync(wlc_info_t *wlc)
         return true;
 }
 
-static uint wlc_attach_module(wlc_info_t *wlc)
+static uint wlc_attach_module(struct wlc_info *wlc)
 {
         uint err = 0;
         uint unit;
@@ -1708,15 +1670,14 @@ static uint wlc_attach_module(wlc_info_t *wlc)
 
         wlc->asi = wlc_antsel_attach(wlc, wlc->osh, wlc->pub, wlc->hw);
         if (wlc->asi == NULL) {
-                WL_ERROR(("wl%d: wlc_attach: wlc_antsel_attach failed\n",
-                          unit));
+                WL_ERROR("wl%d: wlc_attach: wlc_antsel_attach failed\n", unit);
                 err = 44;
                 goto fail;
         }
 
         wlc->ampdu = wlc_ampdu_attach(wlc);
         if (wlc->ampdu == NULL) {
-                WL_ERROR(("wl%d: wlc_attach: wlc_ampdu_attach failed\n", unit));
+                WL_ERROR("wl%d: wlc_attach: wlc_ampdu_attach failed\n", unit);
                 err = 50;
                 goto fail;
         }
@@ -1725,13 +1686,13 @@ static uint wlc_attach_module(wlc_info_t *wlc)
         wlc->eventq =
             wlc_eventq_attach(wlc->pub, wlc, wlc->wl, wlc_process_eventq);
         if (wlc->eventq == NULL) {
-                WL_ERROR(("wl%d: wlc_attach: wlc_eventq_attachfailed\n", unit));
+                WL_ERROR("wl%d: wlc_attach: wlc_eventq_attachfailed\n", unit);
                 err = 57;
                 goto fail;
         }
 
         if ((wlc_stf_attach(wlc) != 0)) {
-                WL_ERROR(("wl%d: wlc_attach: wlc_stf_attach failed\n", unit));
+                WL_ERROR("wl%d: wlc_attach: wlc_stf_attach failed\n", unit);
                 err = 68;
                 goto fail;
         }
@@ -1739,9 +1700,9 @@ static uint wlc_attach_module(wlc_info_t *wlc)
         return err;
 }
 
-wlc_pub_t *wlc_pub(void *wlc)
+struct wlc_pub *wlc_pub(void *wlc)
 {
-        return ((wlc_info_t *) wlc)->pub;
+        return ((struct wlc_info *) wlc)->pub;
 }
 
 #define CHIP_SUPPORTS_11N(wlc)  1
@@ -1750,25 +1711,25 @@ wlc_pub_t *wlc_pub(void *wlc)
  * The common driver entry routine. Error codes should be unique
  */
 void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
-                 osl_t *osh, void *regsva, uint bustype, void *btparam,
-                 uint *perr)
+                 struct osl_info *osh, void *regsva, uint bustype,
+                 void *btparam, uint *perr)
 {
-        wlc_info_t *wlc;
+        struct wlc_info *wlc;
         uint err = 0;
         uint j;
-        wlc_pub_t *pub;
+        struct wlc_pub *pub;
         wlc_txq_info_t *qi;
         uint n_disabled;
 
-        WL_NONE(("wl%d: %s: vendor 0x%x device 0x%x\n", unit, __func__, vendor,
-                 device));
+        WL_NONE("wl%d: %s: vendor 0x%x device 0x%x\n",
+                unit, __func__, vendor, device);
 
         ASSERT(WSEC_MAX_RCMTA_KEYS <= WSEC_MAX_KEYS);
         ASSERT(WSEC_MAX_DEFAULT_KEYS == WLC_DEFAULT_KEYS);
 
         /* some code depends on packed structures */
-        ASSERT(sizeof(struct ether_addr) == ETHER_ADDR_LEN);
-        ASSERT(sizeof(struct ether_header) == ETHER_HDR_LEN);
+        ASSERT(sizeof(struct ether_addr) == ETH_ALEN);
+        ASSERT(sizeof(struct ether_header) == ETH_HLEN);
         ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE);
         ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN);
         ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN);
@@ -1780,8 +1741,10 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN);
         ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);
         ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN);
+#ifdef BRCM_FULLMAC
         ASSERT(offsetof(wl_scan_params_t, channel_list) ==
                WL_SCAN_PARAMS_FIXED_SIZE);
+#endif
         ASSERT(IS_ALIGNED(offsetof(wsec_key_t, data), sizeof(u32)));
         ASSERT(ISPOWEROF2(MA_WINDOW_SZ));
 
@@ -1797,8 +1760,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
                || (WPA_CAP_4_REPLAY_CNTRS == WLC_REPLAY_CNTRS_VALUE
                    && 4 == WLC_NUMRXIVS));
 
-        /* allocate wlc_info_t state and its substructures */
-        wlc = (wlc_info_t *) wlc_attach_malloc(osh, unit, &err, device);
+        /* allocate struct wlc_info state and its substructures */
+        wlc = (struct wlc_info *) wlc_attach_malloc(osh, unit, &err, device);
         if (wlc == NULL)
                 goto fail;
         wlc->osh = osh;
@@ -1819,7 +1782,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         /* By default restrict TKIP associations from 11n STA's */
         wlc->ht_wsec_restriction = WLC_HT_TKIP_RESTRICT;
 
-        /* populate wlc_info_t with default values  */
+        /* populate struct wlc_info with default values  */
         wlc_info_init(wlc, unit);
 
         /* update sta/ap related parameters */
@@ -1851,10 +1814,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         /* propagate *vars* from BMAC driver to high driver */
         wlc_bmac_copyfrom_vars(wlc->hw, &pub->vars, &wlc->vars_size);
 
-#ifdef WLC_HIGH_ONLY
-        WL_TRACE(("nvram : vars %p , vars_size %d\n", pub->vars,
-                  wlc->vars_size));
-#endif
 
         /* set maximum allowed duty cycle */
         wlc->tx_duty_cycle_ofdm =
@@ -1872,19 +1831,17 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         wlc_phy_stf_chain_init(wlc->band->pi, wlc->stf->hw_txchain,
                                wlc->stf->hw_rxchain);
 
-#ifdef WLC_LOW
         /* pull up some info resulting from the low attach */
         {
                 int i;
                 for (i = 0; i < NFIFO; i++)
                         wlc->core->txavail[i] = wlc->hw->txavail[i];
         }
-#endif                          /* WLC_LOW */
 
         wlc_bmac_hw_etheraddr(wlc->hw, &wlc->perm_etheraddr);
 
         bcopy((char *)&wlc->perm_etheraddr, (char *)&pub->cur_etheraddr,
-              ETHER_ADDR_LEN);
+              ETH_ALEN);
 
         for (j = 0; j < NBANDS(wlc); j++) {
                 /* Use band 1 for single band 11a */
@@ -1942,7 +1899,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
                 goto fail;
 
         if (!wlc_timers_init(wlc, unit)) {
-                WL_ERROR(("wl%d: %s: wlc_init_timer failed\n", unit, __func__));
+                WL_ERROR("wl%d: %s: wlc_init_timer failed\n", unit, __func__);
                 err = 32;
                 goto fail;
         }
@@ -1950,8 +1907,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         /* depend on rateset, gmode */
         wlc->cmi = wlc_channel_mgr_attach(wlc);
         if (!wlc->cmi) {
-                WL_ERROR(("wl%d: %s: wlc_channel_mgr_attach failed\n", unit,
-                          __func__));
+                WL_ERROR("wl%d: %s: wlc_channel_mgr_attach failed\n",
+                         unit, __func__);
                 err = 33;
                 goto fail;
         }
@@ -1966,8 +1923,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         /* allocate our initial queue */
         qi = wlc_txq_alloc(wlc, osh);
         if (qi == NULL) {
-                WL_ERROR(("wl%d: %s: failed to malloc tx queue\n", unit,
-                          __func__));
+                WL_ERROR("wl%d: %s: failed to malloc tx queue\n",
+                         unit, __func__);
                 err = 100;
                 goto fail;
         }
@@ -2037,7 +1994,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         wlc_radio_mpc_upd(wlc);
 
         if (WLANTSEL_ENAB(wlc)) {
-                if ((CHIPID(wlc->pub->sih->chip)) == BCM43235_CHIP_ID) {
+                if ((wlc->pub->sih->chip) == BCM43235_CHIP_ID) {
                         if ((getintvar(wlc->pub->vars, "aa2g") == 7) ||
                             (getintvar(wlc->pub->vars, "aa5g") == 7)) {
                                 wlc_bmac_antsel_set(wlc->hw, 1);
@@ -2053,7 +2010,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         return (void *)wlc;
 
  fail:
-        WL_ERROR(("wl%d: %s: failed with err %d\n", unit, __func__, err));
+        WL_ERROR("wl%d: %s: failed with err %d\n", unit, __func__, err);
         if (wlc)
                 wlc_detach(wlc);
 
@@ -2062,7 +2019,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         return NULL;
 }
 
-static void wlc_attach_antgain_init(wlc_info_t *wlc)
+static void wlc_attach_antgain_init(struct wlc_info *wlc)
 {
         uint unit;
         unit = wlc->pub->unit;
@@ -2071,7 +2028,8 @@ static void wlc_attach_antgain_init(wlc_info_t *wlc)
                 /* default antenna gain for srom rev 1 is 2 dBm (8 qdbm) */
                 wlc->band->antgain = 8;
         } else if (wlc->band->antgain == -1) {
-                WL_ERROR(("wl%d: %s: Invalid antennas available in srom, using 2dB\n", unit, __func__));
+                WL_ERROR("wl%d: %s: Invalid antennas available in srom, using 2dB\n",
+                         unit, __func__);
                 wlc->band->antgain = 8;
         } else {
                 s8 gain, fract;
@@ -2093,7 +2051,7 @@ static void wlc_attach_antgain_init(wlc_info_t *wlc)
         }
 }
 
-static bool wlc_attach_stf_ant_init(wlc_info_t *wlc)
+static bool wlc_attach_stf_ant_init(struct wlc_info *wlc)
 {
         int aa;
         uint unit;
@@ -2110,7 +2068,8 @@ static bool wlc_attach_stf_ant_init(wlc_info_t *wlc)
                 aa = (s8) getintvar(vars,
                                       (BAND_5G(bandtype) ? "aa1" : "aa0"));
         if ((aa < 1) || (aa > 15)) {
-                WL_ERROR(("wl%d: %s: Invalid antennas available in srom (0x%x), using 3.\n", unit, __func__, aa));
+                WL_ERROR("wl%d: %s: Invalid antennas available in srom (0x%x), using 3\n",
+                         unit, __func__, aa);
                 aa = 3;
         }
 
@@ -2132,136 +2091,8 @@ static bool wlc_attach_stf_ant_init(wlc_info_t *wlc)
         return true;
 }
 
-#ifdef WLC_HIGH_ONLY
-/* HIGH_ONLY bmac_attach, which sync over LOW_ONLY bmac_attach states */
-int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
-                    bool piomode, osl_t *osh, void *regsva, uint bustype,
-                    void *btparam)
-{
-        wlc_bmac_revinfo_t revinfo;
-        uint idx = 0;
-        rpc_info_t *rpc = (rpc_info_t *) btparam;
 
-        ASSERT(bustype == RPC_BUS);
-
-        /* install the rpc handle in the various state structures used by stub RPC functions */
-        wlc->rpc = rpc;
-        wlc->hw->rpc = rpc;
-        wlc->hw->osh = osh;
-
-        wlc->regs = 0;
-
-        wlc->rpctx = wlc_rpctx_attach(wlc->pub, wlc);
-        if (wlc->rpctx == NULL)
-                return -1;
-
-        /*
-         * FIFO 0
-         * TX: TX_AC_BK_FIFO (TX AC Background data packets)
-         */
-        /* Always initialized */
-        ASSERT(NRPCTXBUFPOST <= NTXD);
-        wlc_rpctx_fifoinit(wlc->rpctx, TX_DATA_FIFO, NRPCTXBUFPOST);
-        wlc_rpctx_fifoinit(wlc->rpctx, TX_CTL_FIFO, NRPCTXBUFPOST);
-        wlc_rpctx_fifoinit(wlc->rpctx, TX_BCMC_FIFO, NRPCTXBUFPOST);
-
-        /* VI and BK inited only if WME */
-        if (WME_ENAB(wlc->pub)) {
-                wlc_rpctx_fifoinit(wlc->rpctx, TX_AC_BK_FIFO, NRPCTXBUFPOST);
-                wlc_rpctx_fifoinit(wlc->rpctx, TX_AC_VI_FIFO, NRPCTXBUFPOST);
-        }
-
-        /* Allocate SB handle */
-        wlc->pub->sih = osl_malloc(wlc->osh, sizeof(si_t));
-        if (!wlc->pub->sih)
-                return -1;
-        bzero(wlc->pub->sih, sizeof(si_t));
-
-        /* sync up revinfo with BMAC */
-        bzero(&revinfo, sizeof(wlc_bmac_revinfo_t));
-        if (wlc_bmac_revinfo_get(wlc->hw, &revinfo) != 0)
-                return -1;
-        wlc->vendorid = (u16) revinfo.vendorid;
-        wlc->deviceid = (u16) revinfo.deviceid;
-
-        wlc->pub->boardrev = (u16) revinfo.boardrev;
-        wlc->pub->corerev = revinfo.corerev;
-        wlc->pub->sromrev = (u8) revinfo.sromrev;
-        wlc->pub->sih->chiprev = revinfo.chiprev;
-        wlc->pub->sih->chip = revinfo.chip;
-        wlc->pub->sih->chippkg = revinfo.chippkg;
-        wlc->pub->sih->boardtype = revinfo.boardtype;
-        wlc->pub->sih->boardvendor = revinfo.boardvendor;
-        wlc->pub->sih->bustype = revinfo.bustype;
-        wlc->pub->sih->buscoretype = revinfo.buscoretype;
-        wlc->pub->sih->buscorerev = revinfo.buscorerev;
-        wlc->pub->sih->issim = (bool) revinfo.issim;
-        wlc->pub->sih->rpc = rpc;
-
-        if (revinfo.nbands == 0 || revinfo.nbands > 2)
-                return -1;
-        wlc->pub->_nbands = revinfo.nbands;
-
-        for (idx = 0; idx < wlc->pub->_nbands; idx++) {
-                uint bandunit, bandtype;        /* To access bandstate */
-                wlc_phy_t *pi = osl_malloc(wlc->osh, sizeof(wlc_phy_t));
-
-                if (!pi)
-                        return -1;
-                bzero(pi, sizeof(wlc_phy_t));
-                pi->rpc = rpc;
-
-                bandunit = revinfo.band[idx].bandunit;
-                bandtype = revinfo.band[idx].bandtype;
-                wlc->bandstate[bandunit]->radiorev =
-                    (u8) revinfo.band[idx].radiorev;
-                wlc->bandstate[bandunit]->phytype =
-                    (u16) revinfo.band[idx].phytype;
-                wlc->bandstate[bandunit]->phyrev =
-                    (u16) revinfo.band[idx].phyrev;
-                wlc->bandstate[bandunit]->radioid =
-                    (u16) revinfo.band[idx].radioid;
-                wlc->bandstate[bandunit]->abgphy_encore =
-                    revinfo.band[idx].abgphy_encore;
-
-                wlc->bandstate[bandunit]->pi = pi;
-                wlc->bandstate[bandunit]->bandunit = bandunit;
-                wlc->bandstate[bandunit]->bandtype = bandtype;
-        }
-
-        /* misc stuff */
-
-        return 0;
-}
-
-/* Free the convenience handles */
-int wlc_bmac_detach(wlc_info_t *wlc)
-{
-        uint idx;
-
-        if (wlc->pub->sih) {
-                osl_mfree(wlc->osh, (void *)wlc->pub->sih, sizeof(si_t));
-                wlc->pub->sih = NULL;
-        }
-
-        for (idx = 0; idx < MAXBANDS; idx++)
-                if (wlc->bandstate[idx]->pi) {
-                        kfree(wlc->bandstate[idx]->pi);
-                        wlc->bandstate[idx]->pi = NULL;
-                }
-
-        if (wlc->rpctx) {
-                wlc_rpctx_detach(wlc->rpctx);
-                wlc->rpctx = NULL;
-        }
-
-        return 0;
-
-}
-
-#endif                          /* WLC_HIGH_ONLY */
-
-static void wlc_timers_deinit(wlc_info_t *wlc)
+static void wlc_timers_deinit(struct wlc_info *wlc)
 {
         /* free timer state */
         if (wlc->wdtimer) {
@@ -2274,7 +2105,7 @@ static void wlc_timers_deinit(wlc_info_t *wlc)
         }
 }
 
-static void wlc_detach_module(wlc_info_t *wlc)
+static void wlc_detach_module(struct wlc_info *wlc)
 {
         if (wlc->asi) {
                 wlc_antsel_detach(wlc->asi);
@@ -2297,7 +2128,7 @@ static void wlc_detach_module(wlc_info_t *wlc)
  *    One exception is sb register access, which is possible if crystal is turned on
  * After "down" state, driver should avoid software timer with the exception of radio_monitor.
  */
-uint wlc_detach(wlc_info_t *wlc)
+uint wlc_detach(struct wlc_info *wlc)
 {
         uint i;
         uint callbacks = 0;
@@ -2305,7 +2136,7 @@ uint wlc_detach(wlc_info_t *wlc)
         if (wlc == NULL)
                 return 0;
 
-        WL_TRACE(("wl%d: %s\n", wlc->pub->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc->pub->unit, __func__);
 
         ASSERT(!wlc->pub->up);
 
@@ -2328,15 +2159,6 @@ uint wlc_detach(wlc_info_t *wlc)
 
         /* free other state */
 
-#ifdef WLC_HIGH_ONLY
-        /* High-Only driver has an allocated copy of vars, monolithic just
-         * references the wlc->hw->vars which is freed in wlc_bmac_detach()
-         */
-        if (wlc->pub->vars) {
-                kfree(wlc->pub->vars);
-                wlc->pub->vars = NULL;
-        }
-#endif
 
 #ifdef BCMDBG
         if (wlc->country_ie_override) {
@@ -2360,13 +2182,6 @@ uint wlc_detach(wlc_info_t *wlc)
         /* Detach from iovar manager */
         wlc_module_unregister(wlc->pub, "wlc_iovars", wlc);
 
-        /*
-           if (wlc->ap) {
-           wlc_ap_detach(wlc->ap);
-           wlc->ap = NULL;
-           }
-         */
-
         while (wlc->tx_queues != NULL) {
                 wlc_txq_free(wlc, wlc->osh, wlc->tx_queues);
         }
@@ -2383,7 +2198,7 @@ uint wlc_detach(wlc_info_t *wlc)
 }
 
 /* update state that depends on the current value of "ap" */
-void wlc_ap_upd(wlc_info_t *wlc)
+void wlc_ap_upd(struct wlc_info *wlc)
 {
         if (AP_ENAB(wlc->pub))
                 wlc->PLCPHdr_override = WLC_PLCP_AUTO;  /* AP: short not allowed, but not enforced */
@@ -2398,7 +2213,7 @@ void wlc_ap_upd(wlc_info_t *wlc)
 }
 
 /* read hwdisable state and propagate to wlc flag */
-static void wlc_radio_hwdisable_upd(wlc_info_t *wlc)
+static void wlc_radio_hwdisable_upd(struct wlc_info *wlc)
 {
         if (wlc->pub->wlfeatureflag & WL_SWFL_NOHWRADIO || wlc->pub->hw_off)
                 return;
@@ -2411,17 +2226,17 @@ static void wlc_radio_hwdisable_upd(wlc_info_t *wlc)
 }
 
 /* return true if Minimum Power Consumption should be entered, false otherwise */
-bool wlc_is_non_delay_mpc(wlc_info_t *wlc)
+bool wlc_is_non_delay_mpc(struct wlc_info *wlc)
 {
         return false;
 }
 
-bool wlc_ismpc(wlc_info_t *wlc)
+bool wlc_ismpc(struct wlc_info *wlc)
 {
         return (wlc->mpc_delay_off == 0) && (wlc_is_non_delay_mpc(wlc));
 }
 
-void wlc_radio_mpc_upd(wlc_info_t *wlc)
+void wlc_radio_mpc_upd(struct wlc_info *wlc)
 {
         bool mpc_radio, radio_state;
 
@@ -2477,7 +2292,7 @@ void wlc_radio_mpc_upd(wlc_info_t *wlc)
  * centralized radio disable/enable function,
  * invoke radio enable/disable after updating hwradio status
  */
-static void wlc_radio_upd(wlc_info_t *wlc)
+static void wlc_radio_upd(struct wlc_info *wlc)
 {
         if (wlc->pub->radio_disabled)
                 wlc_radio_disable(wlc);
@@ -2486,7 +2301,7 @@ static void wlc_radio_upd(wlc_info_t *wlc)
 }
 
 /* maintain LED behavior in down state */
-static void wlc_down_led_upd(wlc_info_t *wlc)
+static void wlc_down_led_upd(struct wlc_info *wlc)
 {
         ASSERT(!wlc->pub->up);
 
@@ -2499,7 +2314,7 @@ static void wlc_down_led_upd(wlc_info_t *wlc)
         }
 }
 
-void wlc_radio_disable(wlc_info_t *wlc)
+void wlc_radio_disable(struct wlc_info *wlc)
 {
         if (!wlc->pub->up) {
                 wlc_down_led_upd(wlc);
@@ -2510,7 +2325,7 @@ void wlc_radio_disable(wlc_info_t *wlc)
         wl_down(wlc->wl);
 }
 
-static void wlc_radio_enable(wlc_info_t *wlc)
+static void wlc_radio_enable(struct wlc_info *wlc)
 {
         if (wlc->pub->up)
                 return;
@@ -2526,10 +2341,10 @@ static void wlc_radio_enable(wlc_info_t *wlc)
 /* periodical query hw radio button while driver is "down" */
 static void wlc_radio_timer(void *arg)
 {
-        wlc_info_t *wlc = (wlc_info_t *) arg;
+        struct wlc_info *wlc = (struct wlc_info *) arg;
 
         if (DEVICEREMOVED(wlc)) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
                 wl_down(wlc->wl);
                 return;
         }
@@ -2544,7 +2359,7 @@ static void wlc_radio_timer(void *arg)
         wlc_radio_upd(wlc);
 }
 
-static bool wlc_radio_monitor_start(wlc_info_t *wlc)
+static bool wlc_radio_monitor_start(struct wlc_info *wlc)
 {
         /* Don't start the timer if HWRADIO feature is disabled */
         if (wlc->radio_monitor || (wlc->pub->wlfeatureflag & WL_SWFL_NOHWRADIO))
@@ -2556,7 +2371,7 @@ static bool wlc_radio_monitor_start(wlc_info_t *wlc)
         return true;
 }
 
-bool wlc_radio_monitor_stop(wlc_info_t *wlc)
+bool wlc_radio_monitor_stop(struct wlc_info *wlc)
 {
         if (!wlc->radio_monitor)
                 return true;
@@ -2570,7 +2385,7 @@ bool wlc_radio_monitor_stop(wlc_info_t *wlc)
 }
 
 /* bring the driver down, but don't reset hardware */
-void wlc_out(wlc_info_t *wlc)
+void wlc_out(struct wlc_info *wlc)
 {
         wlc_bmac_set_noreset(wlc->hw, true);
         wlc_radio_upd(wlc);
@@ -2591,7 +2406,7 @@ void wlc_out(wlc_info_t *wlc)
  * if there is no packet pending for the FIFO, then the corresponding prec bits should be set
  * in prec_map. Of course, ignore this rule when block_datafifo is set
  */
-static bool wlc_tx_prec_map_verify(wlc_info_t *wlc)
+static bool wlc_tx_prec_map_verify(struct wlc_info *wlc)
 {
         /* For non-WME, both fifos have overlapping prec_map. So it's an error only if both
          * fail the check.
@@ -2613,7 +2428,7 @@ static bool wlc_tx_prec_map_verify(wlc_info_t *wlc)
 
 static void wlc_watchdog_by_timer(void *arg)
 {
-        wlc_info_t *wlc = (wlc_info_t *) arg;
+        struct wlc_info *wlc = (struct wlc_info *) arg;
         wlc_watchdog(arg);
         if (WLC_WATCHDOG_TBTT(wlc)) {
                 /* set to normal osl watchdog period */
@@ -2626,17 +2441,17 @@ static void wlc_watchdog_by_timer(void *arg)
 /* common watchdog code */
 static void wlc_watchdog(void *arg)
 {
-        wlc_info_t *wlc = (wlc_info_t *) arg;
+        struct wlc_info *wlc = (struct wlc_info *) arg;
         int i;
         wlc_bsscfg_t *cfg;
 
-        WL_TRACE(("wl%d: wlc_watchdog\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_watchdog\n", wlc->pub->unit);
 
         if (!wlc->pub->up)
                 return;
 
         if (DEVICEREMOVED(wlc)) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
                 wl_down(wlc->wl);
                 return;
         }
@@ -2667,13 +2482,7 @@ static void wlc_watchdog(void *arg)
         if (wlc->pub->radio_disabled)
                 return;
 
-#ifdef WLC_LOW
         wlc_bmac_watchdog(wlc);
-#endif
-#ifdef WLC_HIGH_ONLY
-        /* maintenance */
-        wlc_bmac_rpc_watchdog(wlc);
-#endif
 
         /* occasionally sample mac stat counters to detect 16-bit counter wrap */
         if ((WLC_UPDATE_STATS(wlc))
@@ -2702,10 +2511,8 @@ static void wlc_watchdog(void *arg)
                 wlc->tempsense_lasttime = wlc->pub->now;
                 wlc_tempsense_upd(wlc);
         }
-#ifdef WLC_LOW
         /* BMAC_NOTE: for HIGH_ONLY driver, this seems being called after RPC bus failed */
         ASSERT(wlc_bmac_taclear(wlc->hw, true));
-#endif
 
         /* Verify that tx_prec_map and fifos are in sync to avoid lock ups */
         ASSERT(wlc_tx_prec_map_verify(wlc));
@@ -2714,9 +2521,9 @@ static void wlc_watchdog(void *arg)
 }
 
 /* make interface operational */
-int wlc_up(wlc_info_t *wlc)
+int wlc_up(struct wlc_info *wlc)
 {
-        WL_TRACE(("wl%d: %s:\n", wlc->pub->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc->pub->unit, __func__);
 
         /* HW is turned off so don't try to access it */
         if (wlc->pub->hw_off || DEVICEREMOVED(wlc))
@@ -2728,7 +2535,7 @@ int wlc_up(wlc_info_t *wlc)
         }
 
         if ((wlc->pub->boardflags & BFL_FEM)
-            && (CHIPID(wlc->pub->sih->chip) == BCM4313_CHIP_ID)) {
+            && (wlc->pub->sih->chip == BCM4313_CHIP_ID)) {
                 if (wlc->pub->boardrev >= 0x1250
                     && (wlc->pub->boardflags & BFL_FEM_BT)) {
                         wlc_mhf(wlc, MHF5, MHF5_4313_GPIOCTRL,
@@ -2761,7 +2568,8 @@ int wlc_up(wlc_info_t *wlc)
                                         if (!BSSCFG_STA(bsscfg)
                                             || !bsscfg->enable || !bsscfg->BSS)
                                                 continue;
-                                        WL_ERROR(("wl%d.%d: wlc_up: rfdisable -> " "wlc_bsscfg_disable()\n", wlc->pub->unit, idx));
+                                        WL_ERROR("wl%d.%d: wlc_up: rfdisable -> " "wlc_bsscfg_disable()\n",
+                                                 wlc->pub->unit, idx);
                                 }
                         }
                 } else
@@ -2822,10 +2630,10 @@ int wlc_up(wlc_info_t *wlc)
 }
 
 /* Initialize the base precedence map for dequeueing from txq based on WME settings */
-static void wlc_tx_prec_map_init(wlc_info_t *wlc)
+static void wlc_tx_prec_map_init(struct wlc_info *wlc)
 {
         wlc->tx_prec_map = WLC_PREC_BMP_ALL;
-        bzero(wlc->fifo2prec_map, sizeof(u16) * NFIFO);
+        memset(wlc->fifo2prec_map, 0, NFIFO * sizeof(u16));
 
         /* For non-WME, both fifos have overlapping MAXPRIO. So just disable all precedences
          * if either is full.
@@ -2841,7 +2649,7 @@ static void wlc_tx_prec_map_init(wlc_info_t *wlc)
         }
 }
 
-static uint wlc_down_del_timer(wlc_info_t *wlc)
+static uint wlc_down_del_timer(struct wlc_info *wlc)
 {
         uint callbacks = 0;
 
@@ -2853,7 +2661,7 @@ static uint wlc_down_del_timer(wlc_info_t *wlc)
  * disable the hardware, free any transient buffer state.
  * Return a count of the number of driver callbacks still pending.
  */
-uint wlc_down(wlc_info_t *wlc)
+uint wlc_down(struct wlc_info *wlc)
 {
 
         uint callbacks = 0;
@@ -2861,12 +2669,12 @@ uint wlc_down(wlc_info_t *wlc)
         bool dev_gone = false;
         wlc_txq_info_t *qi;
 
-        WL_TRACE(("wl%d: %s:\n", wlc->pub->unit, __func__));
+        WL_TRACE("wl%d: %s:\n", wlc->pub->unit, __func__);
 
         /* check if we are already in the going down path */
         if (wlc->going_down) {
-                WL_ERROR(("wl%d: %s: Driver going down so return\n",
-                          wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s: Driver going down so return\n",
+                         wlc->pub->unit, __func__);
                 return 0;
         }
         if (!wlc->pub->up)
@@ -2922,14 +2730,11 @@ uint wlc_down(wlc_info_t *wlc)
         /* wlc_bmac_down_finish has done wlc_coredisable(). so clk is off */
         wlc->clk = false;
 
-#ifdef WLC_HIGH_ONLY
-        wlc_rpctx_txreclaim(wlc->rpctx);
-#endif
 
         /* Verify all packets are flushed from the driver */
-        if (PKTALLOCED(wlc->osh) != 0) {
-                WL_ERROR(("%d packets not freed at wlc_down!!!!!!\n",
-                          PKTALLOCED(wlc->osh)));
+        if (wlc->osh->pktalloced != 0) {
+                WL_ERROR("%d packets not freed at wlc_down!!!!!!\n",
+                         wlc->osh->pktalloced);
         }
 #ifdef BCMDBG
         /* Since all the packets should have been freed,
@@ -2943,7 +2748,7 @@ uint wlc_down(wlc_info_t *wlc)
 }
 
 /* Set the current gmode configuration */
-int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
+int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
 {
         int ret = 0;
         uint i;
@@ -2958,7 +2763,7 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
         bool preamble_restrict = false; /* Restrict association to stations that support short
                                          * preambles
                                          */
-        wlcband_t *band;
+        struct wlcband *band;
 
         /* if N-support is enabled, allow Gmode set as long as requested
          * Gmode is not GMODE_LEGACY_B
@@ -2985,10 +2790,10 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
                 wlc_protection_upd(wlc, WLC_PROT_G_USER, gmode);
 
         /* Clear supported rates filter */
-        bzero(&wlc->sup_rates_override, sizeof(wlc_rateset_t));
+        memset(&wlc->sup_rates_override, 0, sizeof(wlc_rateset_t));
 
         /* Clear rateset override */
-        bzero(&rs, sizeof(wlc_rateset_t));
+        memset(&rs, 0, sizeof(wlc_rateset_t));
 
         switch (gmode) {
         case GMODE_LEGACY_B:
@@ -3026,8 +2831,8 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
 
         default:
                 /* Error */
-                WL_ERROR(("wl%d: %s: invalid gmode %d\n", wlc->pub->unit,
-                          __func__, gmode));
+                WL_ERROR("wl%d: %s: invalid gmode %d\n",
+                         wlc->pub->unit, __func__, gmode);
                 return BCME_UNSUPPORTED;
         }
 
@@ -3093,7 +2898,7 @@ int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config)
         return ret;
 }
 
-static int wlc_nmode_validate(wlc_info_t *wlc, s32 nmode)
+static int wlc_nmode_validate(struct wlc_info *wlc, s32 nmode)
 {
         int err = 0;
 
@@ -3117,7 +2922,7 @@ static int wlc_nmode_validate(wlc_info_t *wlc, s32 nmode)
         return err;
 }
 
-int wlc_set_nmode(wlc_info_t *wlc, s32 nmode)
+int wlc_set_nmode(struct wlc_info *wlc, s32 nmode)
 {
         uint i;
         int err;
@@ -3176,7 +2981,7 @@ int wlc_set_nmode(wlc_info_t *wlc, s32 nmode)
         return err;
 }
 
-static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg)
+static int wlc_set_rateset(struct wlc_info *wlc, wlc_rateset_t *rs_arg)
 {
         wlc_rateset_t rs, new;
         uint bandunit;
@@ -3219,18 +3024,18 @@ static int wlc_set_rateset(wlc_info_t *wlc, wlc_rateset_t *rs_arg)
 }
 
 /* simplified integer set interface for common ioctl handler */
-int wlc_set(wlc_info_t *wlc, int cmd, int arg)
+int wlc_set(struct wlc_info *wlc, int cmd, int arg)
 {
         return wlc_ioctl(wlc, cmd, (void *)&arg, sizeof(arg), NULL);
 }
 
 /* simplified integer get interface for common ioctl handler */
-int wlc_get(wlc_info_t *wlc, int cmd, int *arg)
+int wlc_get(struct wlc_info *wlc, int cmd, int *arg)
 {
         return wlc_ioctl(wlc, cmd, arg, sizeof(int), NULL);
 }
 
-static void wlc_ofdm_rateset_war(wlc_info_t *wlc)
+static void wlc_ofdm_rateset_war(struct wlc_info *wlc)
 {
         u8 r;
         bool war = false;
@@ -3246,14 +3051,16 @@ static void wlc_ofdm_rateset_war(wlc_info_t *wlc)
 }
 
 int
-wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
+wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
+          struct wlc_if *wlcif)
 {
         return _wlc_ioctl(wlc, cmd, arg, len, wlcif);
 }
 
 /* common ioctl handler. return: 0=ok, -1=error, positive=particular error */
 static int
-_wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
+_wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
+           struct wlc_if *wlcif)
 {
         int val, *pval;
         bool bool_val;
@@ -3265,7 +3072,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
         uint band;
         rw_reg_t *r;
         wlc_bsscfg_t *bsscfg;
-        osl_t *osh;
+        struct osl_info *osh;
         wlc_bss_info_t *current_bss;
 
         /* update bsscfg pointer */
@@ -3280,7 +3087,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 
         /* If the device is turned off, then it's not "removed" */
         if (!wlc->pub->hw_off && DEVICEREMOVED(wlc)) {
-                WL_ERROR(("wl%d: %s: dead chip\n", wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
                 wl_down(wlc->wl);
                 return BCME_ERROR;
         }
@@ -3300,8 +3107,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
         bool_val = val != 0;
 
         if (cmd != WLC_SET_CHANNEL)
-                WL_NONE(("WLC_IOCTL: cmd %d val 0x%x (%d) len %d\n", cmd,
-                         (uint) val, val, len));
+                WL_NONE("WLC_IOCTL: cmd %d val 0x%x (%d) len %d\n",
+                        cmd, (uint)val, val, len);
 
         bcmerror = 0;
         regs = wlc->regs;
@@ -3321,8 +3128,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 
         default:
                 if ((arg == NULL) || (len <= 0)) {
-                        WL_ERROR(("wl%d: %s: Command %d needs arguments\n",
-                                  wlc->pub->unit, __func__, cmd));
+                        WL_ERROR("wl%d: %s: Command %d needs arguments\n",
+                                 wlc->pub->unit, __func__, cmd);
                         bcmerror = BCME_BADARG;
                         goto done;
                 }
@@ -3388,10 +3195,6 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                 wlc_set_chanspec(wlc, chspec);
                                 wlc_enable_mac(wlc);
                         }
-#ifdef WLC_HIGH_ONLY
-                        /* delay for channel change */
-                        msleep(50);
-#endif
                         break;
                 }
 
@@ -3659,8 +3462,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                         /* 4322 supports antdiv in phy, no need to set it to ucode */
                         if (WLCISNPHY(wlc->band)
                             && D11REV_IS(wlc->pub->corerev, 16)) {
-                                WL_ERROR(("wl%d: can't set ucantdiv for 4322\n",
-                                          wlc->pub->unit));
+                                WL_ERROR("wl%d: can't set ucantdiv for 4322\n",
+                                         wlc->pub->unit);
                                 bcmerror = BCME_UNSUPPORTED;
                         } else
                                 wlc_mhf(wlc, MHF1, MHF1_ANTDIV,
@@ -3757,8 +3560,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                         if ((radiomask == 0) || (radiomask & ~validbits)
                             || (radioval & ~validbits)
                             || ((radioval & ~radiomask) != 0)) {
-                                WL_ERROR(("SET_RADIO with wrong bits 0x%x\n",
-                                          val));
+                                WL_ERROR("SET_RADIO with wrong bits 0x%x\n",
+                                         val);
                                 bcmerror = BCME_RANGE;
                                 break;
                         }
@@ -3788,7 +3591,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                 break;
                         }
 
-                        bzero((char *)&key, sizeof(key));
+                        memset((char *)&key, 0, sizeof(key));
                         if (src_key) {
                                 key.index = src_key->id;
                                 key.len = src_key->len;
@@ -3800,7 +3603,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                         key.flags |= WL_PRIMARY_KEY;
 
                                 bcopy(src_key->ea.octet, key.ea.octet,
-                                      ETHER_ADDR_LEN);
+                                      ETH_ALEN);
                         }
 
                         bcopy((char *)&key, arg, sizeof(key));
@@ -3835,8 +3638,8 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                 u16 lo;
                                 u32 hi;
                                 /* group keys in WPA-NONE (IBSS only, AES and TKIP) use a global TXIV */
-                                if ((bsscfg->WPA_auth & WPA_AUTH_NONE)
-                                    && ETHER_ISNULLADDR(&key->ea)) {
+                                if ((bsscfg->WPA_auth & WPA_AUTH_NONE) &&
+                                    is_zero_ether_addr(key->ea.octet)) {
                                         lo = bsscfg->wpa_none_txiv.lo;
                                         hi = bsscfg->wpa_none_txiv.hi;
                                 } else {
@@ -3885,7 +3688,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                         wlc_rateset_t rs;
                         wl_rateset_t *ret_rs = (wl_rateset_t *) arg;
 
-                        bzero(&rs, sizeof(wlc_rateset_t));
+                        memset(&rs, 0, sizeof(wlc_rateset_t));
                         wlc_default_rateset(wlc, (wlc_rateset_t *) &rs);
 
                         if (len < (int)(rs.count + sizeof(rs.count))) {
@@ -3913,7 +3716,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                 break;
                         }
 
-                        bzero(&rs, sizeof(wlc_rateset_t));
+                        memset(&rs, 0, sizeof(wlc_rateset_t));
 
                         /* Copy only legacy rateset section */
                         rs.count = in_rs->count;
@@ -4247,7 +4050,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 
                         /* check for an empty rateset to clear the override */
                         if (rs.count == 0) {
-                                bzero(&wlc->sup_rates_override,
+                                memset(&wlc->sup_rates_override, 0,
                                       sizeof(wlc_rateset_t));
                                 break;
                         }
@@ -4394,7 +4197,7 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
 #endif
 
         case WLC_LAST:
-                WL_ERROR(("%s: WLC_LAST\n", __func__));
+                WL_ERROR("%s: WLC_LAST\n", __func__);
         }
  done:
 
@@ -4406,21 +4209,19 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                 }
 
         }
-#ifdef WLC_LOW
         /* BMAC_NOTE: for HIGH_ONLY driver, this seems being called after RPC bus failed */
         /* In hw_off condition, IOCTLs that reach here are deemed safe but taclear would
          * certainly result in getting -1 for register reads. So skip ta_clear altogether
          */
         if (!(wlc->pub->hw_off))
                 ASSERT(wlc_bmac_taclear(wlc->hw, ta_ok) || !ta_ok);
-#endif
 
         return bcmerror;
 }
 
 #if defined(BCMDBG)
 /* consolidated register access ioctl error checking */
-int wlc_iocregchk(wlc_info_t *wlc, uint band)
+int wlc_iocregchk(struct wlc_info *wlc, uint band)
 {
         /* if band is specified, it must be the current band */
         if ((band != WLC_BAND_AUTO) && (band != (uint) wlc->band->bandtype))
@@ -4440,7 +4241,7 @@ int wlc_iocregchk(wlc_info_t *wlc, uint band)
 
 #if defined(BCMDBG)
 /* For some ioctls, make sure that the pi pointer matches the current phy */
-int wlc_iocpichk(wlc_info_t *wlc, uint phytype)
+int wlc_iocpichk(struct wlc_info *wlc, uint phytype)
 {
         if (wlc->band->phytype != phytype)
                 return BCME_BADBAND;
@@ -4474,21 +4275,21 @@ static const bcm_iovar_t *wlc_iovar_lookup(const bcm_iovar_t *table,
 }
 
 /* simplified integer get interface for common WLC_GET_VAR ioctl handler */
-int wlc_iovar_getint(wlc_info_t *wlc, const char *name, int *arg)
+int wlc_iovar_getint(struct wlc_info *wlc, const char *name, int *arg)
 {
         return wlc_iovar_op(wlc, name, NULL, 0, arg, sizeof(s32), IOV_GET,
                             NULL);
 }
 
 /* simplified integer set interface for common WLC_SET_VAR ioctl handler */
-int wlc_iovar_setint(wlc_info_t *wlc, const char *name, int arg)
+int wlc_iovar_setint(struct wlc_info *wlc, const char *name, int arg)
 {
         return wlc_iovar_op(wlc, name, NULL, 0, (void *)&arg, sizeof(arg),
                             IOV_SET, NULL);
 }
 
 /* simplified s8 get interface for common WLC_GET_VAR ioctl handler */
-int wlc_iovar_gets8(wlc_info_t *wlc, const char *name, s8 *arg)
+int wlc_iovar_gets8(struct wlc_info *wlc, const char *name, s8 *arg)
 {
         int iovar_int;
         int err;
@@ -4507,11 +4308,11 @@ int wlc_iovar_gets8(wlc_info_t *wlc, const char *name, s8 *arg)
  * calling function must keep 'iovars' until wlc_module_unregister is called.
  * 'iovar' must have the last entry's name field being NULL as terminator.
  */
-int wlc_module_register(wlc_pub_t *pub, const bcm_iovar_t *iovars,
+int wlc_module_register(struct wlc_pub *pub, const bcm_iovar_t *iovars,
                         const char *name, void *hdl, iovar_fn_t i_fn,
                         watchdog_fn_t w_fn, down_fn_t d_fn)
 {
-        wlc_info_t *wlc = (wlc_info_t *) pub->wlc;
+        struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
         int i;
 
         ASSERT(name != NULL);
@@ -4537,9 +4338,9 @@ int wlc_module_register(wlc_pub_t *pub, const bcm_iovar_t *iovars,
 }
 
 /* unregister module callbacks */
-int wlc_module_unregister(wlc_pub_t *pub, const char *name, void *hdl)
+int wlc_module_unregister(struct wlc_pub *pub, const char *name, void *hdl)
 {
-        wlc_info_t *wlc = (wlc_info_t *) pub->wlc;
+        struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
         int i;
 
         if (wlc == NULL)
@@ -4550,7 +4351,7 @@ int wlc_module_unregister(wlc_pub_t *pub, const char *name, void *hdl)
         for (i = 0; i < WLC_MAXMODULES; i++) {
                 if (!strcmp(wlc->modulecb[i].name, name) &&
                     (wlc->modulecb[i].hdl == hdl)) {
-                        bzero(&wlc->modulecb[i], sizeof(modulecb_t));
+                        memset(&wlc->modulecb[i], 0, sizeof(modulecb_t));
                         return 0;
                 }
         }
@@ -4560,7 +4361,7 @@ int wlc_module_unregister(wlc_pub_t *pub, const char *name, void *hdl)
 }
 
 /* Write WME tunable parameters for retransmit/max rate from wlc struct to ucode */
-static void wlc_wme_retries_write(wlc_info_t *wlc)
+static void wlc_wme_retries_write(struct wlc_info *wlc)
 {
         int ac;
 
@@ -4582,7 +4383,7 @@ static void wlc_wme_retries_write(wlc_info_t *wlc)
  * All pointers may point into the same buffer.
  */
 int
-wlc_iovar_op(wlc_info_t *wlc, const char *name,
+wlc_iovar_op(struct wlc_info *wlc, const char *name,
              void *params, int p_len, void *arg, int len,
              bool set, struct wlc_if *wlcif)
 {
@@ -4606,8 +4407,8 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name,
 
         if (!set && (len == sizeof(int)) &&
             !(IS_ALIGNED((unsigned long)(arg), (uint) sizeof(int)))) {
-                WL_ERROR(("wl%d: %s unaligned get ptr for %s\n",
-                          wlc->pub->unit, __func__, name));
+                WL_ERROR("wl%d: %s unaligned get ptr for %s\n",
+                         wlc->pub->unit, __func__, name);
                 ASSERT(0);
         }
 
@@ -4622,11 +4423,6 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name,
         /* iovar name not found */
         if (i >= WLC_MAXMODULES) {
                 err = BCME_UNSUPPORTED;
-#ifdef WLC_HIGH_ONLY
-                err =
-                    bcmsdh_iovar_op(wlc->btparam, name, params, p_len, arg, len,
-                                    set);
-#endif
                 goto exit;
         }
 
@@ -4658,10 +4454,10 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name,
 }
 
 int
-wlc_iovar_check(wlc_pub_t *pub, const bcm_iovar_t *vi, void *arg, int len,
+wlc_iovar_check(struct wlc_pub *pub, const bcm_iovar_t *vi, void *arg, int len,
                 bool set)
 {
-        wlc_info_t *wlc = (wlc_info_t *) pub->wlc;
+        struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
         int err = 0;
         s32 int_val = 0;
 
@@ -4729,7 +4525,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
             const char *name, void *params, uint p_len, void *arg, int len,
             int val_size, struct wlc_if *wlcif)
 {
-        wlc_info_t *wlc = hdl;
+        struct wlc_info *wlc = hdl;
         wlc_bsscfg_t *bsscfg;
         int err = 0;
         s32 int_val = 0;
@@ -4739,7 +4535,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
         bool bool_val2;
         wlc_bss_info_t *current_bss;
 
-        WL_TRACE(("wl%d: %s\n", wlc->pub->unit, __func__));
+        WL_TRACE("wl%d: %s\n", wlc->pub->unit, __func__);
 
         bsscfg = NULL;
         current_bss = NULL;
@@ -4762,8 +4558,8 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
         bool_val = (int_val != 0) ? true : false;
         bool_val2 = (int_val2 != 0) ? true : false;
 
-        WL_TRACE(("wl%d: %s: id %d\n", wlc->pub->unit, __func__,
-                  IOV_ID(actionid)));
+        WL_TRACE("wl%d: %s: id %d\n",
+                 wlc->pub->unit, __func__, IOV_ID(actionid));
         /* Do the actual parameter implementation */
         switch (actionid) {
 
@@ -4821,7 +4617,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
                 break;
 
         default:
-                WL_ERROR(("wl%d: %s: unsupported\n", wlc->pub->unit, __func__));
+                WL_ERROR("wl%d: %s: unsupported\n", wlc->pub->unit, __func__);
                 err = BCME_UNSUPPORTED;
                 break;
         }
@@ -4833,7 +4629,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
 }
 
 static int
-wlc_iovar_rangecheck(wlc_info_t *wlc, u32 val, const bcm_iovar_t *vi)
+wlc_iovar_rangecheck(struct wlc_info *wlc, u32 val, const bcm_iovar_t *vi)
 {
         int err = 0;
         u32 min_val = 0;
@@ -4930,7 +4726,7 @@ void wlc_print_txstatus(tx_status_t *txs)
 #define MACSTATUPD(name) \
         wlc_ctrupd_cache(macstats.name, &wlc->core->macstat_snapshot->name, &wlc->pub->_cnt->name)
 
-void wlc_statsupd(wlc_info_t *wlc)
+void wlc_statsupd(struct wlc_info *wlc)
 {
         int i;
 #ifdef BCMDBG
@@ -4956,8 +4752,8 @@ void wlc_statsupd(wlc_info_t *wlc)
         /* check for rx fifo 0 overflow */
         delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
         if (delta)
-                WL_ERROR(("wl%d: %u rx fifo 0 overflows!\n", wlc->pub->unit,
-                          delta));
+                WL_ERROR("wl%d: %u rx fifo 0 overflows!\n",
+                         wlc->pub->unit, delta);
 
         /* check for tx fifo underflows */
         for (i = 0; i < NFIFO; i++) {
@@ -4965,8 +4761,8 @@ void wlc_statsupd(wlc_info_t *wlc)
                     (u16) (wlc->core->macstat_snapshot->txfunfl[i] -
                               txfunfl[i]);
                 if (delta)
-                        WL_ERROR(("wl%d: %u tx fifo %d underflows!\n",
-                                  wlc->pub->unit, delta, i));
+                        WL_ERROR("wl%d: %u tx fifo %d underflows!\n",
+                                 wlc->pub->unit, delta, i);
         }
 #endif                          /* BCMDBG */
 
@@ -5015,7 +4811,7 @@ void wlc_statsupd(wlc_info_t *wlc)
 bool wlc_chipmatch(u16 vendor, u16 device)
 {
         if (vendor != VENDOR_BROADCOM) {
-                WL_ERROR(("wlc_chipmatch: unknown vendor id %04x\n", vendor));
+                WL_ERROR("wlc_chipmatch: unknown vendor id %04x\n", vendor);
                 return false;
         }
 
@@ -5027,7 +4823,7 @@ bool wlc_chipmatch(u16 vendor, u16 device)
         if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID))
                 return true;
 
-        WL_ERROR(("wlc_chipmatch: unknown device id %04x\n", device));
+        WL_ERROR("wlc_chipmatch: unknown device id %04x\n", device);
         return false;
 }
 
@@ -5182,20 +4978,12 @@ int wlc_format_ssid(char *buf, const unsigned char ssid[], uint ssid_len)
 }
 #endif                          /* defined(BCMDBG) */
 
-u16 wlc_rate_shm_offset(wlc_info_t *wlc, u8 rate)
+u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate)
 {
         return wlc_bmac_rate_shm_offset(wlc->hw, rate);
 }
 
 /* Callback for device removed */
-#if defined(WLC_HIGH_ONLY)
-void wlc_device_removed(void *arg)
-{
-        wlc_info_t *wlc = (wlc_info_t *) arg;
-
-        wlc->device_present = false;
-}
-#endif                          /* WLC_HIGH_ONLY */
 
 /*
  * Attempts to queue a packet onto a multiple-precedence queue,
@@ -5207,16 +4995,16 @@ void wlc_device_removed(void *arg)
  * Returns true if packet consumed (queued), false if not.
  */
 bool BCMFASTPATH
-wlc_prec_enq(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec)
+wlc_prec_enq(struct wlc_info *wlc, struct pktq *q, void *pkt, int prec)
 {
         return wlc_prec_enq_head(wlc, q, pkt, prec, false);
 }
 
 bool BCMFASTPATH
-wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec,
-                  bool head)
+wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
+                  int prec, bool head)
 {
-        void *p;
+        struct sk_buff *p;
         int eprec = -1;         /* precedence to evict from */
 
         /* Determine precedence from which to evict packet, if any */
@@ -5226,8 +5014,8 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec,
                 p = pktq_peek_tail(q, &eprec);
                 ASSERT(p != NULL);
                 if (eprec > prec) {
-                        WL_ERROR(("%s: Failing: eprec %d > prec %d\n", __func__,
-                                  eprec, prec));
+                        WL_ERROR("%s: Failing: eprec %d > prec %d\n",
+                                 __func__, eprec, prec);
                         return false;
                 }
         }
@@ -5243,8 +5031,8 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec,
 
                 /* Refuse newer packet unless configured to discard oldest */
                 if (eprec == prec && !discard_oldest) {
-                        WL_ERROR(("%s: No where to go, prec == %d\n", __func__,
-                                  prec));
+                        WL_ERROR("%s: No where to go, prec == %d\n",
+                                 __func__, prec);
                         return false;
                 }
 
@@ -5256,14 +5044,14 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec,
                 /* Increment wme stats */
                 if (WME_ENAB(wlc->pub)) {
                         WLCNTINCR(wlc->pub->_wme_cnt->
-                                  tx_failed[WME_PRIO2AC(PKTPRIO(p))].packets);
+                                  tx_failed[WME_PRIO2AC(p->priority)].packets);
                         WLCNTADD(wlc->pub->_wme_cnt->
-                                 tx_failed[WME_PRIO2AC(PKTPRIO(p))].bytes,
+                                 tx_failed[WME_PRIO2AC(p->priority)].bytes,
                                  pkttotlen(wlc->osh, p));
                 }
 
                 ASSERT(0);
-                PKTFREE(wlc->osh, p, true);
+                pkt_buf_free_skb(wlc->osh, p, true);
                 WLCNTINCR(wlc->pub->_cnt->txnobuf);
         }
 
@@ -5277,25 +5065,26 @@ wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec,
         return true;
 }
 
-void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, void *sdu, uint prec)
+void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
+                             uint prec)
 {
-        wlc_info_t *wlc = (wlc_info_t *) ctx;
+        struct wlc_info *wlc = (struct wlc_info *) ctx;
         wlc_txq_info_t *qi = wlc->active_queue; /* Check me */
         struct pktq *q = &qi->q;
         int prio;
 
-        prio = PKTPRIO(sdu);
+        prio = sdu->priority;
 
         ASSERT(pktq_max(q) >= wlc->pub->tunables->datahiwat);
 
         if (!wlc_prec_enq(wlc, q, sdu, prec)) {
                 if (!EDCF_ENAB(wlc->pub)
                     || (wlc->pub->wlfeatureflag & WL_SWFL_FLOWCONTROL))
-                        WL_ERROR(("wl%d: wlc_txq_enq: txq overflow\n",
-                                  wlc->pub->unit));
+                        WL_ERROR("wl%d: wlc_txq_enq: txq overflow\n",
+                                 wlc->pub->unit);
 
                 /* ASSERT(9 == 8); *//* XXX we might hit this condtion in case packet flooding from mac80211 stack */
-                PKTFREE(wlc->osh, sdu, true);
+                pkt_buf_free_skb(wlc->osh, sdu, true);
                 WLCNTINCR(wlc->pub->_cnt->txnobuf);
         }
 
@@ -5317,13 +5106,14 @@ void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, void *sdu, uint prec)
 }
 
 bool BCMFASTPATH
-wlc_sendpkt_mac80211(wlc_info_t *wlc, void *sdu, struct ieee80211_hw *hw)
+wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
+                     struct ieee80211_hw *hw)
 {
         u8 prio;
         uint fifo;
         void *pkt;
         struct scb *scb = &global_scb;
-        struct dot11_header *d11_header = (struct dot11_header *)PKTDATA(sdu);
+        struct dot11_header *d11_header = (struct dot11_header *)(sdu->data);
         u16 type, fc;
 
         ASSERT(sdu);
@@ -5332,13 +5122,13 @@ wlc_sendpkt_mac80211(wlc_info_t *wlc, void *sdu, struct ieee80211_hw *hw)
         type = FC_TYPE(fc);
 
         /* 802.11 standard requires management traffic to go at highest priority */
-        prio = (type == FC_TYPE_DATA ? PKTPRIO(sdu) : MAXPRIO);
+        prio = (type == FC_TYPE_DATA ? sdu->priority : MAXPRIO);
         fifo = prio2fifo[prio];
 
-        ASSERT((uint) PKTHEADROOM(sdu) >= TXOFF);
-        ASSERT(!PKTSHARED(sdu));
-        ASSERT(!PKTNEXT(sdu));
-        ASSERT(!PKTLINK(sdu));
+        ASSERT((uint) skb_headroom(sdu) >= TXOFF);
+        ASSERT(!(sdu->cloned));
+        ASSERT(!(sdu->next));
+        ASSERT(!(sdu->prev));
         ASSERT(fifo < NFIFO);
 
         pkt = sdu;
@@ -5352,9 +5142,9 @@ wlc_sendpkt_mac80211(wlc_info_t *wlc, void *sdu, struct ieee80211_hw *hw)
         return 0;
 }
 
-void BCMFASTPATH wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi)
+void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, wlc_txq_info_t *qi)
 {
-        void *pkt[DOT11_MAXNUMFRAGS];
+        struct sk_buff *pkt[DOT11_MAXNUMFRAGS];
         int prec;
         u16 prec_map;
         int err = 0, i, count;
@@ -5427,7 +5217,7 @@ void BCMFASTPATH wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi)
  * for MC frames so is used as part of the sequence number.
  */
 static inline u16
-bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
+bcmc_fid_generate(struct wlc_info *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
 {
         u16 frameid;
 
@@ -5441,13 +5231,14 @@ bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
 }
 
 void BCMFASTPATH
-wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
+wlc_txfifo(struct wlc_info *wlc, uint fifo, struct sk_buff *p, bool commit,
+           s8 txpktpend)
 {
         u16 frameid = INVALIDFID;
         d11txh_t *txh;
 
         ASSERT(fifo < NFIFO);
-        txh = (d11txh_t *) PKTDATA(p);
+        txh = (d11txh_t *) (p->data);
 
         /* When a BC/MC frame is being committed to the BCMC fifo via DMA (NOT PIO), update
          * ucode or BSS info as appropriate.
@@ -5460,21 +5251,14 @@ wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
         if (WLC_WAR16165(wlc))
                 wlc_war16165(wlc, true);
 
-#ifdef WLC_HIGH_ONLY
-        if (RPCTX_ENAB(wlc->pub)) {
-                (void)wlc_rpctx_tx(wlc->rpctx, fifo, p, commit, frameid,
-                                   txpktpend);
-                return;
-        }
-#else
 
         /* Bump up pending count for if not using rpc. If rpc is used, this will be handled
          * in wlc_bmac_txfifo()
          */
         if (commit) {
                 TXPKTPENDINC(wlc, fifo, txpktpend);
-                WL_TRACE(("wlc_txfifo, pktpend inc %d to %d\n", txpktpend,
-                          TXPKTPENDGET(wlc, fifo)));
+                WL_TRACE("wlc_txfifo, pktpend inc %d to %d\n",
+                         txpktpend, TXPKTPENDGET(wlc, fifo));
         }
 
         /* Commit BCMC sequence number in the SHM frame ID location */
@@ -5482,13 +5266,12 @@ wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
                 BCMCFID(wlc, frameid);
 
         if (dma_txfast(wlc->hw->di[fifo], p, commit) < 0) {
-                WL_ERROR(("wlc_txfifo: fatal, toss frames !!!\n"));
+                WL_ERROR("wlc_txfifo: fatal, toss frames !!!\n");
         }
-#endif                          /* WLC_HIGH_ONLY */
 }
 
 static u16
-wlc_compute_airtime(wlc_info_t *wlc, ratespec_t rspec, uint length)
+wlc_compute_airtime(struct wlc_info *wlc, ratespec_t rspec, uint length)
 {
         u16 usec = 0;
         uint mac_rate = RSPEC2RATE(rspec);
@@ -5523,7 +5306,8 @@ wlc_compute_airtime(wlc_info_t *wlc, ratespec_t rspec, uint length)
                         usec = (length << 3) / 11;
                         break;
                 default:
-                        WL_ERROR(("wl%d: wlc_compute_airtime: unsupported rspec 0x%x\n", wlc->pub->unit, rspec));
+                        WL_ERROR("wl%d: wlc_compute_airtime: unsupported rspec 0x%x\n",
+                                 wlc->pub->unit, rspec);
                         ASSERT((const char *)"Bad phy_rate" == NULL);
                         break;
                 }
@@ -5533,7 +5317,7 @@ wlc_compute_airtime(wlc_info_t *wlc, ratespec_t rspec, uint length)
 }
 
 void BCMFASTPATH
-wlc_compute_plcp(wlc_info_t *wlc, ratespec_t rspec, uint length, u8 *plcp)
+wlc_compute_plcp(struct wlc_info *wlc, ratespec_t rspec, uint length, u8 *plcp)
 {
         if (IS_MCS(rspec)) {
                 wlc_compute_mimo_plcp(rspec, length, plcp);
@@ -5574,7 +5358,7 @@ wlc_compute_ofdm_plcp(ratespec_t rspec, u32 length, u8 *plcp)
         rate_signal = rate_info[rate] & RATE_MASK;
         ASSERT(rate_signal != 0);
 
-        bzero(plcp, D11_PHY_HDR_LEN);
+        memset(plcp, 0, D11_PHY_HDR_LEN);
         D11A_PHY_HDR_SRATE((ofdm_phy_hdr_t *) plcp, rate_signal);
 
         tmp = (length & 0xfff) << 5;
@@ -5619,7 +5403,7 @@ static void wlc_cck_plcp_set(int rate_500, uint length, u8 *plcp)
                 break;
 
         default:
-                WL_ERROR(("wlc_cck_plcp_set: unsupported rate %d\n", rate_500));
+                WL_ERROR("wlc_cck_plcp_set: unsupported rate %d\n", rate_500);
                 rate_500 = WLC_RATE_1M;
                 usec = length << 3;
                 break;
@@ -5657,7 +5441,7 @@ static void wlc_compute_cck_plcp(ratespec_t rspec, uint length, u8 *plcp)
  * preamble_type        use short/GF or long/MM PLCP header
  */
 static u16 BCMFASTPATH
-wlc_compute_frame_dur(wlc_info_t *wlc, ratespec_t rate, u8 preamble_type,
+wlc_compute_frame_dur(struct wlc_info *wlc, ratespec_t rate, u8 preamble_type,
                       uint next_frag_len)
 {
         u16 dur, sifs;
@@ -5691,7 +5475,7 @@ wlc_compute_frame_dur(wlc_info_t *wlc, ratespec_t rate, u8 preamble_type,
  * frame_len            next MPDU frame length in bytes
  */
 u16 BCMFASTPATH
-wlc_compute_rtscts_dur(wlc_info_t *wlc, bool cts_only, ratespec_t rts_rate,
+wlc_compute_rtscts_dur(struct wlc_info *wlc, bool cts_only, ratespec_t rts_rate,
                        ratespec_t frame_rate, u8 rts_preamble_type,
                        u8 frame_preamble_type, uint frame_len, bool ba)
 {
@@ -5722,7 +5506,7 @@ wlc_compute_rtscts_dur(wlc_info_t *wlc, bool cts_only, ratespec_t rts_rate,
         return dur;
 }
 
-static bool wlc_phy_rspec_check(wlc_info_t *wlc, u16 bw, ratespec_t rspec)
+static bool wlc_phy_rspec_check(struct wlc_info *wlc, u16 bw, ratespec_t rspec)
 {
         if (IS_MCS(rspec)) {
                 uint mcs = rspec & RSPEC_RATE_MASK;
@@ -5748,7 +5532,7 @@ static bool wlc_phy_rspec_check(wlc_info_t *wlc, u16 bw, ratespec_t rspec)
         return true;
 }
 
-u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec)
+u16 BCMFASTPATH wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
 {
         u16 phyctl1 = 0;
         u16 bw;
@@ -5759,7 +5543,8 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec)
                 bw = RSPEC_GET_BW(rspec);
                 /* 10Mhz is not supported yet */
                 if (bw < PHY_TXC1_BW_20MHZ) {
-                        WL_ERROR(("wlc_phytxctl1_calc: bw %d is not supported yet, set to 20L\n", bw));
+                        WL_ERROR("wlc_phytxctl1_calc: bw %d is not supported yet, set to 20L\n",
+                                 bw);
                         bw = PHY_TXC1_BW_20MHZ;
                 }
 
@@ -5784,7 +5569,7 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec)
                 /* get the phyctl byte from rate phycfg table */
                 phycfg = wlc_rate_legacy_phyctl(RSPEC2RATE(rspec));
                 if (phycfg == -1) {
-                        WL_ERROR(("wlc_phytxctl1_calc: wrong legacy OFDM/CCK rate\n"));
+                        WL_ERROR("wlc_phytxctl1_calc: wrong legacy OFDM/CCK rate\n");
                         ASSERT(0);
                         phycfg = 0;
                 }
@@ -5798,16 +5583,14 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec)
         /* phy clock must support 40Mhz if tx descriptor uses it */
         if ((phyctl1 & PHY_TXC1_BW_MASK) >= PHY_TXC1_BW_40MHZ) {
                 ASSERT(CHSPEC_WLC_BW(wlc->chanspec) == WLC_40_MHZ);
-#ifndef WLC_HIGH_ONLY
                 ASSERT(wlc->chanspec == wlc_phy_chanspec_get(wlc->band->pi));
-#endif
         }
 #endif                          /* BCMDBG */
         return phyctl1;
 }
 
 ratespec_t BCMFASTPATH
-wlc_rspec_to_rts_rspec(wlc_info_t *wlc, ratespec_t rspec, bool use_rspec,
+wlc_rspec_to_rts_rspec(struct wlc_info *wlc, ratespec_t rspec, bool use_rspec,
                        u16 mimo_ctlchbw)
 {
         ratespec_t rts_rspec = 0;
@@ -5863,15 +5646,15 @@ wlc_rspec_to_rts_rspec(wlc_info_t *wlc, ratespec_t rspec, bool use_rspec,
  *
  */
 static u16 BCMFASTPATH
-wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
-                     void *p, struct scb *scb, uint frag,
+wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
+                     struct sk_buff *p, struct scb *scb, uint frag,
                      uint nfrags, uint queue, uint next_frag_len,
                      wsec_key_t *key, ratespec_t rspec_override)
 {
         struct dot11_header *h;
         d11txh_t *txh;
         u8 *plcp, plcp_fallback[D11_PHY_HDR_LEN];
-        osl_t *osh;
+        struct osl_info *osh;
         int len, phylen, rts_phylen;
         u16 fc, type, frameid, mch, phyctl, xfts, mainrates;
         u16 seq = 0, mcl = 0, status = 0;
@@ -5911,7 +5694,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         osh = wlc->osh;
 
         /* locate 802.11 MAC header */
-        h = (struct dot11_header *)PKTDATA(p);
+        h = (struct dot11_header *)(p->data);
         fc = ltoh16(h->fc);
         type = FC_TYPE(fc);
 
@@ -5935,29 +5718,29 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         ASSERT(tx_info);
 
         /* add PLCP */
-        plcp = PKTPUSH(p, D11_PHY_HDR_LEN);
+        plcp = skb_push(p, D11_PHY_HDR_LEN);
 
         /* add Broadcom tx descriptor header */
-        txh = (d11txh_t *) PKTPUSH(p, D11_TXH_LEN);
-        bzero((char *)txh, D11_TXH_LEN);
+        txh = (d11txh_t *) skb_push(p, D11_TXH_LEN);
+        memset((char *)txh, 0, D11_TXH_LEN);
 
         /* setup frameid */
         if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
                 /* non-AP STA should never use BCMC queue */
                 ASSERT(queue != TX_BCMC_FIFO);
                 if (queue == TX_BCMC_FIFO) {
-                        WL_ERROR(("wl%d: %s: ASSERT queue == TX_BCMC!\n",
-                                  WLCWLUNIT(wlc), __func__));
+                        WL_ERROR("wl%d: %s: ASSERT queue == TX_BCMC!\n",
+                                 WLCWLUNIT(wlc), __func__);
                         frameid = bcmc_fid_generate(wlc, NULL, txh);
                 } else {
                         /* Increment the counter for first fragment */
                         if (tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) {
-                                SCB_SEQNUM(scb, PKTPRIO(p))++;
+                                SCB_SEQNUM(scb, p->priority)++;
                         }
 
                         /* extract fragment number from frame first */
                         seq = ltoh16(seq) & FRAGNUM_MASK;
-                        seq |= (SCB_SEQNUM(scb, PKTPRIO(p)) << SEQNUM_SHIFT);
+                        seq |= (SCB_SEQNUM(scb, p->priority) << SEQNUM_SHIFT);
                         h->seq = htol16(seq);
 
                         frameid = ((seq << TXFID_SEQ_SHIFT) & TXFID_SEQ_MASK) |
@@ -5981,13 +5764,6 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         if (txrate[1]->idx < 0) {
                 txrate[1] = txrate[0];
         }
-#ifdef WLC_HIGH_ONLY
-        /* Double protection , just in case */
-        if (txrate[0]->idx > HIGHEST_SINGLE_STREAM_MCS)
-                txrate[0]->idx = HIGHEST_SINGLE_STREAM_MCS;
-        if (txrate[1]->idx > HIGHEST_SINGLE_STREAM_MCS)
-                txrate[1]->idx = HIGHEST_SINGLE_STREAM_MCS;
-#endif
 
         for (k = 0; k < hw->max_rates; k++) {
                 is_mcs[k] =
@@ -6034,7 +5810,8 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
                         ASSERT(RSPEC_ACTIVE(rspec[k]));
                         rspec[k] = WLC_RATE_1M;
                 } else {
-                        if (WLANTSEL_ENAB(wlc) && !ETHER_ISMULTI(&h->a1)) {
+                        if (WLANTSEL_ENAB(wlc) &&
+                            !is_multicast_ether_addr(h->a1.octet)) {
                                 /* set tx antenna config */
                                 wlc_antsel_antcfg_get(wlc->asi, false, false, 0,
                                                       0, &antcfg, &fbantcfg);
@@ -6131,7 +5908,8 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
 
                         if ((txrate[k]->flags & IEEE80211_TX_RC_MCS)
                             && (!IS_MCS(rspec[k]))) {
-                                WL_ERROR(("wl%d: %s: IEEE80211_TX_RC_MCS != IS_MCS(rspec)\n", WLCWLUNIT(wlc), __func__));
+                                WL_ERROR("wl%d: %s: IEEE80211_TX_RC_MCS != IS_MCS(rspec)\n",
+                                         WLCWLUNIT(wlc), __func__);
                                 ASSERT(0 && "Rate mismatch");
                         }
 
@@ -6195,7 +5973,8 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
             plcp[0];
 
         /* DUR field for main rate */
-        if ((fc != FC_PS_POLL) && !ETHER_ISMULTI(&h->a1) && !use_rifs) {
+        if ((fc != FC_PS_POLL) &&
+            !is_multicast_ether_addr(h->a1.octet) && !use_rifs) {
                 durid =
                     wlc_compute_frame_dur(wlc, rspec[0], preamble_type[0],
                                           next_frag_len);
@@ -6213,7 +5992,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         /* DUR field for fallback rate */
         if (fc == FC_PS_POLL)
                 txh->FragDurFallback = h->durid;
-        else if (ETHER_ISMULTI(&h->a1) || use_rifs)
+        else if (is_multicast_ether_addr(h->a1.octet) || use_rifs)
                 txh->FragDurFallback = 0;
         else {
                 durid = wlc_compute_frame_dur(wlc, rspec[1],
@@ -6225,7 +6004,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         if (frag == 0)
                 mcl |= TXC_STARTMSDU;
 
-        if (!ETHER_ISMULTI(&h->a1))
+        if (!is_multicast_ether_addr(h->a1.octet))
                 mcl |= TXC_IMMEDACK;
 
         if (BAND_5G(wlc->band->bandtype))
@@ -6260,7 +6039,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         txh->TxFesTimeFallback = htol16(0);
 
         /* TxFrameRA */
-        bcopy((char *)&h->a1, (char *)&txh->TxFrameRA, ETHER_ADDR_LEN);
+        bcopy((char *)&h->a1, (char *)&txh->TxFrameRA, ETH_ALEN);
 
         /* TxFrameID */
         txh->TxFrameID = htol16(frameid);
@@ -6347,11 +6126,11 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
 
                 if (use_cts) {
                         rts->fc = htol16(FC_CTS);
-                        bcopy((char *)&h->a2, (char *)&rts->ra, ETHER_ADDR_LEN);
+                        bcopy((char *)&h->a2, (char *)&rts->ra, ETH_ALEN);
                 } else {
                         rts->fc = htol16((u16) FC_RTS);
                         bcopy((char *)&h->a1, (char *)&rts->ra,
-                              2 * ETHER_ADDR_LEN);
+                              2 * ETH_ALEN);
                 }
 
                 /* mainrate
@@ -6362,9 +6141,10 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
                               D11A_PHY_HDR_GRATE((ofdm_phy_hdr_t *) rts_plcp) :
                               rts_plcp[0]) << 8;
         } else {
-                bzero((char *)txh->RTSPhyHeader, D11_PHY_HDR_LEN);
-                bzero((char *)&txh->rts_frame, sizeof(struct dot11_rts_frame));
-                bzero((char *)txh->RTSPLCPFallback,
+                memset((char *)txh->RTSPhyHeader, 0, D11_PHY_HDR_LEN);
+                memset((char *)&txh->rts_frame, 0,
+                        sizeof(struct dot11_rts_frame));
+                memset((char *)txh->RTSPLCPFallback, 0,
                       sizeof(txh->RTSPLCPFallback));
                 txh->RTSDurFallback = 0;
         }
@@ -6453,7 +6233,7 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
         if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {
                 uint frag_dur, dur, dur_fallback;
 
-                ASSERT(!ETHER_ISMULTI(&h->a1));
+                ASSERT(!is_multicast_ether_addr(h->a1.octet));
 
                 /* WME: Update TXOP threshold */
                 if ((!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) && (frag == 0)) {
@@ -6523,19 +6303,23 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
                                         }
                                 }
                         } else
-                                WL_ERROR(("wl%d: %s txop invalid for rate %d\n",
-                                          wlc->pub->unit, fifo_names[queue],
-                                          RSPEC2RATE(rspec[0])));
+                                WL_ERROR("wl%d: %s txop invalid for rate %d\n",
+                                         wlc->pub->unit, fifo_names[queue],
+                                         RSPEC2RATE(rspec[0]));
 
                         if (dur > wlc->edcf_txop[ac])
-                                WL_ERROR(("wl%d: %s: %s txop exceeded phylen %d/%d dur %d/%d\n", wlc->pub->unit, __func__, fifo_names[queue], phylen, wlc->fragthresh[queue], dur, wlc->edcf_txop[ac]));
+                                WL_ERROR("wl%d: %s: %s txop exceeded phylen %d/%d dur %d/%d\n",
+                                         wlc->pub->unit, __func__,
+                                         fifo_names[queue],
+                                         phylen, wlc->fragthresh[queue],
+                                         dur, wlc->edcf_txop[ac]);
                 }
         }
 
         return 0;
 }
 
-void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs)
+void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
 {
         wlc_bsscfg_t *cfg = wlc->cfg;
 
@@ -6571,19 +6355,19 @@ void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs)
 }
 
 /* GP timer is a freerunning 32 bit counter, decrements at 1 us rate */
-void wlc_hwtimer_gptimer_set(wlc_info_t *wlc, uint us)
+void wlc_hwtimer_gptimer_set(struct wlc_info *wlc, uint us)
 {
         ASSERT(wlc->pub->corerev >= 3); /* no gptimer in earlier revs */
         W_REG(wlc->osh, &wlc->regs->gptimer, us);
 }
 
-void wlc_hwtimer_gptimer_abort(wlc_info_t *wlc)
+void wlc_hwtimer_gptimer_abort(struct wlc_info *wlc)
 {
         ASSERT(wlc->pub->corerev >= 3);
         W_REG(wlc->osh, &wlc->regs->gptimer, 0);
 }
 
-static void wlc_hwtimer_gptimer_cb(wlc_info_t *wlc)
+static void wlc_hwtimer_gptimer_cb(struct wlc_info *wlc)
 {
         /* when interrupt is generated, the counter is loaded with last value
          * written and continue to decrement. So it has to be cleaned first
@@ -6596,7 +6380,7 @@ static void wlc_hwtimer_gptimer_cb(wlc_info_t *wlc)
  * POLICY: no macinstatus change, no bounding loop.
  *         All dpc bounding should be handled in BMAC dpc, like txstatus and rxint
  */
-void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
+void wlc_high_dpc(struct wlc_info *wlc, u32 macintstatus)
 {
         d11regs_t *regs = wlc->regs;
 #ifdef BCMDBG
@@ -6634,8 +6418,8 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
         if (macintstatus & ~(MI_TBTT | MI_TXSTOP)) {
                 bcm_format_flags(int_flags, macintstatus, flagstr,
                                  sizeof(flagstr));
-                WL_TRACE(("wl%d: macintstatus 0x%x %s\n", wlc->pub->unit,
-                          macintstatus, flagstr));
+                WL_TRACE("wl%d: macintstatus 0x%x %s\n",
+                         wlc->pub->unit, macintstatus, flagstr);
         }
 #endif                          /* BCMDBG */
 
@@ -6650,11 +6434,12 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
                 wlc_tbtt(wlc, regs);
 
         if (macintstatus & MI_GP0) {
-                WL_ERROR(("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n", wlc->pub->unit, wlc->pub->now));
+                WL_ERROR("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n",
+                         wlc->pub->unit, wlc->pub->now);
 
                 printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
-                            __func__, CHIPID(wlc->pub->sih->chip),
-                            CHIPREV(wlc->pub->sih->chiprev));
+                                        __func__, wlc->pub->sih->chip,
+                                        wlc->pub->sih->chiprev);
 
                 WLCNTINCR(wlc->pub->_cnt->psmwds);
 
@@ -6668,7 +6453,9 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
         }
 
         if (macintstatus & MI_RFDISABLE) {
-                WL_ERROR(("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n", wlc->pub->unit, R_REG(wlc->osh, &regs->phydebug) & PDBG_RFD));
+                WL_ERROR("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n",
+                         wlc->pub->unit,
+                         R_REG(wlc->osh, &regs->phydebug) & PDBG_RFD);
                 /* delay the cleanup to wl_down in IBSS case */
                 if ((R_REG(wlc->osh, &regs->phydebug) & PDBG_RFD)) {
                         int idx;
@@ -6677,7 +6464,8 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
                                 if (!BSSCFG_STA(bsscfg) || !bsscfg->enable
                                     || !bsscfg->BSS)
                                         continue;
-                                WL_ERROR(("wl%d: wlc_dpc: rfdisable -> wlc_bsscfg_disable()\n", wlc->pub->unit));
+                                WL_ERROR("wl%d: wlc_dpc: rfdisable -> wlc_bsscfg_disable()\n",
+                                         wlc->pub->unit);
                         }
                 }
         }
@@ -6686,14 +6474,12 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
         if (!pktq_empty(&wlc->active_queue->q))
                 wlc_send_q(wlc, wlc->active_queue);
 
-#ifndef WLC_HIGH_ONLY
         ASSERT(wlc_ps_check(wlc));
-#endif
 }
 
-static void *wlc_15420war(wlc_info_t *wlc, uint queue)
+static void *wlc_15420war(struct wlc_info *wlc, uint queue)
 {
-        hnddma_t *di;
+        struct hnddma_pub *di;
         void *p;
 
         ASSERT(queue < NFIFO);
@@ -6715,13 +6501,14 @@ static void *wlc_15420war(wlc_info_t *wlc, uint queue)
         if (dma_txactive(wlc->hw->di[queue]) == 0) {
                 WLCNTINCR(wlc->pub->_cnt->txdmawar);
                 if (!dma_txreset(di))
-                        WL_ERROR(("wl%d: %s: dma_txreset[%d]: cannot stop dma\n", wlc->pub->unit, __func__, queue));
+                        WL_ERROR("wl%d: %s: dma_txreset[%d]: cannot stop dma\n",
+                                 wlc->pub->unit, __func__, queue);
                 dma_txinit(di);
         }
         return p;
 }
 
-static void wlc_war16165(wlc_info_t *wlc, bool tx)
+static void wlc_war16165(struct wlc_info *wlc, bool tx)
 {
         if (tx) {
                 /* the post-increment is used in STAY_AWAKE macro */
@@ -6737,14 +6524,14 @@ static void wlc_war16165(wlc_info_t *wlc, bool tx)
 /* process an individual tx_status_t */
 /* WLC_HIGH_API */
 bool BCMFASTPATH
-wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
+wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
 {
-        void *p;
+        struct sk_buff *p;
         uint queue;
         d11txh_t *txh;
         struct scb *scb = NULL;
         bool free_pdu;
-        osl_t *osh;
+        struct osl_info *osh;
         int tx_rts, tx_frame_count, tx_rts_count;
         uint totlen, supr_status;
         bool lastframe;
@@ -6768,7 +6555,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
                          ((txs->
                            status & TX_STATUS_FRM_RTX_MASK) >>
                           TX_STATUS_FRM_RTX_SHIFT));
-                WL_ERROR(("%s: INTERMEDIATE but not AMPDU\n", __func__));
+                WL_ERROR("%s: INTERMEDIATE but not AMPDU\n", __func__);
                 return false;
         }
 
@@ -6789,12 +6576,12 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
         if (p == NULL)
                 goto fatal;
 
-        txh = (d11txh_t *) PKTDATA(p);
+        txh = (d11txh_t *) (p->data);
         mcl = ltoh16(txh->MacTxControlLow);
 
         if (txs->phyerr) {
-                WL_ERROR(("phyerr 0x%x, rate 0x%x\n", txs->phyerr,
-                          txh->MainRates));
+                WL_ERROR("phyerr 0x%x, rate 0x%x\n",
+                         txs->phyerr, txh->MainRates);
                 wlc_print_txdesc(txh);
                 wlc_print_txstatus(txs);
         }
@@ -6825,8 +6612,8 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
 
         supr_status = txs->status & TX_STATUS_SUPR_MASK;
         if (supr_status == TX_STATUS_SUPR_BADCH)
-                WL_NONE(("%s: Pkt tx suppressed, possibly channel %d\n",
-                         __func__, CHSPEC_CHANNEL(wlc->default_bss->chanspec)));
+                WL_NONE("%s: Pkt tx suppressed, possibly channel %d\n",
+                        __func__, CHSPEC_CHANNEL(wlc->default_bss->chanspec));
 
         tx_rts = htol16(txh->MacTxControlLow) & TXC_SENDRTS;
         tx_frame_count =
@@ -6837,7 +6624,7 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
         lastframe = (fc & FC_MOREFRAG) == 0;
 
         if (!lastframe) {
-                WL_ERROR(("Not last frame!\n"));
+                WL_ERROR("Not last frame!\n");
         } else {
                 u16 sfbl, lfbl;
                 ieee80211_tx_info_clear_status(tx_info);
@@ -6879,17 +6666,17 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
         wlc_txfifo_complete(wlc, queue, 1);
 
         if (lastframe) {
-                PKTSETNEXT(p, NULL);
-                PKTSETLINK(p, NULL);
+                p->next = NULL;
+                p->prev = NULL;
                 wlc->txretried = 0;
                 /* remove PLCP & Broadcom tx descriptor header */
-                PKTPULL(p, D11_PHY_HDR_LEN);
-                PKTPULL(p, D11_TXH_LEN);
+                skb_pull(p, D11_PHY_HDR_LEN);
+                skb_pull(p, D11_TXH_LEN);
                 ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p);
                 WLCNTINCR(wlc->pub->_cnt->ieee_tx_status);
         } else {
-                WL_ERROR(("%s: Not last frame => not calling tx_status\n",
-                          __func__));
+                WL_ERROR("%s: Not last frame => not calling tx_status\n",
+                         __func__);
         }
 
         return false;
@@ -6897,24 +6684,18 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
  fatal:
         ASSERT(0);
         if (p)
-                PKTFREE(osh, p, true);
+                pkt_buf_free_skb(osh, p, true);
 
-#ifdef WLC_HIGH_ONLY
-        /* If this is a split driver, do the big-hammer here.
-         * If this is a monolithic driver, wlc_bmac.c:wlc_dpc() will do the big-hammer.
-         */
-        wl_init(wlc->wl);
-#endif
         return true;
 
 }
 
 void BCMFASTPATH
-wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend)
+wlc_txfifo_complete(struct wlc_info *wlc, uint fifo, s8 txpktpend)
 {
         TXPKTPENDDEC(wlc, fifo, txpktpend);
-        WL_TRACE(("wlc_txfifo_complete, pktpend dec %d to %d\n", txpktpend,
-                  TXPKTPENDGET(wlc, fifo)));
+        WL_TRACE("wlc_txfifo_complete, pktpend dec %d to %d\n",
+                 txpktpend, TXPKTPENDGET(wlc, fifo));
 
         /* There is more room; mark precedences related to this FIFO sendable */
         WLC_TX_FIFO_ENAB(wlc, fifo);
@@ -7014,7 +6795,7 @@ u32 wlc_calc_tbtt_offset(u32 bp, u32 tsf_h, u32 tsf_l)
 }
 
 /* Update beacon listen interval in shared memory */
-void wlc_bcn_li_upd(wlc_info_t *wlc)
+void wlc_bcn_li_upd(struct wlc_info *wlc)
 {
         if (AP_ENAB(wlc->pub))
                 return;
@@ -7028,7 +6809,7 @@ void wlc_bcn_li_upd(wlc_info_t *wlc)
 }
 
 static void
-prep_mac80211_status(wlc_info_t *wlc, d11rxhdr_t *rxh, void *p,
+prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
                      struct ieee80211_rx_status *rx_status)
 {
         u32 tsf_l, tsf_h;
@@ -7061,7 +6842,7 @@ prep_mac80211_status(wlc_info_t *wlc, d11rxhdr_t *rxh, void *p,
         /* qual */
         rx_status->antenna = (rxh->PhyRxStatus_0 & PRXS0_RXANT_UPSUBBAND) ? 1 : 0;      /* ant */
 
-        plcp = PKTDATA(p);
+        plcp = p->data;
 
         rspec = wlc_compute_rspec(rxh, plcp);
         if (IS_MCS(rspec)) {
@@ -7108,19 +6889,19 @@ prep_mac80211_status(wlc_info_t *wlc, d11rxhdr_t *rxh, void *p,
                         rx_status->rate_idx = 11;
                         break;
                 default:
-                        WL_ERROR(("%s: Unknown rate\n", __func__));
+                        WL_ERROR("%s: Unknown rate\n", __func__);
                 }
 
                 /* Determine short preamble and rate_idx */
                 preamble = 0;
                 if (IS_CCK(rspec)) {
                         if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
-                                WL_ERROR(("Short CCK\n"));
+                                WL_ERROR("Short CCK\n");
                         rx_status->flag |= RX_FLAG_SHORTPRE;
                 } else if (IS_OFDM(rspec)) {
                         rx_status->flag |= RX_FLAG_SHORTPRE;
                 } else {
-                        WL_ERROR(("%s: Unknown modulation\n", __func__));
+                        WL_ERROR("%s: Unknown modulation\n", __func__);
                 }
         }
 
@@ -7129,16 +6910,17 @@ prep_mac80211_status(wlc_info_t *wlc, d11rxhdr_t *rxh, void *p,
 
         if (rxh->RxStatus1 & RXS_DECERR) {
                 rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC;
-                WL_ERROR(("%s:  RX_FLAG_FAILED_PLCP_CRC\n", __func__));
+                WL_ERROR("%s:  RX_FLAG_FAILED_PLCP_CRC\n", __func__);
         }
         if (rxh->RxStatus1 & RXS_FCSERR) {
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
-                WL_ERROR(("%s:  RX_FLAG_FAILED_FCS_CRC\n", __func__));
+                WL_ERROR("%s:  RX_FLAG_FAILED_FCS_CRC\n", __func__);
         }
 }
 
 static void
-wlc_recvctl(wlc_info_t *wlc, osl_t *osh, d11rxhdr_t *rxh, void *p)
+wlc_recvctl(struct wlc_info *wlc, struct osl_info *osh, d11rxhdr_t *rxh,
+            struct sk_buff *p)
 {
         int len_mpdu;
         struct ieee80211_rx_status rx_status;
@@ -7155,12 +6937,12 @@ wlc_recvctl(wlc_info_t *wlc, osl_t *osh, d11rxhdr_t *rxh, void *p)
         prep_mac80211_status(wlc, rxh, p, &rx_status);
 
         /* mac header+body length, exclude CRC and plcp header */
-        len_mpdu = PKTLEN(p) - D11_PHY_HDR_LEN - DOT11_FCS_LEN;
-        PKTPULL(p, D11_PHY_HDR_LEN);
-        PKTSETLEN(p, len_mpdu);
+        len_mpdu = p->len - D11_PHY_HDR_LEN - DOT11_FCS_LEN;
+        skb_pull(p, D11_PHY_HDR_LEN);
+        __skb_trim(p, len_mpdu);
 
-        ASSERT(!PKTNEXT(p));
-        ASSERT(!PKTLINK(p));
+        ASSERT(!(p->next));
+        ASSERT(!(p->prev));
 
         ASSERT(IS_ALIGNED((unsigned long)skb->data, 2));
 
@@ -7168,17 +6950,17 @@ wlc_recvctl(wlc_info_t *wlc, osl_t *osh, d11rxhdr_t *rxh, void *p)
         ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
 
         WLCNTINCR(wlc->pub->_cnt->ieee_rx);
-        PKTUNALLOC(osh);
+        osh->pktalloced--;
         return;
 }
 
-void wlc_bss_list_free(wlc_info_t *wlc, wlc_bss_list_t *bss_list)
+void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list)
 {
         uint index;
         wlc_bss_info_t *bi;
 
         if (!bss_list) {
-                WL_ERROR(("%s: Attempting to free NULL list\n", __func__));
+                WL_ERROR("%s: Attempting to free NULL list\n", __func__);
                 return;
         }
         /* inspect all BSS descriptor */
@@ -7201,48 +6983,48 @@ void wlc_bss_list_free(wlc_info_t *wlc, wlc_bss_list_t *bss_list)
  * Param 'bound' indicates max. # frames to process before break out.
  */
 /* WLC_HIGH_API */
-void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p)
+void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
 {
         d11rxhdr_t *rxh;
         struct dot11_header *h;
-        osl_t *osh;
+        struct osl_info *osh;
         u16 fc;
         uint len;
         bool is_amsdu;
 
-        WL_TRACE(("wl%d: wlc_recv\n", wlc->pub->unit));
+        WL_TRACE("wl%d: wlc_recv\n", wlc->pub->unit);
 
         osh = wlc->osh;
 
         /* frame starts with rxhdr */
-        rxh = (d11rxhdr_t *) PKTDATA(p);
+        rxh = (d11rxhdr_t *) (p->data);
 
         /* strip off rxhdr */
-        PKTPULL(p, wlc->hwrxoff);
+        skb_pull(p, wlc->hwrxoff);
 
         /* fixup rx header endianness */
         ltoh16_buf((void *)rxh, sizeof(d11rxhdr_t));
 
         /* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */
         if (rxh->RxStatus1 & RXS_PBPRES) {
-                if (PKTLEN(p) < 2) {
+                if (p->len < 2) {
                         WLCNTINCR(wlc->pub->_cnt->rxrunt);
-                        WL_ERROR(("wl%d: wlc_recv: rcvd runt of len %d\n",
-                                  wlc->pub->unit, PKTLEN(p)));
+                        WL_ERROR("wl%d: wlc_recv: rcvd runt of len %d\n",
+                                 wlc->pub->unit, p->len);
                         goto toss;
                 }
-                PKTPULL(p, 2);
+                skb_pull(p, 2);
         }
 
-        h = (struct dot11_header *)(PKTDATA(p) + D11_PHY_HDR_LEN);
-        len = PKTLEN(p);
+        h = (struct dot11_header *)(p->data + D11_PHY_HDR_LEN);
+        len = p->len;
 
         if (rxh->RxStatus1 & RXS_FCSERR) {
                 if (wlc->pub->mac80211_state & MAC80211_PROMISC_BCNS) {
-                        WL_ERROR(("FCSERR while scanning******* - tossing\n"));
+                        WL_ERROR("FCSERR while scanning******* - tossing\n");
                         goto toss;
                 } else {
-                        WL_ERROR(("RCSERR!!!\n"));
+                        WL_ERROR("RCSERR!!!\n");
                         goto toss;
                 }
         }
@@ -7261,10 +7043,10 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p)
         if (!is_amsdu) {
                 /* CTS and ACK CTL frames are w/o a2 */
                 if (FC_TYPE(fc) == FC_TYPE_DATA || FC_TYPE(fc) == FC_TYPE_MNG) {
-                        if ((ETHER_ISNULLADDR(&h->a2) || ETHER_ISMULTI(&h->a2))) {
-                                WL_ERROR(("wl%d: %s: dropping a frame with "
-                                        "invalid src mac address, a2: %pM\n",
-                                        wlc->pub->unit, __func__, &h->a2));
+                        if ((is_zero_ether_addr(h->a2.octet) ||
+                             is_multicast_ether_addr(h->a2.octet))) {
+                                WL_ERROR("wl%d: %s: dropping a frame with invalid src mac address, a2: %pM\n",
+                                         wlc->pub->unit, __func__, &h->a2);
                                 WLCNTINCR(wlc->pub->_cnt->rxbadsrcmac);
                                 goto toss;
                         }
@@ -7279,7 +7061,7 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p)
         }
 
         if (is_amsdu) {
-                WL_ERROR(("%s: is_amsdu causing toss\n", __func__));
+                WL_ERROR("%s: is_amsdu causing toss\n", __func__);
                 goto toss;
         }
 
@@ -7287,7 +7069,7 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p)
         return;
 
  toss:
-        PKTFREE(osh, p, false);
+        pkt_buf_free_skb(osh, p, false);
 }
 
 /* calculate frame duration for Mixed-mode L-SIG spoofing, return
@@ -7297,12 +7079,12 @@ void BCMFASTPATH wlc_recv(wlc_info_t *wlc, void *p)
  *   len = 3(nsyms + nstream + 3) - 3
  */
 u16 BCMFASTPATH
-wlc_calc_lsig_len(wlc_info_t *wlc, ratespec_t ratespec, uint mac_len)
+wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec, uint mac_len)
 {
         uint nsyms, len = 0, kNdps;
 
-        WL_TRACE(("wl%d: wlc_calc_lsig_len: rate %d, len%d\n", wlc->pub->unit,
-                  RSPEC2RATE(ratespec), mac_len));
+        WL_TRACE("wl%d: wlc_calc_lsig_len: rate %d, len%d\n",
+                 wlc->pub->unit, RSPEC2RATE(ratespec), mac_len);
 
         if (IS_MCS(ratespec)) {
                 uint mcs = ratespec & RSPEC_RATE_MASK;
@@ -7338,7 +7120,7 @@ wlc_calc_lsig_len(wlc_info_t *wlc, ratespec_t ratespec, uint mac_len)
 
 /* calculate frame duration of a given rate and length, return time in usec unit */
 uint BCMFASTPATH
-wlc_calc_frame_time(wlc_info_t *wlc, ratespec_t ratespec, u8 preamble_type,
+wlc_calc_frame_time(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
                     uint mac_len)
 {
         uint nsyms, dur = 0, Ndps, kNdps;
@@ -7346,11 +7128,12 @@ wlc_calc_frame_time(wlc_info_t *wlc, ratespec_t ratespec, u8 preamble_type,
 
         if (rate == 0) {
                 ASSERT(0);
-                WL_ERROR(("wl%d: WAR: using rate of 1 mbps\n", wlc->pub->unit));
+                WL_ERROR("wl%d: WAR: using rate of 1 mbps\n", wlc->pub->unit);
                 rate = WLC_RATE_1M;
         }
 
-        WL_TRACE(("wl%d: wlc_calc_frame_time: rspec 0x%x, preamble_type %d, len%d\n", wlc->pub->unit, ratespec, preamble_type, mac_len));
+        WL_TRACE("wl%d: wlc_calc_frame_time: rspec 0x%x, preamble_type %d, len%d\n",
+                 wlc->pub->unit, ratespec, preamble_type, mac_len);
 
         if (IS_MCS(ratespec)) {
                 uint mcs = ratespec & RSPEC_RATE_MASK;
@@ -7408,13 +7191,14 @@ wlc_calc_frame_time(wlc_info_t *wlc, ratespec_t ratespec, u8 preamble_type,
 
 /* The opposite of wlc_calc_frame_time */
 static uint
-wlc_calc_frame_len(wlc_info_t *wlc, ratespec_t ratespec, u8 preamble_type,
+wlc_calc_frame_len(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
                    uint dur)
 {
         uint nsyms, mac_len, Ndps, kNdps;
         uint rate = RSPEC2RATE(ratespec);
 
-        WL_TRACE(("wl%d: wlc_calc_frame_len: rspec 0x%x, preamble_type %d, dur %d\n", wlc->pub->unit, ratespec, preamble_type, dur));
+        WL_TRACE("wl%d: wlc_calc_frame_len: rspec 0x%x, preamble_type %d, dur %d\n",
+                 wlc->pub->unit, ratespec, preamble_type, dur);
 
         if (IS_MCS(ratespec)) {
                 uint mcs = ratespec & RSPEC_RATE_MASK;
@@ -7454,10 +7238,10 @@ wlc_calc_frame_len(wlc_info_t *wlc, ratespec_t ratespec, u8 preamble_type,
 }
 
 static uint
-wlc_calc_ba_time(wlc_info_t *wlc, ratespec_t rspec, u8 preamble_type)
+wlc_calc_ba_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
-        WL_TRACE(("wl%d: wlc_calc_ba_time: rspec 0x%x, preamble_type %d\n",
-                  wlc->pub->unit, rspec, preamble_type));
+        WL_TRACE("wl%d: wlc_calc_ba_time: rspec 0x%x, preamble_type %d\n",
+                 wlc->pub->unit, rspec, preamble_type);
         /* Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that is less than
          * or equal to the rate of the immediately previous frame in the FES
          */
@@ -7471,12 +7255,12 @@ wlc_calc_ba_time(wlc_info_t *wlc, ratespec_t rspec, u8 preamble_type)
 }
 
 static uint BCMFASTPATH
-wlc_calc_ack_time(wlc_info_t *wlc, ratespec_t rspec, u8 preamble_type)
+wlc_calc_ack_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
         uint dur = 0;
 
-        WL_TRACE(("wl%d: wlc_calc_ack_time: rspec 0x%x, preamble_type %d\n",
-                  wlc->pub->unit, rspec, preamble_type));
+        WL_TRACE("wl%d: wlc_calc_ack_time: rspec 0x%x, preamble_type %d\n",
+                 wlc->pub->unit, rspec, preamble_type);
         /* Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that is less than
          * or equal to the rate of the immediately previous frame in the FES
          */
@@ -7491,15 +7275,15 @@ wlc_calc_ack_time(wlc_info_t *wlc, ratespec_t rspec, u8 preamble_type)
 }
 
 static uint
-wlc_calc_cts_time(wlc_info_t *wlc, ratespec_t rspec, u8 preamble_type)
+wlc_calc_cts_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
-        WL_TRACE(("wl%d: wlc_calc_cts_time: ratespec 0x%x, preamble_type %d\n",
-                  wlc->pub->unit, rspec, preamble_type));
+        WL_TRACE("wl%d: wlc_calc_cts_time: ratespec 0x%x, preamble_type %d\n",
+                 wlc->pub->unit, rspec, preamble_type);
         return wlc_calc_ack_time(wlc, rspec, preamble_type);
 }
 
 /* derive wlc->band->basic_rate[] table from 'rateset' */
-void wlc_rate_lookup_init(wlc_info_t *wlc, wlc_rateset_t *rateset)
+void wlc_rate_lookup_init(struct wlc_info *wlc, wlc_rateset_t *rateset)
 {
         u8 rate;
         u8 mandatory;
@@ -7509,7 +7293,7 @@ void wlc_rate_lookup_init(wlc_info_t *wlc, wlc_rateset_t *rateset)
         uint i;
 
         /* incoming rates are in 500kbps units as in 802.11 Supported Rates */
-        bzero(br, WLC_MAXRATE + 1);
+        memset(br, 0, WLC_MAXRATE + 1);
 
         /* For each basic rate in the rates list, make an entry in the
          * best basic lookup.
@@ -7523,7 +7307,8 @@ void wlc_rate_lookup_init(wlc_info_t *wlc, wlc_rateset_t *rateset)
                 rate = (rateset->rates[i] & RATE_MASK);
 
                 if (rate > WLC_MAXRATE) {
-                        WL_ERROR(("wlc_rate_lookup_init: invalid rate 0x%X in rate set\n", rateset->rates[i]));
+                        WL_ERROR("wlc_rate_lookup_init: invalid rate 0x%X in rate set\n",
+                                 rateset->rates[i]);
                         continue;
                 }
 
@@ -7588,7 +7373,7 @@ void wlc_rate_lookup_init(wlc_info_t *wlc, wlc_rateset_t *rateset)
         }
 }
 
-static void wlc_write_rate_shm(wlc_info_t *wlc, u8 rate, u8 basic_rate)
+static void wlc_write_rate_shm(struct wlc_info *wlc, u8 rate, u8 basic_rate)
 {
         u8 phy_rate, index;
         u8 basic_phy_rate, basic_index;
@@ -7621,7 +7406,7 @@ static void wlc_write_rate_shm(wlc_info_t *wlc, u8 rate, u8 basic_rate)
         wlc_write_shm(wlc, (basic_table + index * 2), basic_ptr);
 }
 
-static const wlc_rateset_t *wlc_rateset_get_hwrs(wlc_info_t *wlc)
+static const wlc_rateset_t *wlc_rateset_get_hwrs(struct wlc_info *wlc)
 {
         const wlc_rateset_t *rs_dflt;
 
@@ -7638,7 +7423,7 @@ static const wlc_rateset_t *wlc_rateset_get_hwrs(wlc_info_t *wlc)
         return rs_dflt;
 }
 
-void wlc_set_ratetable(wlc_info_t *wlc)
+void wlc_set_ratetable(struct wlc_info *wlc)
 {
         const wlc_rateset_t *rs_dflt;
         wlc_rateset_t rs;
@@ -7674,7 +7459,8 @@ void wlc_set_ratetable(wlc_info_t *wlc)
  * Return true if the specified rate is supported by the specified band.
  * WLC_BAND_AUTO indicates the current band.
  */
-bool wlc_valid_rate(wlc_info_t *wlc, ratespec_t rspec, int band, bool verbose)
+bool wlc_valid_rate(struct wlc_info *wlc, ratespec_t rspec, int band,
+                    bool verbose)
 {
         wlc_rateset_t *hw_rateset;
         uint i;
@@ -7701,16 +7487,17 @@ bool wlc_valid_rate(wlc_info_t *wlc, ratespec_t rspec, int band, bool verbose)
                         return true;
  error:
         if (verbose) {
-                WL_ERROR(("wl%d: wlc_valid_rate: rate spec 0x%x not in hw_rateset\n", wlc->pub->unit, rspec));
+                WL_ERROR("wl%d: wlc_valid_rate: rate spec 0x%x not in hw_rateset\n",
+                         wlc->pub->unit, rspec);
         }
 
         return false;
 }
 
-static void wlc_update_mimo_band_bwcap(wlc_info_t *wlc, u8 bwcap)
+static void wlc_update_mimo_band_bwcap(struct wlc_info *wlc, u8 bwcap)
 {
         uint i;
-        wlcband_t *band;
+        struct wlcband *band;
 
         for (i = 0; i < NBANDS(wlc); i++) {
                 if (IS_SINGLEBAND_5G(wlc->deviceid))
@@ -7734,7 +7521,7 @@ static void wlc_update_mimo_band_bwcap(wlc_info_t *wlc, u8 bwcap)
         wlc->mimo_band_bwcap = bwcap;
 }
 
-void wlc_mod_prb_rsp_rate_table(wlc_info_t *wlc, uint frame_len)
+void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len)
 {
         const wlc_rateset_t *rs_dflt;
         wlc_rateset_t rs;
@@ -7777,14 +7564,14 @@ void wlc_mod_prb_rsp_rate_table(wlc_info_t *wlc, uint frame_len)
 }
 
 u16
-wlc_compute_bcntsfoff(wlc_info_t *wlc, ratespec_t rspec, bool short_preamble,
-                      bool phydelay)
+wlc_compute_bcntsfoff(struct wlc_info *wlc, ratespec_t rspec,
+                      bool short_preamble, bool phydelay)
 {
         uint bcntsfoff = 0;
 
         if (IS_MCS(rspec)) {
-                WL_ERROR(("wl%d: recd beacon with mcs rate; rspec 0x%x\n",
-                          wlc->pub->unit, rspec));
+                WL_ERROR("wl%d: recd beacon with mcs rate; rspec 0x%x\n",
+                         wlc->pub->unit, rspec);
         } else if (IS_OFDM(rspec)) {
                 /* tx delay from MAC through phy to air (2.1 usec) +
                  * phy header time (preamble + PLCP SIGNAL == 20 usec) +
@@ -7824,7 +7611,7 @@ wlc_compute_bcntsfoff(wlc_info_t *wlc, ratespec_t rspec, bool short_preamble,
  *      and included up to, but not including, the 4 byte FCS.
  */
 static void
-wlc_bcn_prb_template(wlc_info_t *wlc, uint type, ratespec_t bcn_rspec,
+wlc_bcn_prb_template(struct wlc_info *wlc, uint type, ratespec_t bcn_rspec,
                      wlc_bsscfg_t *cfg, u16 *buf, int *len)
 {
         cck_phy_hdr_t *plcp;
@@ -7843,7 +7630,7 @@ wlc_bcn_prb_template(wlc_info_t *wlc, uint type, ratespec_t bcn_rspec,
         *len = hdr_len + body_len;      /* return actual size */
 
         /* format PHY and MAC headers */
-        bzero((char *)buf, hdr_len);
+        memset((char *)buf, 0, hdr_len);
 
         plcp = (cck_phy_hdr_t *) buf;
 
@@ -7872,9 +7659,9 @@ wlc_bcn_prb_template(wlc_info_t *wlc, uint type, ratespec_t bcn_rspec,
         /* A1 filled in by MAC for prb resp, broadcast for bcn */
         if (type == FC_BEACON)
                 bcopy((const char *)&ether_bcast, (char *)&h->da,
-                      ETHER_ADDR_LEN);
-        bcopy((char *)&cfg->cur_etheraddr, (char *)&h->sa, ETHER_ADDR_LEN);
-        bcopy((char *)&cfg->BSSID, (char *)&h->bssid, ETHER_ADDR_LEN);
+                      ETH_ALEN);
+        bcopy((char *)&cfg->cur_etheraddr, (char *)&h->sa, ETH_ALEN);
+        bcopy((char *)&cfg->BSSID, (char *)&h->bssid, ETH_ALEN);
 
         /* SEQ filled in by MAC */
 
@@ -7891,7 +7678,7 @@ int wlc_get_header_len()
  * template updated.
  * Otherwise, it updates the hardware template.
  */
-void wlc_bss_update_beacon(wlc_info_t *wlc, wlc_bsscfg_t *cfg)
+void wlc_bss_update_beacon(struct wlc_info *wlc, wlc_bsscfg_t *cfg)
 {
         int len = BCN_TMPL_LEN;
 
@@ -7907,7 +7694,7 @@ void wlc_bss_update_beacon(wlc_info_t *wlc, wlc_bsscfg_t *cfg)
                 u16 bcn[BCN_TMPL_LEN / 2];
                 u32 both_valid = MCMD_BCN0VLD | MCMD_BCN1VLD;
                 d11regs_t *regs = wlc->regs;
-                osl_t *osh = NULL;
+                struct osl_info *osh = NULL;
 
                 osh = wlc->osh;
 
@@ -7944,7 +7731,7 @@ void wlc_bss_update_beacon(wlc_info_t *wlc, wlc_bsscfg_t *cfg)
 /*
  * Update all beacons for the system.
  */
-void wlc_update_beacon(wlc_info_t *wlc)
+void wlc_update_beacon(struct wlc_info *wlc)
 {
         int idx;
         wlc_bsscfg_t *bsscfg;
@@ -7957,14 +7744,14 @@ void wlc_update_beacon(wlc_info_t *wlc)
 }
 
 /* Write ssid into shared memory */
-void wlc_shm_ssid_upd(wlc_info_t *wlc, wlc_bsscfg_t *cfg)
+void wlc_shm_ssid_upd(struct wlc_info *wlc, wlc_bsscfg_t *cfg)
 {
         u8 *ssidptr = cfg->SSID;
         u16 base = M_SSID;
         u8 ssidbuf[DOT11_MAX_SSID_LEN];
 
         /* padding the ssid with zero and copy it into shm */
-        bzero(ssidbuf, DOT11_MAX_SSID_LEN);
+        memset(ssidbuf, 0, DOT11_MAX_SSID_LEN);
         bcopy(ssidptr, ssidbuf, cfg->SSID_len);
 
         wlc_copyto_shm(wlc, base, ssidbuf, DOT11_MAX_SSID_LEN);
@@ -7973,7 +7760,7 @@ void wlc_shm_ssid_upd(wlc_info_t *wlc, wlc_bsscfg_t *cfg)
                 wlc_write_shm(wlc, M_SSIDLEN, (u16) cfg->SSID_len);
 }
 
-void wlc_update_probe_resp(wlc_info_t *wlc, bool suspend)
+void wlc_update_probe_resp(struct wlc_info *wlc, bool suspend)
 {
         int idx;
         wlc_bsscfg_t *bsscfg;
@@ -7986,7 +7773,7 @@ void wlc_update_probe_resp(wlc_info_t *wlc, bool suspend)
 }
 
 void
-wlc_bss_update_probe_resp(wlc_info_t *wlc, wlc_bsscfg_t *cfg, bool suspend)
+wlc_bss_update_probe_resp(struct wlc_info *wlc, wlc_bsscfg_t *cfg, bool suspend)
 {
         u16 prb_resp[BCN_TMPL_LEN / 2];
         int len = BCN_TMPL_LEN;
@@ -8027,9 +7814,9 @@ wlc_bss_update_probe_resp(wlc_info_t *wlc, wlc_bsscfg_t *cfg, bool suspend)
 }
 
 /* prepares pdu for transmission. returns BCM error codes */
-int wlc_prep_pdu(wlc_info_t *wlc, void *pdu, uint *fifop)
+int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifop)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         uint fifo;
         d11txh_t *txh;
         struct dot11_header *h;
@@ -8039,7 +7826,7 @@ int wlc_prep_pdu(wlc_info_t *wlc, void *pdu, uint *fifop)
         osh = wlc->osh;
 
         ASSERT(pdu);
-        txh = (d11txh_t *) PKTDATA(pdu);
+        txh = (d11txh_t *) (pdu->data);
         ASSERT(txh);
         h = (struct dot11_header *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
         ASSERT(h);
@@ -8066,7 +7853,7 @@ int wlc_prep_pdu(wlc_info_t *wlc, void *pdu, uint *fifop)
 }
 
 /* init tx reported rate mechanism */
-void wlc_reprate_init(wlc_info_t *wlc)
+void wlc_reprate_init(struct wlc_info *wlc)
 {
         int i;
         wlc_bsscfg_t *bsscfg;
@@ -8080,13 +7867,13 @@ void wlc_reprate_init(wlc_info_t *wlc)
 void wlc_bsscfg_reprate_init(wlc_bsscfg_t *bsscfg)
 {
         bsscfg->txrspecidx = 0;
-        bzero((char *)bsscfg->txrspec, sizeof(bsscfg->txrspec));
+        memset((char *)bsscfg->txrspec, 0, sizeof(bsscfg->txrspec));
 }
 
 /* Retrieve a consolidated set of revision information,
  * typically for the WLC_GET_REVINFO ioctl
  */
-int wlc_get_revision_info(wlc_info_t *wlc, void *buf, uint len)
+int wlc_get_revision_info(struct wlc_info *wlc, void *buf, uint len)
 {
         wlc_rev_info_t *rinfo = (wlc_rev_info_t *) buf;
 
@@ -8120,7 +7907,7 @@ int wlc_get_revision_info(wlc_info_t *wlc, void *buf, uint len)
         return BCME_OK;
 }
 
-void wlc_default_rateset(wlc_info_t *wlc, wlc_rateset_t *rs)
+void wlc_default_rateset(struct wlc_info *wlc, wlc_rateset_t *rs)
 {
         wlc_rateset_default(rs, NULL, wlc->band->phytype, wlc->band->bandtype,
                             false, RATE_MASK_FULL, (bool) N_ENAB(wlc->pub),
@@ -8128,14 +7915,14 @@ void wlc_default_rateset(wlc_info_t *wlc, wlc_rateset_t *rs)
                             wlc->stf->txstreams);
 }
 
-static void wlc_bss_default_init(wlc_info_t *wlc)
+static void wlc_bss_default_init(struct wlc_info *wlc)
 {
         chanspec_t chanspec;
-        wlcband_t *band;
+        struct wlcband *band;
         wlc_bss_info_t *bi = wlc->default_bss;
 
         /* init default and target BSS with some sane initial values */
-        bzero((char *)(bi), sizeof(wlc_bss_info_t));
+        memset((char *)(bi), 0, sizeof(wlc_bss_info_t));
         bi->beacon_period = ISSIM_ENAB(wlc->pub->sih) ? BEACON_INTERVAL_DEF_QT :
             BEACON_INTERVAL_DEFAULT;
         bi->dtim_period = ISSIM_ENAB(wlc->pub->sih) ? DTIM_INTERVAL_DEF_QT :
@@ -8166,7 +7953,7 @@ static void wlc_bss_default_init(wlc_info_t *wlc)
 /* Deferred event processing */
 static void wlc_process_eventq(void *arg)
 {
-        wlc_info_t *wlc = (wlc_info_t *) arg;
+        struct wlc_info *wlc = (struct wlc_info *) arg;
         wlc_event_t *etmp;
 
         while ((etmp = wlc_eventq_deq(wlc->eventq))) {
@@ -8192,7 +7979,8 @@ wlc_uint64_sub(u32 *a_high, u32 *a_low, u32 b_high, u32 b_low)
 }
 
 static ratespec_t
-mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
+mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
+                       u32 int_val)
 {
         u8 stf = (int_val & NRATE_STF_MASK) >> NRATE_STF_SHIFT;
         u8 rate = int_val & NRATE_RATE_MASK;
@@ -8211,8 +7999,8 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
         if (N_ENAB(wlc->pub) && ismcs) {
                 /* mcs only allowed when nmode */
                 if (stf > PHY_TXC1_MODE_SDM) {
-                        WL_ERROR(("wl%d: %s: Invalid stf\n", WLCWLUNIT(wlc),
-                                  __func__));
+                        WL_ERROR("wl%d: %s: Invalid stf\n",
+                                 WLCWLUNIT(wlc), __func__);
                         bcmerror = BCME_RANGE;
                         goto done;
                 }
@@ -8222,8 +8010,8 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
                         if (!CHSPEC_IS40(wlc->home_chanspec) ||
                             ((stf != PHY_TXC1_MODE_SISO)
                              && (stf != PHY_TXC1_MODE_CDD))) {
-                                WL_ERROR(("wl%d: %s: Invalid mcs 32\n",
-                                          WLCWLUNIT(wlc), __func__));
+                                WL_ERROR("wl%d: %s: Invalid mcs 32\n",
+                                         WLCWLUNIT(wlc), __func__);
                                 bcmerror = BCME_RANGE;
                                 goto done;
                         }
@@ -8231,7 +8019,8 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
                 } else if (rate > HIGHEST_SINGLE_STREAM_MCS) {
                         /* mcs > 7 must use stf SDM */
                         if (stf != PHY_TXC1_MODE_SDM) {
-                                WL_TRACE(("wl%d: %s: enabling SDM mode for mcs %d\n", WLCWLUNIT(wlc), __func__, rate));
+                                WL_TRACE("wl%d: %s: enabling SDM mode for mcs %d\n",
+                                         WLCWLUNIT(wlc), __func__, rate);
                                 stf = PHY_TXC1_MODE_SDM;
                         }
                 } else {
@@ -8239,37 +8028,37 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
                         if ((stf > PHY_TXC1_MODE_STBC) ||
                             (!WLC_STBC_CAP_PHY(wlc)
                              && (stf == PHY_TXC1_MODE_STBC))) {
-                                WL_ERROR(("wl%d: %s: Invalid STBC\n",
-                                          WLCWLUNIT(wlc), __func__));
+                                WL_ERROR("wl%d: %s: Invalid STBC\n",
+                                         WLCWLUNIT(wlc), __func__);
                                 bcmerror = BCME_RANGE;
                                 goto done;
                         }
                 }
         } else if (IS_OFDM(rate)) {
                 if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {
-                        WL_ERROR(("wl%d: %s: Invalid OFDM\n", WLCWLUNIT(wlc),
-                                  __func__));
+                        WL_ERROR("wl%d: %s: Invalid OFDM\n",
+                                 WLCWLUNIT(wlc), __func__);
                         bcmerror = BCME_RANGE;
                         goto done;
                 }
         } else if (IS_CCK(rate)) {
                 if ((cur_band->bandtype != WLC_BAND_2G)
                     || (stf != PHY_TXC1_MODE_SISO)) {
-                        WL_ERROR(("wl%d: %s: Invalid CCK\n", WLCWLUNIT(wlc),
-                                  __func__));
+                        WL_ERROR("wl%d: %s: Invalid CCK\n",
+                                 WLCWLUNIT(wlc), __func__);
                         bcmerror = BCME_RANGE;
                         goto done;
                 }
         } else {
-                WL_ERROR(("wl%d: %s: Unknown rate type\n", WLCWLUNIT(wlc),
-                          __func__));
+                WL_ERROR("wl%d: %s: Unknown rate type\n",
+                         WLCWLUNIT(wlc), __func__);
                 bcmerror = BCME_RANGE;
                 goto done;
         }
         /* make sure multiple antennae are available for non-siso rates */
         if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {
-                WL_ERROR(("wl%d: %s: SISO antenna but !SISO request\n",
-                          WLCWLUNIT(wlc), __func__));
+                WL_ERROR("wl%d: %s: SISO antenna but !SISO request\n",
+                         WLCWLUNIT(wlc), __func__);
                 bcmerror = BCME_RANGE;
                 goto done;
         }
@@ -8300,13 +8089,13 @@ mac80211_wlc_set_nrate(wlc_info_t *wlc, wlcband_t *cur_band, u32 int_val)
 
         return rspec;
  done:
-        WL_ERROR(("Hoark\n"));
+        WL_ERROR("Hoark\n");
         return rate;
 }
 
 /* formula:  IDLE_BUSY_RATIO_X_16 = (100-duty_cycle)/duty_cycle*16 */
 static int
-wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM,
+wlc_duty_cycle_set(struct wlc_info *wlc, int duty_cycle, bool isOFDM,
                    bool writeToShm)
 {
         int idle_busy_ratio_x_16 = 0;
@@ -8314,8 +8103,7 @@ wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM,
             isOFDM ? M_TX_IDLE_BUSY_RATIO_X_16_OFDM :
             M_TX_IDLE_BUSY_RATIO_X_16_CCK;
         if (duty_cycle > 100 || duty_cycle < 0) {
-                WL_ERROR(("wl%d:  duty cycle value off limit\n",
-                          wlc->pub->unit));
+                WL_ERROR("wl%d:  duty cycle value off limit\n", wlc->pub->unit);
                 return BCME_RANGE;
         }
         if (duty_cycle)
@@ -8335,7 +8123,7 @@ wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM,
 /* Read a single u16 from shared memory.
  * SHM 'offset' needs to be an even address
  */
-u16 wlc_read_shm(wlc_info_t *wlc, uint offset)
+u16 wlc_read_shm(struct wlc_info *wlc, uint offset)
 {
         return wlc_bmac_read_shm(wlc->hw, offset);
 }
@@ -8343,7 +8131,7 @@ u16 wlc_read_shm(wlc_info_t *wlc, uint offset)
 /* Write a single u16 to shared memory.
  * SHM 'offset' needs to be an even address
  */
-void wlc_write_shm(wlc_info_t *wlc, uint offset, u16 v)
+void wlc_write_shm(struct wlc_info *wlc, uint offset, u16 v)
 {
         wlc_bmac_write_shm(wlc->hw, offset, v);
 }
@@ -8352,7 +8140,7 @@ void wlc_write_shm(wlc_info_t *wlc, uint offset, u16 v)
  * SHM 'offset' needs to be an even address and
  * Range length 'len' must be an even number of bytes
  */
-void wlc_set_shm(wlc_info_t *wlc, uint offset, u16 v, int len)
+void wlc_set_shm(struct wlc_info *wlc, uint offset, u16 v, int len)
 {
         /* offset and len need to be even */
         ASSERT((offset & 1) == 0);
@@ -8368,7 +8156,7 @@ void wlc_set_shm(wlc_info_t *wlc, uint offset, u16 v, int len)
  * SHM 'offset' needs to be an even address and
  * Buffer length 'len' must be an even number of bytes
  */
-void wlc_copyto_shm(wlc_info_t *wlc, uint offset, const void *buf, int len)
+void wlc_copyto_shm(struct wlc_info *wlc, uint offset, const void *buf, int len)
 {
         /* offset and len need to be even */
         ASSERT((offset & 1) == 0);
@@ -8384,7 +8172,7 @@ void wlc_copyto_shm(wlc_info_t *wlc, uint offset, const void *buf, int len)
  * SHM 'offset' needs to be an even address and
  * Buffer length 'len' must be an even number of bytes
  */
-void wlc_copyfrom_shm(wlc_info_t *wlc, uint offset, void *buf, int len)
+void wlc_copyfrom_shm(struct wlc_info *wlc, uint offset, void *buf, int len)
 {
         /* offset and len need to be even */
         ASSERT((offset & 1) == 0);
@@ -8397,71 +8185,73 @@ void wlc_copyfrom_shm(wlc_info_t *wlc, uint offset, void *buf, int len)
 }
 
 /* wrapper BMAC functions to for HIGH driver access */
-void wlc_mctrl(wlc_info_t *wlc, u32 mask, u32 val)
+void wlc_mctrl(struct wlc_info *wlc, u32 mask, u32 val)
 {
         wlc_bmac_mctrl(wlc->hw, mask, val);
 }
 
-void wlc_corereset(wlc_info_t *wlc, u32 flags)
+void wlc_corereset(struct wlc_info *wlc, u32 flags)
 {
         wlc_bmac_corereset(wlc->hw, flags);
 }
 
-void wlc_mhf(wlc_info_t *wlc, u8 idx, u16 mask, u16 val, int bands)
+void wlc_mhf(struct wlc_info *wlc, u8 idx, u16 mask, u16 val, int bands)
 {
         wlc_bmac_mhf(wlc->hw, idx, mask, val, bands);
 }
 
-u16 wlc_mhf_get(wlc_info_t *wlc, u8 idx, int bands)
+u16 wlc_mhf_get(struct wlc_info *wlc, u8 idx, int bands)
 {
         return wlc_bmac_mhf_get(wlc->hw, idx, bands);
 }
 
-int wlc_xmtfifo_sz_get(wlc_info_t *wlc, uint fifo, uint *blocks)
+int wlc_xmtfifo_sz_get(struct wlc_info *wlc, uint fifo, uint *blocks)
 {
         return wlc_bmac_xmtfifo_sz_get(wlc->hw, fifo, blocks);
 }
 
-void wlc_write_template_ram(wlc_info_t *wlc, int offset, int len, void *buf)
+void wlc_write_template_ram(struct wlc_info *wlc, int offset, int len,
+                            void *buf)
 {
         wlc_bmac_write_template_ram(wlc->hw, offset, len, buf);
 }
 
-void wlc_write_hw_bcntemplates(wlc_info_t *wlc, void *bcn, int len, bool both)
+void wlc_write_hw_bcntemplates(struct wlc_info *wlc, void *bcn, int len,
+                               bool both)
 {
         wlc_bmac_write_hw_bcntemplates(wlc->hw, bcn, len, both);
 }
 
 void
-wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset,
+wlc_set_addrmatch(struct wlc_info *wlc, int match_reg_offset,
                   const struct ether_addr *addr)
 {
         wlc_bmac_set_addrmatch(wlc->hw, match_reg_offset, addr);
 }
 
-void wlc_set_rcmta(wlc_info_t *wlc, int idx, const struct ether_addr *addr)
+void wlc_set_rcmta(struct wlc_info *wlc, int idx, const struct ether_addr *addr)
 {
         wlc_bmac_set_rcmta(wlc->hw, idx, addr);
 }
 
-void wlc_read_tsf(wlc_info_t *wlc, u32 *tsf_l_ptr, u32 *tsf_h_ptr)
+void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr, u32 *tsf_h_ptr)
 {
         wlc_bmac_read_tsf(wlc->hw, tsf_l_ptr, tsf_h_ptr);
 }
 
-void wlc_set_cwmin(wlc_info_t *wlc, u16 newmin)
+void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin)
 {
         wlc->band->CWmin = newmin;
         wlc_bmac_set_cwmin(wlc->hw, newmin);
 }
 
-void wlc_set_cwmax(wlc_info_t *wlc, u16 newmax)
+void wlc_set_cwmax(struct wlc_info *wlc, u16 newmax)
 {
         wlc->band->CWmax = newmax;
         wlc_bmac_set_cwmax(wlc->hw, newmax);
 }
 
-void wlc_fifoerrors(wlc_info_t *wlc)
+void wlc_fifoerrors(struct wlc_info *wlc)
 {
 
         wlc_bmac_fifoerrors(wlc->hw);
@@ -8469,19 +8259,16 @@ void wlc_fifoerrors(wlc_info_t *wlc)
 
 /* Search mem rw utilities */
 
-void wlc_pllreq(wlc_info_t *wlc, bool set, mbool req_bit)
+void wlc_pllreq(struct wlc_info *wlc, bool set, mbool req_bit)
 {
         wlc_bmac_pllreq(wlc->hw, set, req_bit);
 }
 
-void wlc_reset_bmac_done(wlc_info_t *wlc)
+void wlc_reset_bmac_done(struct wlc_info *wlc)
 {
-#ifdef WLC_HIGH_ONLY
-        wlc->reset_bmac_pending = false;
-#endif
 }
 
-void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode)
+void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode)
 {
         wlc->ht_cap.cap &= ~HT_CAP_MIMO_PS_MASK;
         wlc->ht_cap.cap |= (mimops_mode << HT_CAP_MIMO_PS_SHIFT);
@@ -8494,7 +8281,7 @@ void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode)
 
 /* check for the particular priority flow control bit being set */
 bool
-wlc_txflowcontrol_prio_isset(wlc_info_t *wlc, wlc_txq_info_t *q, int prio)
+wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, wlc_txq_info_t *q, int prio)
 {
         uint prio_mask;
 
@@ -8509,12 +8296,13 @@ wlc_txflowcontrol_prio_isset(wlc_info_t *wlc, wlc_txq_info_t *q, int prio)
 }
 
 /* propogate the flow control to all interfaces using the given tx queue */
-void wlc_txflowcontrol(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on, int prio)
+void wlc_txflowcontrol(struct wlc_info *wlc, wlc_txq_info_t *qi,
+                       bool on, int prio)
 {
         uint prio_bits;
         uint cur_bits;
 
-        WL_ERROR(("%s: flow contro kicks in\n", __func__));
+        WL_ERROR("%s: flow control kicks in\n", __func__);
 
         if (prio == ALLPRIO) {
                 prio_bits = TXQ_STOP_FOR_PRIOFC_MASK;
@@ -8551,7 +8339,7 @@ void wlc_txflowcontrol(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on, int prio)
 }
 
 void
-wlc_txflowcontrol_override(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on,
+wlc_txflowcontrol_override(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
                            uint override)
 {
         uint prev_override;
@@ -8598,7 +8386,7 @@ wlc_txflowcontrol_override(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on,
         }
 }
 
-static void wlc_txflowcontrol_reset(wlc_info_t *wlc)
+static void wlc_txflowcontrol_reset(struct wlc_info *wlc)
 {
         wlc_txq_info_t *qi;
 
@@ -8611,10 +8399,10 @@ static void wlc_txflowcontrol_reset(wlc_info_t *wlc)
 }
 
 static void
-wlc_txflowcontrol_signal(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on,
+wlc_txflowcontrol_signal(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
                          int prio)
 {
-        wlc_if_t *wlcif;
+        struct wlc_if *wlcif;
 
         for (wlcif = wlc->wlcif_list; wlcif != NULL; wlcif = wlcif->next) {
                 if (wlcif->qi == qi && wlcif->flags & WLC_IF_LINKED)
@@ -8622,7 +8410,7 @@ wlc_txflowcontrol_signal(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on,
         }
 }
 
-static wlc_txq_info_t *wlc_txq_alloc(wlc_info_t *wlc, osl_t *osh)
+static wlc_txq_info_t *wlc_txq_alloc(struct wlc_info *wlc, struct osl_info *osh)
 {
         wlc_txq_info_t *qi, *p;
 
@@ -8652,7 +8440,8 @@ static wlc_txq_info_t *wlc_txq_alloc(wlc_info_t *wlc, osl_t *osh)
         return qi;
 }
 
-static void wlc_txq_free(wlc_info_t *wlc, osl_t *osh, wlc_txq_info_t *qi)
+static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
+                         wlc_txq_info_t *qi)
 {
         wlc_txq_info_t *p;
 
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h
index 6a77591234b7..5df996b78911 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -17,19 +17,10 @@
 #ifndef _wlc_h_
 #define _wlc_h_
 
-#include <wlc_types.h>
-
-#include <wl_dbg.h>
 #include <wlioctl.h>
-#include <wlc_event.h>
 #include <wlc_phy_hal.h>
 #include <wlc_channel.h>
-#ifdef WLC_SPLIT
-#include <bcm_rpc.h>
-#endif
-
 #include <wlc_bsscfg.h>
-
 #include <wlc_scb.h>
 
 #define MA_WINDOW_SZ            8       /* moving average window size */
@@ -220,15 +211,11 @@ extern const u8 prio2fifo[];
  * (some platforms return all 0).
  * If clocks are present, call the sb routine which will figure out if the device is removed.
  */
-#ifdef WLC_HIGH_ONLY
-#define DEVICEREMOVED(wlc)      (!wlc->device_present)
-#else
 #define DEVICEREMOVED(wlc)      \
         ((wlc->hw->clk) ?   \
         ((R_REG(wlc->hw->osh, &wlc->hw->regs->maccontrol) & \
         (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN) : \
         (si_deviceremoved(wlc->hw->sih)))
-#endif                          /* WLC_HIGH_ONLY */
 
 #define WLCWLUNIT(wlc)          ((wlc)->pub->unit)
 
@@ -315,22 +302,20 @@ typedef struct wlc_stf {
 /*
  * core state (mac)
  */
-typedef struct wlccore {
-#ifdef WLC_LOW
+struct wlccore {
         uint coreidx;           /* # sb enumerated core */
 
         /* fifo */
         uint *txavail[NFIFO];   /* # tx descriptors available */
         s16 txpktpend[NFIFO];   /* tx admission control */
-#endif                          /* WLC_LOW */
 
         macstat_t *macstat_snapshot;    /* mac hw prev read values */
-} wlccore_t;
+};
 
 /*
  * band state (phy+ana+radio)
  */
-typedef struct wlcband {
+struct wlcband {
         int bandtype;           /* WLC_BAND_2G, WLC_BAND_5G */
         uint bandunit;          /* bandstate[] index */
 
@@ -359,13 +344,13 @@ typedef struct wlcband {
         u16 CWmin;              /* The minimum size of contention window, in unit of aSlotTime */
         u16 CWmax;              /* The maximum size of contention window, in unit of aSlotTime */
         u16 bcntsfoff;  /* beacon tsf offset */
-} wlcband_t;
+};
 
 /* generic function callback takes just one arg */
 typedef void (*cb_fn_t) (void *);
 
 /* tx completion callback takes 3 args */
-typedef void (*pkcb_fn_t) (wlc_info_t *wlc, uint txstatus, void *arg);
+typedef void (*pkcb_fn_t) (struct wlc_info *wlc, uint txstatus, void *arg);
 
 typedef struct pkt_cb {
         pkcb_fn_t fn;           /* function to call when tx frame completes */
@@ -398,14 +383,14 @@ typedef struct dumpcb_s {
 
 /* virtual interface */
 struct wlc_if {
-        wlc_if_t *next;
+        struct wlc_if *next;
         u8 type;                /* WLC_IFTYPE_BSS or WLC_IFTYPE_WDS */
         u8 index;               /* assigned in wl_add_if(), index of the wlif if any,
                                  * not necessarily corresponding to bsscfg._idx or
                                  * AID2PVBMAP(scb).
                                  */
         u8 flags;               /* flags for the interface */
-        wl_if_t *wlif;          /* pointer to wlif */
+        struct wl_if *wlif;             /* pointer to wlif */
         struct wlc_txq_info *qi;        /* pointer to associated tx queue */
         union {
                 struct scb *scb;        /* pointer to scb if WLC_IFTYPE_WDS */
@@ -416,7 +401,6 @@ struct wlc_if {
 /* flags for the interface */
 #define WLC_IF_LINKED           0x02    /* this interface is linked to a wl_if */
 
-#ifdef WLC_LOW
 typedef struct wlc_hwband {
         int bandtype;           /* WLC_BAND_2G, WLC_BAND_5G */
         uint bandunit;          /* bandstate[] index */
@@ -433,20 +417,15 @@ typedef struct wlc_hwband {
         wlc_phy_t *pi;          /* pointer to phy specific information */
         bool abgphy_encore;
 } wlc_hwband_t;
-#endif                          /* WLC_LOW */
 
 struct wlc_hw_info {
-#ifdef WLC_SPLIT
-        rpc_info_t *rpc;        /* Handle to RPC module */
-#endif
-        osl_t *osh;             /* pointer to os handle */
+        struct osl_info *osh;           /* pointer to os handle */
         bool _piomode;          /* true if pio mode */
-        wlc_info_t *wlc;
+        struct wlc_info *wlc;
 
         /* fifo */
-        hnddma_t *di[NFIFO];    /* hnddma handles, per fifo */
+        struct hnddma_pub *di[NFIFO];   /* hnddma handles, per fifo */
 
-#ifdef WLC_LOW
         uint unit;              /* device instance number */
 
         /* version info */
@@ -497,31 +476,21 @@ struct wlc_hw_info {
         bool forcefastclk;      /* true if the h/w is forcing the use of fast clk */
         bool clk;               /* core is out of reset and has clock */
         bool sbclk;             /* sb has clock */
-        bmac_pmq_t *bmac_pmq;   /*  bmac PM states derived from ucode PMQ */
+        struct bmac_pmq *bmac_pmq; /*  bmac PM states derived from ucode PMQ */
         bool phyclk;            /* phy is out of reset and has clock */
         bool dma_lpbk;          /* core is in DMA loopback */
 
-#ifdef BCMSDIO
-        void *sdh;
-#endif
         bool ucode_loaded;      /* true after ucode downloaded */
 
-#ifdef WLC_LOW_ONLY
-        struct wl_timer *wdtimer;       /* timer for watchdog routine */
-        struct ether_addr orig_etheraddr;       /* original hw ethernet address */
-        u16 rpc_dngl_agg;       /* rpc agg control for dongle */
-        u32 mem_required_def;   /* memory required to replenish RX DMA ring */
-        u32 mem_required_lower; /* memory required with lower RX bound */
-        u32 mem_required_least; /* minimum memory requirement to handle RX */
-
-#endif                          /* WLC_LOW_ONLY */
 
         u8 hw_stf_ss_opmode;    /* STF single stream operation mode */
         u8 antsel_type; /* Type of boardlevel mimo antenna switch-logic
                                  * 0 = N/A, 1 = 2x4 board, 2 = 2x3 CB2 board
                                  */
-        u32 antsel_avail;       /* put antsel_info_t here if more info is needed */
-#endif                          /* WLC_LOW */
+        u32 antsel_avail;       /*
+                                 * put struct antsel_info here if more info is
+                                 * needed
+                                 */
 };
 
 /* TX Queue information
@@ -541,15 +510,12 @@ typedef struct wlc_txq_info {
  * Principal common (os-independent) software data structure.
  */
 struct wlc_info {
-        wlc_pub_t *pub;         /* pointer to wlc public state */
-        osl_t *osh;             /* pointer to os handle */
+        struct wlc_pub *pub;            /* pointer to wlc public state */
+        struct osl_info *osh;           /* pointer to os handle */
         struct wl_info *wl;     /* pointer to os-specific private state */
         d11regs_t *regs;        /* pointer to device registers */
 
-        wlc_hw_info_t *hw;      /* HW related state used primarily by BMAC */
-#ifdef WLC_SPLIT
-        rpc_info_t *rpc;        /* Handle to RPC module */
-#endif
+        struct wlc_hw_info *hw; /* HW related state used primarily by BMAC */
 
         /* clock */
         int clkreq_override;    /* setting for clkreq for PCIE : Auto, 0, 1 */
@@ -566,10 +532,11 @@ struct wlc_info {
         bool clk;               /* core is out of reset and has clock */
 
         /* multiband */
-        wlccore_t *core;        /* pointer to active io core */
-        wlcband_t *band;        /* pointer to active per-band state */
-        wlccore_t *corestate;   /* per-core state (one per hw core) */
-        wlcband_t *bandstate[MAXBANDS]; /* per-band state (one per phy/radio) */
+        struct wlccore *core;   /* pointer to active io core */
+        struct wlcband *band;   /* pointer to active per-band state */
+        struct wlccore *corestate;      /* per-core state (one per hw core) */
+        /* per-band state (one per phy/radio): */
+        struct wlcband *bandstate[MAXBANDS];
 
         bool war16165;          /* PCI slow clock 16165 war flag */
 
@@ -584,15 +551,9 @@ struct wlc_info {
         s8 txpwr_local_max;     /* regulatory local txpwr max */
         u8 txpwr_local_constraint;      /* local power contraint in dB */
 
-#ifdef WLC_HIGH_ONLY
-        rpctx_info_t *rpctx;    /* RPC TX module */
-        bool reset_bmac_pending;        /* bmac reset is in progressing */
-        u32 rpc_agg;            /* host agg: bit 16-31, bmac agg: bit 0-15 */
-        u32 rpc_msglevel;       /* host rpc: bit 16-31, bmac rpc: bit 0-15 */
-#endif
 
-        ampdu_info_t *ampdu;    /* ampdu module handler */
-        antsel_info_t *asi;     /* antsel module handler */
+        struct ampdu_info *ampdu;       /* ampdu module handler */
+        struct antsel_info *asi;        /* antsel module handler */
         wlc_cm_info_t *cmi;     /* channel manager module handler */
 
         void *btparam;          /* bus type specific cookie */
@@ -792,8 +753,6 @@ struct wlc_info {
         ac_bitmap_t apsd_trigger_ac;    /* Permissible Acess Category in which APSD Null
                                          * Trigger frames can be send
                                          */
-        wlc_ap_info_t *ap;
-
         u8 htphy_membership;    /* HT PHY membership */
 
         bool _regulatory_domain;        /* 802.11d enabled? */
@@ -811,7 +770,7 @@ struct wlc_info {
 
         u16 next_bsscfg_ID;
 
-        wlc_if_t *wlcif_list;   /* linked list of wlc_if structs */
+        struct wlc_if *wlcif_list;      /* linked list of wlc_if structs */
         wlc_txq_info_t *active_queue;   /* txq for the currently active transmit context */
         u32 mpc_dur;            /* total time (ms) in mpc mode except for the
                                  * portion since radio is turned off last time
@@ -825,8 +784,8 @@ struct wlc_info {
 
 /* antsel module specific state */
 struct antsel_info {
-        wlc_info_t *wlc;        /* pointer to main wlc structure */
-        wlc_pub_t *pub;         /* pointer to public fn */
+        struct wlc_info *wlc;   /* pointer to main wlc structure */
+        struct wlc_pub *pub;            /* pointer to public fn */
         u8 antsel_type; /* Type of boardlevel mimo antenna switch-logic
                                  * 0 = N/A, 1 = 2x4 board, 2 = 2x3 CB2 board
                                  */
@@ -842,23 +801,9 @@ struct antsel_info {
 #define IS_MBAND_UNLOCKED(wlc) \
         ((NBANDS(wlc) > 1) && !(wlc)->bandlocked)
 
-#ifdef WLC_LOW
 #define WLC_BAND_PI_RADIO_CHANSPEC wlc_phy_chanspec_get(wlc->band->pi)
-#else
-#define WLC_BAND_PI_RADIO_CHANSPEC (wlc->chanspec)
-#endif
 
 /* sum the individual fifo tx pending packet counts */
-#if defined(WLC_HIGH_ONLY)
-#define TXPKTPENDTOT(wlc)               (wlc_rpctx_txpktpend((wlc)->rpctx, 0, true))
-#define TXPKTPENDGET(wlc, fifo)         (wlc_rpctx_txpktpend((wlc)->rpctx, (fifo), false))
-#define TXPKTPENDINC(wlc, fifo, val)    (wlc_rpctx_txpktpendinc((wlc)->rpctx, (fifo), (val)))
-#define TXPKTPENDDEC(wlc, fifo, val)    (wlc_rpctx_txpktpenddec((wlc)->rpctx, (fifo), (val)))
-#define TXPKTPENDCLR(wlc, fifo)         (wlc_rpctx_txpktpendclr((wlc)->rpctx, (fifo)))
-#define TXAVAIL(wlc, fifo)              (wlc_rpctx_txavail((wlc)->rpctx, (fifo)))
-#define GETNEXTTXP(wlc, _queue)         (wlc_rpctx_getnexttxp((wlc)->rpctx, (_queue)))
-
-#else
 #define TXPKTPENDTOT(wlc) ((wlc)->core->txpktpend[0] + (wlc)->core->txpktpend[1] + \
         (wlc)->core->txpktpend[2] + (wlc)->core->txpktpend[3])
 #define TXPKTPENDGET(wlc, fifo)         ((wlc)->core->txpktpend[(fifo)])
@@ -868,48 +813,49 @@ struct antsel_info {
 #define TXAVAIL(wlc, fifo)              (*(wlc)->core->txavail[(fifo)])
 #define GETNEXTTXP(wlc, _queue)                                                         \
                 dma_getnexttxp((wlc)->hw->di[(_queue)], HNDDMA_RANGE_TRANSMITTED)
-#endif                          /* WLC_HIGH_ONLY */
 
 #define WLC_IS_MATCH_SSID(wlc, ssid1, ssid2, len1, len2) \
-        ((len1 == len2) && !bcmp(ssid1, ssid2, len1))
-
-/* API shared by both WLC_HIGH and WLC_LOW driver */
-extern void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus);
-extern void wlc_fatal_error(wlc_info_t *wlc);
-extern void wlc_bmac_rpc_watchdog(wlc_info_t *wlc);
-extern void wlc_recv(wlc_info_t *wlc, void *p);
-extern bool wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2);
-extern void wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit,
-                       s8 txpktpend);
-extern void wlc_txfifo_complete(wlc_info_t *wlc, uint fifo, s8 txpktpend);
-extern void wlc_info_init(wlc_info_t *wlc, int unit);
+        ((len1 == len2) && !memcmp(ssid1, ssid2, len1))
+
+extern void wlc_high_dpc(struct wlc_info *wlc, u32 macintstatus);
+extern void wlc_fatal_error(struct wlc_info *wlc);
+extern void wlc_bmac_rpc_watchdog(struct wlc_info *wlc);
+extern void wlc_recv(struct wlc_info *wlc, struct sk_buff *p);
+extern bool wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2);
+extern void wlc_txfifo(struct wlc_info *wlc, uint fifo, struct sk_buff *p,
+                       bool commit, s8 txpktpend);
+extern void wlc_txfifo_complete(struct wlc_info *wlc, uint fifo, s8 txpktpend);
+extern void wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
+                        uint prec);
+extern void wlc_info_init(struct wlc_info *wlc, int unit);
 extern void wlc_print_txstatus(tx_status_t *txs);
-extern int wlc_xmtfifo_sz_get(wlc_info_t *wlc, uint fifo, uint *blocks);
-extern void wlc_write_template_ram(wlc_info_t *wlc, int offset, int len,
+extern int wlc_xmtfifo_sz_get(struct wlc_info *wlc, uint fifo, uint *blocks);
+extern void wlc_write_template_ram(struct wlc_info *wlc, int offset, int len,
                                    void *buf);
-extern void wlc_write_hw_bcntemplates(wlc_info_t *wlc, void *bcn, int len,
+extern void wlc_write_hw_bcntemplates(struct wlc_info *wlc, void *bcn, int len,
                                       bool both);
 #if defined(BCMDBG)
-extern void wlc_get_rcmta(wlc_info_t *wlc, int idx, struct ether_addr *addr);
+extern void wlc_get_rcmta(struct wlc_info *wlc, int idx,
+                          struct ether_addr *addr);
 #endif
-extern void wlc_set_rcmta(wlc_info_t *wlc, int idx,
+extern void wlc_set_rcmta(struct wlc_info *wlc, int idx,
                           const struct ether_addr *addr);
-extern void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset,
+extern void wlc_set_addrmatch(struct wlc_info *wlc, int match_reg_offset,
                               const struct ether_addr *addr);
-extern void wlc_read_tsf(wlc_info_t *wlc, u32 *tsf_l_ptr,
+extern void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr,
                          u32 *tsf_h_ptr);
-extern void wlc_set_cwmin(wlc_info_t *wlc, u16 newmin);
-extern void wlc_set_cwmax(wlc_info_t *wlc, u16 newmax);
-extern void wlc_fifoerrors(wlc_info_t *wlc);
-extern void wlc_pllreq(wlc_info_t *wlc, bool set, mbool req_bit);
-extern void wlc_reset_bmac_done(wlc_info_t *wlc);
-extern void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val);
-extern void wlc_hwtimer_gptimer_set(wlc_info_t *wlc, uint us);
-extern void wlc_hwtimer_gptimer_abort(wlc_info_t *wlc);
+extern void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin);
+extern void wlc_set_cwmax(struct wlc_info *wlc, u16 newmax);
+extern void wlc_fifoerrors(struct wlc_info *wlc);
+extern void wlc_pllreq(struct wlc_info *wlc, bool set, mbool req_bit);
+extern void wlc_reset_bmac_done(struct wlc_info *wlc);
+extern void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val);
+extern void wlc_hwtimer_gptimer_set(struct wlc_info *wlc, uint us);
+extern void wlc_hwtimer_gptimer_abort(struct wlc_info *wlc);
 
 #if defined(BCMDBG)
 extern void wlc_print_rxh(d11rxhdr_t *rxh);
-extern void wlc_print_hdrs(wlc_info_t *wlc, const char *prefix, u8 *frame,
+extern void wlc_print_hdrs(struct wlc_info *wlc, const char *prefix, u8 *frame,
                            d11txh_t *txh, d11rxhdr_t *rxh, uint len);
 extern void wlc_print_txdesc(d11txh_t *txh);
 #endif
@@ -917,124 +863,126 @@ extern void wlc_print_txdesc(d11txh_t *txh);
 extern void wlc_print_dot11_mac_hdr(u8 *buf, int len);
 #endif
 
-#ifdef WLC_LOW
-extern void wlc_setxband(wlc_hw_info_t *wlc_hw, uint bandunit);
-extern void wlc_coredisable(wlc_hw_info_t *wlc_hw);
-#endif
+extern void wlc_setxband(struct wlc_hw_info *wlc_hw, uint bandunit);
+extern void wlc_coredisable(struct wlc_hw_info *wlc_hw);
 
-extern bool wlc_valid_rate(wlc_info_t *wlc, ratespec_t rate, int band,
+extern bool wlc_valid_rate(struct wlc_info *wlc, ratespec_t rate, int band,
                            bool verbose);
-extern void wlc_ap_upd(wlc_info_t *wlc);
+extern void wlc_ap_upd(struct wlc_info *wlc);
 
 /* helper functions */
-extern void wlc_shm_ssid_upd(wlc_info_t *wlc, wlc_bsscfg_t *cfg);
-extern int wlc_set_gmode(wlc_info_t *wlc, u8 gmode, bool config);
+extern void wlc_shm_ssid_upd(struct wlc_info *wlc, wlc_bsscfg_t *cfg);
+extern int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config);
 
-extern void wlc_mac_bcn_promisc_change(wlc_info_t *wlc, bool promisc);
-extern void wlc_mac_bcn_promisc(wlc_info_t *wlc);
-extern void wlc_mac_promisc(wlc_info_t *wlc);
-extern void wlc_txflowcontrol(wlc_info_t *wlc, wlc_txq_info_t *qi, bool on,
+extern void wlc_mac_bcn_promisc_change(struct wlc_info *wlc, bool promisc);
+extern void wlc_mac_bcn_promisc(struct wlc_info *wlc);
+extern void wlc_mac_promisc(struct wlc_info *wlc);
+extern void wlc_txflowcontrol(struct wlc_info *wlc, wlc_txq_info_t *qi, bool on,
                               int prio);
-extern void wlc_txflowcontrol_override(wlc_info_t *wlc, wlc_txq_info_t *qi,
+extern void wlc_txflowcontrol_override(struct wlc_info *wlc, wlc_txq_info_t *qi,
                                        bool on, uint override);
-extern bool wlc_txflowcontrol_prio_isset(wlc_info_t *wlc, wlc_txq_info_t *qi,
-                                         int prio);
-extern void wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi);
-extern int wlc_prep_pdu(wlc_info_t *wlc, void *pdu, uint *fifo);
+extern bool wlc_txflowcontrol_prio_isset(struct wlc_info *wlc,
+                                         wlc_txq_info_t *qi, int prio);
+extern void wlc_send_q(struct wlc_info *wlc, wlc_txq_info_t *qi);
+extern int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifo);
 
-extern u16 wlc_calc_lsig_len(wlc_info_t *wlc, ratespec_t ratespec,
+extern u16 wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec,
                                 uint mac_len);
-extern ratespec_t wlc_rspec_to_rts_rspec(wlc_info_t *wlc, ratespec_t rspec,
+extern ratespec_t wlc_rspec_to_rts_rspec(struct wlc_info *wlc, ratespec_t rspec,
                                          bool use_rspec, u16 mimo_ctlchbw);
-extern u16 wlc_compute_rtscts_dur(wlc_info_t *wlc, bool cts_only,
+extern u16 wlc_compute_rtscts_dur(struct wlc_info *wlc, bool cts_only,
                                      ratespec_t rts_rate, ratespec_t frame_rate,
                                      u8 rts_preamble_type,
                                      u8 frame_preamble_type, uint frame_len,
                                      bool ba);
 
-extern void wlc_tbtt(wlc_info_t *wlc, d11regs_t *regs);
+extern void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs);
 
 #if defined(BCMDBG)
-extern void wlc_dump_ie(wlc_info_t *wlc, bcm_tlv_t *ie, struct bcmstrbuf *b);
+extern void wlc_dump_ie(struct wlc_info *wlc, bcm_tlv_t *ie,
+                        struct bcmstrbuf *b);
 #endif
 
-extern bool wlc_ps_check(wlc_info_t *wlc);
-extern void wlc_reprate_init(wlc_info_t *wlc);
+extern bool wlc_ps_check(struct wlc_info *wlc);
+extern void wlc_reprate_init(struct wlc_info *wlc);
 extern void wlc_bsscfg_reprate_init(wlc_bsscfg_t *bsscfg);
 extern void wlc_uint64_sub(u32 *a_high, u32 *a_low, u32 b_high,
                            u32 b_low);
 extern u32 wlc_calc_tbtt_offset(u32 bi, u32 tsf_h, u32 tsf_l);
 
 /* Shared memory access */
-extern void wlc_write_shm(wlc_info_t *wlc, uint offset, u16 v);
-extern u16 wlc_read_shm(wlc_info_t *wlc, uint offset);
-extern void wlc_set_shm(wlc_info_t *wlc, uint offset, u16 v, int len);
-extern void wlc_copyto_shm(wlc_info_t *wlc, uint offset, const void *buf,
+extern void wlc_write_shm(struct wlc_info *wlc, uint offset, u16 v);
+extern u16 wlc_read_shm(struct wlc_info *wlc, uint offset);
+extern void wlc_set_shm(struct wlc_info *wlc, uint offset, u16 v, int len);
+extern void wlc_copyto_shm(struct wlc_info *wlc, uint offset, const void *buf,
                            int len);
-extern void wlc_copyfrom_shm(wlc_info_t *wlc, uint offset, void *buf, int len);
+extern void wlc_copyfrom_shm(struct wlc_info *wlc, uint offset, void *buf,
+                             int len);
 
-extern void wlc_update_beacon(wlc_info_t *wlc);
-extern void wlc_bss_update_beacon(wlc_info_t *wlc, struct wlc_bsscfg *bsscfg);
+extern void wlc_update_beacon(struct wlc_info *wlc);
+extern void wlc_bss_update_beacon(struct wlc_info *wlc,
+                                  struct wlc_bsscfg *bsscfg);
 
-extern void wlc_update_probe_resp(wlc_info_t *wlc, bool suspend);
-extern void wlc_bss_update_probe_resp(wlc_info_t *wlc, wlc_bsscfg_t *cfg,
+extern void wlc_update_probe_resp(struct wlc_info *wlc, bool suspend);
+extern void wlc_bss_update_probe_resp(struct wlc_info *wlc, wlc_bsscfg_t *cfg,
                                       bool suspend);
 
-extern bool wlc_ismpc(wlc_info_t *wlc);
-extern bool wlc_is_non_delay_mpc(wlc_info_t *wlc);
-extern void wlc_radio_mpc_upd(wlc_info_t *wlc);
-extern bool wlc_prec_enq(wlc_info_t *wlc, struct pktq *q, void *pkt, int prec);
-extern bool wlc_prec_enq_head(wlc_info_t *wlc, struct pktq *q, void *pkt,
-                              int prec, bool head);
-extern u16 wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec);
-extern void wlc_compute_plcp(wlc_info_t *wlc, ratespec_t rate, uint length,
+extern bool wlc_ismpc(struct wlc_info *wlc);
+extern bool wlc_is_non_delay_mpc(struct wlc_info *wlc);
+extern void wlc_radio_mpc_upd(struct wlc_info *wlc);
+extern bool wlc_prec_enq(struct wlc_info *wlc, struct pktq *q, void *pkt,
+                         int prec);
+extern bool wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q,
+                              struct sk_buff *pkt, int prec, bool head);
+extern u16 wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec);
+extern void wlc_compute_plcp(struct wlc_info *wlc, ratespec_t rate, uint length,
                              u8 *plcp);
-extern uint wlc_calc_frame_time(wlc_info_t *wlc, ratespec_t ratespec,
+extern uint wlc_calc_frame_time(struct wlc_info *wlc, ratespec_t ratespec,
                                 u8 preamble_type, uint mac_len);
 
-extern void wlc_set_chanspec(wlc_info_t *wlc, chanspec_t chanspec);
+extern void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec);
 
-extern bool wlc_timers_init(wlc_info_t *wlc, int unit);
+extern bool wlc_timers_init(struct wlc_info *wlc, int unit);
 
 extern const bcm_iovar_t wlc_iovars[];
 
 extern int wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
                        const char *name, void *params, uint p_len, void *arg,
-                       int len, int val_size, wlc_if_t *wlcif);
+                       int len, int val_size, struct wlc_if *wlcif);
 
 #if defined(BCMDBG)
-extern void wlc_print_ies(wlc_info_t *wlc, u8 *ies, uint ies_len);
+extern void wlc_print_ies(struct wlc_info *wlc, u8 *ies, uint ies_len);
 #endif
 
-extern int wlc_set_nmode(wlc_info_t *wlc, s32 nmode);
-extern void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode);
-extern void wlc_mimops_action_ht_send(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg,
-                                      u8 mimops_mode);
+extern int wlc_set_nmode(struct wlc_info *wlc, s32 nmode);
+extern void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode);
+extern void wlc_mimops_action_ht_send(struct wlc_info *wlc,
+                                      wlc_bsscfg_t *bsscfg, u8 mimops_mode);
 
-extern void wlc_switch_shortslot(wlc_info_t *wlc, bool shortslot);
+extern void wlc_switch_shortslot(struct wlc_info *wlc, bool shortslot);
 extern void wlc_set_bssid(wlc_bsscfg_t *cfg);
 extern void wlc_edcf_setparams(wlc_bsscfg_t *cfg, bool suspend);
-extern void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg,
-                              bool suspend);
 
-extern void wlc_set_ratetable(wlc_info_t *wlc);
+extern void wlc_set_ratetable(struct wlc_info *wlc);
 extern int wlc_set_mac(wlc_bsscfg_t *cfg);
-extern void wlc_beacon_phytxctl_txant_upd(wlc_info_t *wlc,
+extern void wlc_beacon_phytxctl_txant_upd(struct wlc_info *wlc,
                                           ratespec_t bcn_rate);
-extern void wlc_mod_prb_rsp_rate_table(wlc_info_t *wlc, uint frame_len);
-extern ratespec_t wlc_lowest_basic_rspec(wlc_info_t *wlc, wlc_rateset_t *rs);
-extern u16 wlc_compute_bcntsfoff(wlc_info_t *wlc, ratespec_t rspec,
+extern void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len);
+extern ratespec_t wlc_lowest_basic_rspec(struct wlc_info *wlc,
+                                         wlc_rateset_t *rs);
+extern u16 wlc_compute_bcntsfoff(struct wlc_info *wlc, ratespec_t rspec,
                                     bool short_preamble, bool phydelay);
-extern void wlc_radio_disable(wlc_info_t *wlc);
-extern void wlc_bcn_li_upd(wlc_info_t *wlc);
-
-extern int wlc_get_revision_info(wlc_info_t *wlc, void *buf, uint len);
-extern void wlc_out(wlc_info_t *wlc);
-extern void wlc_set_home_chanspec(wlc_info_t *wlc, chanspec_t chanspec);
-extern void wlc_watchdog_upd(wlc_info_t *wlc, bool tbtt);
-extern bool wlc_ps_allowed(wlc_info_t *wlc);
-extern bool wlc_stay_awake(wlc_info_t *wlc);
-extern void wlc_wme_initparams_sta(wlc_info_t *wlc, wme_param_ie_t *pe);
-
-extern void wlc_bss_list_free(wlc_info_t *wlc, wlc_bss_list_t *bss_list);
+extern void wlc_radio_disable(struct wlc_info *wlc);
+extern void wlc_bcn_li_upd(struct wlc_info *wlc);
+
+extern int wlc_get_revision_info(struct wlc_info *wlc, void *buf, uint len);
+extern void wlc_out(struct wlc_info *wlc);
+extern void wlc_set_home_chanspec(struct wlc_info *wlc, chanspec_t chanspec);
+extern void wlc_watchdog_upd(struct wlc_info *wlc, bool tbtt);
+extern bool wlc_ps_allowed(struct wlc_info *wlc);
+extern bool wlc_stay_awake(struct wlc_info *wlc);
+extern void wlc_wme_initparams_sta(struct wlc_info *wlc, wme_param_ie_t *pe);
+
+extern void wlc_bss_list_free(struct wlc_info *wlc, wlc_bss_list_t *bss_list);
+extern void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode);
 #endif                          /* _wlc_h_ */
diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c
index bf8e2e1a15f6..8bd4ede4c92a 100644
--- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c
+++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c
@@ -24,9 +24,10 @@
 #include <linux/kernel.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
-#include <bcmutils.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <osl.h>
+#include <bcmutils.h>
 
 #include <proto/802.11.h>
 #include <bcmwifi.h>
@@ -46,6 +47,7 @@
 #include <wlc_channel.h>
 #include <bcmsrom.h>
 #include <wlc_key.h>
+#include <wlc_event.h>
 
 #include <wlc_mac80211.h>
 
@@ -53,21 +55,23 @@
 #include <wlc_phy_shim.h>
 #include <wlc_phy_hal.h>
 #include <wl_export.h>
+#include <wl_dbg.h>
 
 /* PHY SHIM module specific state */
 struct wlc_phy_shim_info {
-        wlc_hw_info_t *wlc_hw;  /* pointer to main wlc_hw structure */
+        struct wlc_hw_info *wlc_hw;     /* pointer to main wlc_hw structure */
         void *wlc;              /* pointer to main wlc structure */
         void *wl;               /* pointer to os-specific private state */
 };
 
-wlc_phy_shim_info_t *wlc_phy_shim_attach(wlc_hw_info_t *wlc_hw,
+wlc_phy_shim_info_t *wlc_phy_shim_attach(struct wlc_hw_info *wlc_hw,
                                                        void *wl, void *wlc) {
         wlc_phy_shim_info_t *physhim = NULL;
 
         physhim = kzalloc(sizeof(wlc_phy_shim_info_t), GFP_ATOMIC);
         if (!physhim) {
-                WL_ERROR(("wl%d: wlc_phy_shim_attach: out of mem\n", wlc_hw->unit));
+                WL_ERROR("wl%d: wlc_phy_shim_attach: out of mem\n",
+                         wlc_hw->unit);
                 return NULL;
         }
         physhim->wlc_hw = wlc_hw;
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index a6a8c33483c9..146a6904a39b 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -251,7 +251,7 @@ typedef int (*iovar_fn_t) (void *handle, const bcm_iovar_t *vi,
  * Public portion of "common" os-independent state structure.
  * The wlc handle points at this.
  */
-typedef struct wlc_pub {
+struct wlc_pub {
         void *wlc;
 
         struct ieee80211_hw *ieee_hw;
@@ -260,7 +260,7 @@ typedef struct wlc_pub {
         uint mac80211_state;
         uint unit;              /* device instance number */
         uint corerev;           /* core revision */
-        osl_t *osh;             /* pointer to os handle */
+        struct osl_info *osh;           /* pointer to os handle */
         si_t *sih;              /* SB handle (cookie for siutils calls) */
         char *vars;             /* "environment" name=value */
         bool up;                /* interface up and running */
@@ -318,9 +318,6 @@ typedef struct wlc_pub {
                                  * is implemented properly in osl of that port
                                  * when it enables this Power Save feature.
                                  */
-#ifdef BCMSDIO
-        uint sdiod_drive_strength;      /* SDIO drive strength */
-#endif                          /* BCMSDIO */
 
         u16 boardrev;   /* version # of particular board */
         u8 sromrev;             /* version # of the srom */
@@ -333,7 +330,7 @@ typedef struct wlc_pub {
         bool _lmacproto;        /* lmac protocol module included and enabled */
         bool phy_11ncapable;    /* the PHY/HW is capable of 802.11N */
         bool _ampdumac;         /* mac assist ampdu enabled or not */
-} wlc_pub_t;
+};
 
 /* wl_monitor rx status per packet */
 typedef struct wl_rxsts {
@@ -437,17 +434,13 @@ struct wlc_if;
 #define EDCF_ENAB(pub) (WME_ENAB(pub))
 #define QOS_ENAB(pub) (WME_ENAB(pub) || N_ENAB(pub))
 
-#define MONITOR_ENAB(wlc)       (bcmspace && (wlc)->monitor)
-
-#define PROMISC_ENAB(wlc)       (bcmspace && (wlc)->promisc)
-
-extern void wlc_pkttag_info_move(wlc_pub_t *pub, void *pkt_from, void *pkt_to);
+#define MONITOR_ENAB(wlc)       ((wlc)->monitor)
 
-#define WLPKTTAGSCB(p) (WLPKTTAG(p)->_scb)
+#define PROMISC_ENAB(wlc)       ((wlc)->promisc)
 
 #define WLC_PREC_COUNT          16      /* Max precedence level implemented */
 
-/* pri is PKTPRIO encoded in the packet. This maps the Packet priority to
+/* pri is priority encoded in the packet. This maps the Packet priority to
  * enqueue precedence as defined in wlc_prec_map
  */
 extern const u8 wlc_prio2prec_map[];
@@ -497,8 +490,8 @@ extern const u8 wme_fifo2ac[];
 
 /* common functions for every port */
 extern void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit,
-                        bool piomode, osl_t *osh, void *regsva, uint bustype,
-                        void *btparam, uint *perr);
+                        bool piomode, struct osl_info *osh, void *regsva,
+                        uint bustype, void *btparam, uint *perr);
 extern uint wlc_detach(struct wlc_info *wlc);
 extern int wlc_up(struct wlc_info *wlc);
 extern uint wlc_down(struct wlc_info *wlc);
@@ -517,8 +510,10 @@ extern void wlc_intrsrestore(struct wlc_info *wlc, u32 macintmask);
 extern bool wlc_intrsupd(struct wlc_info *wlc);
 extern bool wlc_isr(struct wlc_info *wlc, bool *wantdpc);
 extern bool wlc_dpc(struct wlc_info *wlc, bool bounded);
-extern bool wlc_send80211_raw(struct wlc_info *wlc, wlc_if_t *wlcif, void *p,
-                              uint ac);
+extern bool wlc_send80211_raw(struct wlc_info *wlc, struct wlc_if *wlcif,
+                              void *p, uint ac);
+extern bool wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
+                                 struct ieee80211_hw *hw);
 extern int wlc_iovar_op(struct wlc_info *wlc, const char *name, void *params,
                         int p_len, void *arg, int len, bool set,
                         struct wlc_if *wlcif);
@@ -527,8 +522,13 @@ extern int wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
 /* helper functions */
 extern void wlc_statsupd(struct wlc_info *wlc);
 extern int wlc_get_header_len(void);
+extern void wlc_mac_bcn_promisc_change(struct wlc_info *wlc, bool promisc);
+extern void wlc_set_addrmatch(struct wlc_info *wlc, int match_reg_offset,
+                              const struct ether_addr *addr);
+extern void wlc_wme_setparams(struct wlc_info *wlc, u16 aci, void *arg,
+                              bool suspend);
 
-extern wlc_pub_t *wlc_pub(void *wlc);
+extern struct wlc_pub *wlc_pub(void *wlc);
 
 /* common functions for every port */
 extern int wlc_bmac_up_prep(struct wlc_hw_info *wlc_hw);
@@ -554,13 +554,15 @@ extern void wlc_scb_ratesel_init_all(struct wlc_info *wlc);
 /* ioctl */
 extern int wlc_iovar_gets8(struct wlc_info *wlc, const char *name,
                              s8 *arg);
-extern int wlc_iovar_check(wlc_pub_t *pub, const bcm_iovar_t *vi, void *arg,
+extern int wlc_iovar_check(struct wlc_pub *pub, const bcm_iovar_t *vi,
+                           void *arg,
                            int len, bool set);
 
-extern int wlc_module_register(wlc_pub_t *pub, const bcm_iovar_t *iovars,
+extern int wlc_module_register(struct wlc_pub *pub, const bcm_iovar_t *iovars,
                                const char *name, void *hdl, iovar_fn_t iovar_fn,
                                watchdog_fn_t watchdog_fn, down_fn_t down_fn);
-extern int wlc_module_unregister(wlc_pub_t *pub, const char *name, void *hdl);
+extern int wlc_module_unregister(struct wlc_pub *pub, const char *name,
+                                 void *hdl);
 extern void wlc_event_if(struct wlc_info *wlc, struct wlc_bsscfg *cfg,
                          wlc_event_t *e, const struct ether_addr *addr);
 extern void wlc_suspend_mac_and_wait(struct wlc_info *wlc);
@@ -617,10 +619,6 @@ extern void wlc_pmkid_event(struct wlc_bsscfg *cfg);
 #define BAND_2G_NAME            "2.4G"
 #define BAND_5G_NAME            "5G"
 
-#if defined(BCMSDIO) || defined(WLC_HIGH_ONLY)
-void wlc_device_removed(void *arg);
-#endif
-
 /* BMAC RPC: 7 u32 params: pkttotlen, fifo, commit, fid, txpktpend, pktflag, rpc_id */
 #define WLC_RPCTX_PARAMS                32
 
diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c
index d2d72568756d..ab7d0bed3c0a 100644
--- a/drivers/staging/brcm80211/sys/wlc_rate.c
+++ b/drivers/staging/brcm80211/sys/wlc_rate.c
@@ -17,12 +17,14 @@
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmendian.h>
 #include <wlioctl.h>
 
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <proto/802.11.h>
 #include <d11.h>
 #include <wlc_rate.h>
@@ -297,7 +299,7 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs,
         uint count;
         uint i;
 
-        bzero(rateset, sizeof(rateset));
+        memset(rateset, 0, sizeof(rateset));
         count = rs->count;
 
         for (i = 0; i < count; i++) {
diff --git a/drivers/staging/brcm80211/sys/wlc_rpc.h b/drivers/staging/brcm80211/sys/wlc_rpc.h
deleted file mode 100644
index db39645ccbdc..000000000000
--- a/drivers/staging/brcm80211/sys/wlc_rpc.h
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _WLC_RPC_H_
-#define _WLC_RPC_H_
-
-#include <wlc_types.h>
-
-/* RPC IDs, reordering is OK. This needs to be in sync with RPC_ID_TABLE below */
-typedef enum {
-        WLRPC_NULL_ID = 0,
-        WLRPC_WLC_REG_READ_ID,
-        WLRPC_WLC_REG_WRITE_ID,
-        WLRPC_WLC_MHF_SET_ID,
-        WLRPC_WLC_MHF_GET_ID,
-        WLRPC_WLC_BMAC_UP_PREP_ID,
-        WLRPC_WLC_BMAC_UP_FINISH_ID,
-        WLRPC_WLC_BMAC_DOWN_PREP_ID,
-        WLRPC_WLC_BMAC_DOWN_FINISH_ID,
-        WLRPC_WLC_BMAC_WRITE_HW_BCNTEMPLATES_ID,
-        WLRPC_WLC_BMAC_RESET_ID,
-        WLRPC_WLC_DNGL_REBOOT_ID,
-        WLRPC_WLC_BMAC_RPC_TXQ_WM_SET_ID,
-        WLRPC_WLC_BMAC_RPC_TXQ_WM_GET_ID,
-        WLRPC_WLC_BMAC_RPC_AGG_SET_ID,
-        WLRPC_WLC_BMAC_RPC_MSGLEVEL_SET_ID,
-        WLRPC_WLC_BMAC_RPC_AGG_LIMIT_SET_ID,
-        WLRPC_WLC_BMAC_RPC_AGG_LIMIT_GET_ID,
-        WLRPC_WLC_BMAC_INIT_ID,
-        WLRPC_WLC_BMAC_SET_CWMIN_ID,
-        WLRPC_WLC_BMAC_MUTE_ID,
-        WLRPC_WLC_PHY_DOIOVAR_ID,
-        WLRPC_WLC_PHY_HOLD_UPD_ID,
-        WLRPC_WLC_PHY_MUTE_UPD_ID,
-        WLRPC_WLC_PHY_CLEAR_TSSI_ID,
-        WLRPC_WLC_PHY_ANT_RXDIV_GET_ID,
-        WLRPC_WLC_PHY_ANT_RXDIV_SET_ID,
-        WLRPC_WLC_PHY_PREAMBLE_SET_ID,
-        WLRPC_WLC_PHY_FREQTRACK_END_ID,
-        WLRPC_WLC_PHY_FREQTRACK_START_ID,
-        WLRPC_WLC_PHY_IOCTL_ID,
-        WLRPC_WLC_PHY_NOISE_SAMPLE_REQUEST_ID,
-        WLRPC_WLC_PHY_CAL_PERICAL_ID,
-        WLRPC_WLC_PHY_TXPOWER_GET_ID,
-        WLRPC_WLC_PHY_TXPOWER_SET_ID,
-        WLRPC_WLC_PHY_TXPOWER_SROMLIMIT_ID,
-        WLRPC_WLC_PHY_RADAR_DETECT_ENABLE_ID,
-        WLRPC_WLC_PHY_RADAR_DETECT_RUN_ID,
-        WLRPC_WLC_PHY_TEST_ISON_ID,
-        WLRPC_WLC_BMAC_COPYFROM_OBJMEM_ID,
-        WLRPC_WLC_BMAC_COPYTO_OBJMEM_ID,
-        WLRPC_WLC_ENABLE_MAC_ID,
-        WLRPC_WLC_MCTRL_ID,
-        WLRPC_WLC_CORERESET_ID,
-        WLRPC_WLC_BMAC_READ_SHM_ID,
-        WLRPC_WLC_BMAC_READ_TSF_ID,
-        WLRPC_WLC_BMAC_SET_ADDRMATCH_ID,
-        WLRPC_WLC_BMAC_SET_CWMAX_ID,
-        WLRPC_WLC_BMAC_SET_RCMTA_ID,
-        WLRPC_WLC_BMAC_SET_SHM_ID,
-        WLRPC_WLC_SUSPEND_MAC_AND_WAIT_ID,
-        WLRPC_WLC_BMAC_WRITE_SHM_ID,
-        WLRPC_WLC_BMAC_WRITE_TEMPLATE_RAM_ID,
-        WLRPC_WLC_TX_FIFO_SUSPEND_ID,
-        WLRPC_WLC_TX_FIFO_RESUME_ID,
-        WLRPC_WLC_TX_FIFO_SUSPENDED_ID,
-        WLRPC_WLC_HW_ETHERADDR_ID,
-        WLRPC_WLC_SET_HW_ETHERADDR_ID,
-        WLRPC_WLC_BMAC_CHANSPEC_SET_ID,
-        WLRPC_WLC_BMAC_TXANT_SET_ID,
-        WLRPC_WLC_BMAC_ANTSEL_TYPE_SET_ID,
-        WLRPC_WLC_BMAC_TXFIFO_ID,
-        WLRPC_WLC_RADIO_READ_HWDISABLED_ID,
-        WLRPC_WLC_RM_CCA_MEASURE_ID,
-        WLRPC_WLC_SET_SHORTSLOT_ID,
-        WLRPC_WLC_WAIT_FOR_WAKE_ID,
-        WLRPC_WLC_PHY_TXPOWER_GET_CURRENT_ID,
-        WLRPC_WLC_PHY_TXPOWER_HW_CTRL_GET_ID,
-        WLRPC_WLC_PHY_TXPOWER_HW_CTRL_SET_ID,
-        WLRPC_WLC_PHY_BSSINIT_ID,
-        WLRPC_WLC_BAND_STF_SS_SET_ID,
-        WLRPC_WLC_PHY_BAND_FIRST_CHANSPEC_ID,
-        WLRPC_WLC_PHY_TXPOWER_LIMIT_SET_ID,
-        WLRPC_WLC_PHY_BAND_CHANNELS_ID,
-        WLRPC_WLC_BMAC_REVINFO_GET_ID,
-        WLRPC_WLC_BMAC_STATE_GET_ID,
-        WLRPC_WLC_BMAC_XMTFIFO_SZ_GET_ID,
-        WLRPC_WLC_BMAC_XMTFIFO_SZ_SET_ID,
-        WLRPC_WLC_BMAC_VALIDATE_CHIP_ACCESS_ID,
-        WLRPC_WLC_RM_CCA_COMPLETE_ID,
-        WLRPC_WLC_RECV_ID,
-        WLRPC_WLC_DOTXSTATUS_ID,
-        WLRPC_WLC_HIGH_DPC_ID,
-        WLRPC_WLC_FATAL_ERROR_ID,
-        WLRPC_WLC_PHY_SET_CHANNEL_14_WIDE_FILTER_ID,
-        WLRPC_WLC_PHY_NOISE_AVG_ID,
-        WLRPC_WLC_PHYCHAIN_INIT_ID,
-        WLRPC_WLC_PHYCHAIN_SET_ID,
-        WLRPC_WLC_PHYCHAIN_GET_ID,
-        WLRPC_WLC_PHY_TKIP_RIFS_WAR_ID,
-        WLRPC_WLC_BMAC_COPYFROM_VARS_ID,
-        WLRPC_WLC_BMAC_RETRYLIMIT_UPD_ID,
-        WLRPC_WLC_BMAC_BTC_MODE_SET_ID,
-        WLRPC_WLC_BMAC_BTC_MODE_GET_ID,
-        WLRPC_WLC_BMAC_BTC_WIRE_SET_ID,
-        WLRPC_WLC_BMAC_BTC_WIRE_GET_ID,
-        WLRPC_WLC_BMAC_SET_NORESET_ID,
-        WLRPC_WLC_AMPDU_TXSTATUS_COMPLETE_ID,
-        WLRPC_WLC_BMAC_FIFOERRORS_ID,
-        WLRPC_WLC_PHY_TXPOWER_GET_TARGET_MIN_ID,
-        WLRPC_WLC_PHY_TXPOWER_GET_TARGET_MAX_ID,
-        WLRPC_WLC_NOISE_CB_ID,
-        WLRPC_WLC_BMAC_LED_HW_DEINIT_ID,
-        WLRPC_WLC_BMAC_LED_HW_MASK_INIT_ID,
-        WLRPC_WLC_PLLREQ_ID,
-        WLRPC_WLC_BMAC_TACLEAR_ID,
-        WLRPC_WLC_BMAC_SET_CLK_ID,
-        WLRPC_WLC_PHY_OFDM_RATESET_WAR_ID,
-        WLRPC_WLC_PHY_BF_PREEMPT_ENABLE_ID,
-        WLRPC_WLC_BMAC_DOIOVARS_ID,
-        WLRPC_WLC_BMAC_DUMP_ID,
-        WLRPC_WLC_CISWRITE_ID,
-        WLRPC_WLC_CISDUMP_ID,
-        WLRPC_WLC_UPDATE_PHY_MODE_ID,
-        WLRPC_WLC_RESET_BMAC_DONE_ID,
-        WLRPC_WLC_BMAC_LED_BLINK_EVENT_ID,
-        WLRPC_WLC_BMAC_LED_SET_ID,
-        WLRPC_WLC_BMAC_LED_BLINK_ID,
-        WLRPC_WLC_BMAC_LED_ID,
-        WLRPC_WLC_BMAC_RATE_SHM_OFFSET_ID,
-        WLRPC_SI_ISCORE_UP_ID,
-        WLRPC_WLC_BMAC_PS_SWITCH_ID,
-        WLRPC_WLC_PHY_STF_SSMODE_GET_ID,
-        WLRPC_WLC_BMAC_DEBUG_ID,
-        WLRPC_WLC_EXTLOG_MSG_ID,
-        WLRPC_WLC_EXTLOG_CFG_ID,
-        WLRPC_BCM_ASSERT_LOG_ID,
-        WLRPC_BCM_ASSERT_TYPE_ID,
-        WLRPC_WLC_BMAC_SET_PHYCAL_CACHE_FLAG_ID,
-        WLRPC_WLC_BMAC_GET_PHYCAL_CACHE_FLAG_ID,
-        WLRPC_WLC_PHY_CAL_CACHE_INIT_ID,
-        WLRPC_WLC_PHY_CAL_CACHE_DEINIT_ID,
-        WLRPC_WLC_BMAC_HW_UP_ID,
-        WLRPC_WLC_BMAC_SET_TXPWR_PERCENT_ID,
-        WLRPC_WLC_PHYCHAIN_ACTIVE_GET_ID,
-        WLRPC_WLC_BMAC_BLINK_SYNC_ID,
-        WLRPC_WLC_BMAC_UCODE_DBGSEL_SET_ID,
-        WLRPC_WLC_BMAC_UCODE_DBGSEL_GET_ID,
-        WLRPC_WLC_PHY_RADAR_DETECT_MODE_SET_ID,
-        WLRPC_WLC_PHY_ACIM_NOISEM_RESET_NPHY_ID,
-        WLRPC_WLC_PHY_INTERFER_SET_NPHY_ID,
-        WLRPC_WLC_BMAC_IFSCTL_EDCRS_SET_ID,
-        WLRPC_WLC_PKTENGTX,
-        WLRPC_WLC_BMAC_SET_DEAF,
-        WLRPC_WLC_BMAC_CLEAR_DEAF,
-        WLRPC_WLC_BMAC_BTC_FLAGS_SET_ID,
-        WLRPC_WLC_BMAC_BTC_FLAGS_GET_ID,
-        WLRPC_WLC_BMAC_SET_RCMTA_TYPE_ID,
-        WLRPC_WLC_BMAC_BTC_FLAGS_UPD_ID,
-        WLRPC_WLC_BMAC_BTC_STUCKWAR_ID,
-        WLRPC_WLC_BMAC_CCA_STATS_READ_ID,
-        WLRPC_WLC_BMAC_ANTSEL_SET_ID,
-        WLRPC_WLC_BMAC_SET_UCODE_LOADED,
-        WLRPC_WLC_PHY_LDPC_SET_ID,
-
-        WLRPC_LAST
-} wlc_rpc_id_t;
-
-#if defined(BCMDBG) | 0
-struct name_entry {
-        int id;
-        char *name;
-};
-
-#define NAME_ENTRY(x) {x, #x}
-
-#define RPC_ID_TABLE { \
-        NAME_ENTRY(WLRPC_WLC_REG_READ_ID),      \
-        NAME_ENTRY(WLRPC_WLC_REG_WRITE_ID),     \
-        NAME_ENTRY(WLRPC_WLC_MHF_SET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_MHF_GET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_BMAC_UP_PREP_ID),  \
-        NAME_ENTRY(WLRPC_WLC_BMAC_UP_FINISH_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_DOWN_PREP_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_DOWN_FINISH_ID),      \
-        NAME_ENTRY(WLRPC_WLC_BMAC_WRITE_HW_BCNTEMPLATES_ID),    \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RESET_ID),    \
-        NAME_ENTRY(WLRPC_WLC_DNGL_REBOOT_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_TXQ_WM_SET_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_TXQ_WM_GET_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_AGG_SET_ID),      \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_MSGLEVEL_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_AGG_LIMIT_SET_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RPC_AGG_LIMIT_GET_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_INIT_ID),     \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_CWMIN_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_MUTE_ID),     \
-        NAME_ENTRY(WLRPC_WLC_PHY_DOIOVAR_ID),   \
-        NAME_ENTRY(WLRPC_WLC_PHY_HOLD_UPD_ID),  \
-        NAME_ENTRY(WLRPC_WLC_PHY_MUTE_UPD_ID),  \
-        NAME_ENTRY(WLRPC_WLC_PHY_CLEAR_TSSI_ID),        \
-        NAME_ENTRY(WLRPC_WLC_PHY_ANT_RXDIV_GET_ID),     \
-        NAME_ENTRY(WLRPC_WLC_PHY_ANT_RXDIV_SET_ID),     \
-        NAME_ENTRY(WLRPC_WLC_PHY_PREAMBLE_SET_ID),      \
-        NAME_ENTRY(WLRPC_WLC_PHY_FREQTRACK_END_ID),     \
-        NAME_ENTRY(WLRPC_WLC_PHY_FREQTRACK_START_ID),   \
-        NAME_ENTRY(WLRPC_WLC_PHY_IOCTL_ID),     \
-        NAME_ENTRY(WLRPC_WLC_PHY_NOISE_SAMPLE_REQUEST_ID),      \
-        NAME_ENTRY(WLRPC_WLC_PHY_CAL_PERICAL_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_GET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_SET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_SROMLIMIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_RADAR_DETECT_ENABLE_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_RADAR_DETECT_RUN_ID),  \
-        NAME_ENTRY(WLRPC_WLC_PHY_TEST_ISON_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_COPYFROM_OBJMEM_ID),  \
-        NAME_ENTRY(WLRPC_WLC_BMAC_COPYTO_OBJMEM_ID),    \
-        NAME_ENTRY(WLRPC_WLC_ENABLE_MAC_ID),    \
-        NAME_ENTRY(WLRPC_WLC_MCTRL_ID), \
-        NAME_ENTRY(WLRPC_WLC_CORERESET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_READ_SHM_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_READ_TSF_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_ADDRMATCH_ID),    \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_CWMAX_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_RCMTA_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_SHM_ID),  \
-        NAME_ENTRY(WLRPC_WLC_SUSPEND_MAC_AND_WAIT_ID),  \
-        NAME_ENTRY(WLRPC_WLC_BMAC_WRITE_SHM_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_WRITE_TEMPLATE_RAM_ID),       \
-        NAME_ENTRY(WLRPC_WLC_TX_FIFO_SUSPEND_ID),       \
-        NAME_ENTRY(WLRPC_WLC_TX_FIFO_RESUME_ID),        \
-        NAME_ENTRY(WLRPC_WLC_TX_FIFO_SUSPENDED_ID),     \
-        NAME_ENTRY(WLRPC_WLC_HW_ETHERADDR_ID),  \
-        NAME_ENTRY(WLRPC_WLC_SET_HW_ETHERADDR_ID),      \
-        NAME_ENTRY(WLRPC_WLC_BMAC_CHANSPEC_SET_ID),     \
-        NAME_ENTRY(WLRPC_WLC_BMAC_TXANT_SET_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_ANTSEL_TYPE_SET_ID),  \
-        NAME_ENTRY(WLRPC_WLC_BMAC_TXFIFO_ID),   \
-        NAME_ENTRY(WLRPC_WLC_RADIO_READ_HWDISABLED_ID), \
-        NAME_ENTRY(WLRPC_WLC_RM_CCA_MEASURE_ID),        \
-        NAME_ENTRY(WLRPC_WLC_SET_SHORTSLOT_ID), \
-        NAME_ENTRY(WLRPC_WLC_WAIT_FOR_WAKE_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_GET_CURRENT_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_HW_CTRL_GET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_HW_CTRL_SET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_BSSINIT_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BAND_STF_SS_SET_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_BAND_FIRST_CHANSPEC_ID),       \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_LIMIT_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_BAND_CHANNELS_ID),     \
-        NAME_ENTRY(WLRPC_WLC_BMAC_REVINFO_GET_ID),      \
-        NAME_ENTRY(WLRPC_WLC_BMAC_STATE_GET_ID),        \
-        NAME_ENTRY(WLRPC_WLC_BMAC_XMTFIFO_SZ_GET_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BMAC_XMTFIFO_SZ_SET_ID),   \
-        NAME_ENTRY(WLRPC_WLC_BMAC_VALIDATE_CHIP_ACCESS_ID),     \
-        NAME_ENTRY(WLRPC_WLC_RM_CCA_COMPLETE_ID),       \
-        NAME_ENTRY(WLRPC_WLC_RECV_ID),  \
-        NAME_ENTRY(WLRPC_WLC_DOTXSTATUS_ID),    \
-        NAME_ENTRY(WLRPC_WLC_HIGH_DPC_ID),      \
-        NAME_ENTRY(WLRPC_WLC_FATAL_ERROR_ID),   \
-        NAME_ENTRY(WLRPC_WLC_PHY_SET_CHANNEL_14_WIDE_FILTER_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_NOISE_AVG_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHYCHAIN_INIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHYCHAIN_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHYCHAIN_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_TKIP_RIFS_WAR_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_COPYFROM_VARS_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RETRYLIMIT_UPD_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_MODE_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_MODE_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_WIRE_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_WIRE_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_NORESET_ID), \
-        NAME_ENTRY(WLRPC_WLC_AMPDU_TXSTATUS_COMPLETE_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_FIFOERRORS_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_GET_TARGET_MIN_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_TXPOWER_GET_TARGET_MAX_ID), \
-        NAME_ENTRY(WLRPC_WLC_NOISE_CB_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_HW_DEINIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_HW_MASK_INIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_PLLREQ_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_TACLEAR_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_CLK_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_OFDM_RATESET_WAR_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_BF_PREEMPT_ENABLE_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_DOIOVARS_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_DUMP_ID), \
-        NAME_ENTRY(WLRPC_WLC_CISWRITE_ID), \
-        NAME_ENTRY(WLRPC_WLC_CISDUMP_ID), \
-        NAME_ENTRY(WLRPC_WLC_UPDATE_PHY_MODE_ID), \
-        NAME_ENTRY(WLRPC_WLC_RESET_BMAC_DONE_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_BLINK_EVENT_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_BLINK_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_LED_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_RATE_SHM_OFFSET_ID), \
-        NAME_ENTRY(WLRPC_SI_ISCORE_UP_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_PS_SWITCH_ID),        \
-        NAME_ENTRY(WLRPC_WLC_PHY_STF_SSMODE_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_DEBUG_ID), \
-        NAME_ENTRY(WLRPC_WLC_EXTLOG_MSG_ID), \
-        NAME_ENTRY(WLRPC_WLC_EXTLOG_CFG_ID), \
-        NAME_ENTRY(WLRPC_BCM_ASSERT_LOG_ID), \
-        NAME_ENTRY(WLRPC_BCM_ASSERT_TYPE_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_PHYCAL_CACHE_FLAG_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_GET_PHYCAL_CACHE_FLAG_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_CAL_CACHE_INIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_CAL_CACHE_DEINIT_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_HW_UP_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_TXPWR_PERCENT_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHYCHAIN_ACTIVE_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BLINK_SYNC_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_UCODE_DBGSEL_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_UCODE_DBGSEL_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_RADAR_DETECT_MODE_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_ACIM_NOISEM_RESET_NPHY_ID), \
-        NAME_ENTRY(WLRPC_WLC_PHY_INTERFER_SET_NPHY_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_IFSCTL_EDCRS_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_PKTENGTX), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_DEAF), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_CLEAR_DEAF), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_FLAGS_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_BTC_FLAGS_GET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_RCMTA_TYPE_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_CCA_STATS_READ_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_ANTSEL_SET_ID), \
-        NAME_ENTRY(WLRPC_WLC_BMAC_SET_UCODE_LOADED), \
-        NAME_ENTRY(WLRPC_WLC_PHY_LDPC_SET_ID),  \
-        {0, NULL} \
-        }
-
-static __inline char *_wlc_rpc_id_lookup(const struct name_entry *tbl, int _id)
-{
-        const struct name_entry *elt = tbl;
-        static char __unknown[64];
-        for (; elt->name != NULL; elt++) {
-                if (_id == elt->id)
-                        break;
-        }
-        if (_id == elt->id)
-                strncpy(__unknown, elt->name, sizeof(__unknown));
-        else
-                snprintf(__unknown, sizeof(__unknown), "ID:%d", _id);
-        return __unknown;
-}
-
-#define WLC_RPC_ID_LOOKUP(tbl, _id) (_wlc_rpc_id_lookup(tbl, _id))
-
-#endif                          /* BCMDBG */
-
-/* refer to txpwr_limits_t for each elements, mcs32 is the at the end for 1 byte */
-#define TXPOWER_XDR_SZ  (roundup(WLC_NUM_RATES_CCK, 4) + roundup(WLC_NUM_RATES_OFDM, 4) * 4 + \
-        roundup(WLC_NUM_RATES_MCS_1_STREAM, 4) * 6 + roundup(WLC_NUM_RATES_MCS_2_STREAM, 4) * 2 + \
-        roundup(1, 4))
-
-#define wlc_rpc_txpwr_limits(b, txpwr, op, err) \
-        do {                                                                                    \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->cck, WLC_NUM_RATES_CCK);            \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 20 MHz Legacy OFDM rates with SISO transmission */                           \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->ofdm, WLC_NUM_RATES_OFDM);  \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 20 MHz Legacy OFDM rates with CDD transmission */                            \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->ofdm_cdd, WLC_NUM_RATES_OFDM);   \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 40 MHz Legacy OFDM rates with SISO transmission */                           \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->ofdm_40_siso, WLC_NUM_RATES_OFDM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 40 MHz Legacy OFDM rates with CDD transmission */                            \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->ofdm_40_cdd, WLC_NUM_RATES_OFDM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 20MHz MCS rates SISO/CDD/STBC/SDM */                                                  \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_20_siso, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_20_cdd, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_20_stbc, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_20_mimo, WLC_NUM_RATES_MCS_2_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                /* 40MHz MCS rates SISO/CDD/STBC/SDM */                                                  \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_40_siso, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_40_cdd, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_40_stbc, WLC_NUM_RATES_MCS_1_STREAM); \
-                ASSERT(!(err));                                                                 \
-                                                                                                \
-                (err) = bcm_xdr_##op##_u8_vec((b), (txpwr)->mcs_40_mimo, WLC_NUM_RATES_MCS_2_STREAM); \
-                ASSERT(!(err));                                                                 \
-        } while (0)
-
-typedef struct wlc_rpc_ctx {
-        rpc_info_t *rpc;
-        wlc_info_t *wlc;
-        wlc_hw_info_t *wlc_hw;
-} wlc_rpc_ctx_t;
-
-static inline rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b,
-                                           uint len, wlc_rpc_id_t rpc_id)
-{
-        rpc_buf_t *rpc_buf;
-
-        rpc_buf = bcm_rpc_buf_alloc(rpc, len + sizeof(u32));
-
-        if (!rpc_buf)
-                return NULL;
-
-        bcm_xdr_buf_init(b, bcm_rpc_buf_data(bcm_rpc_tp_get(rpc), rpc_buf),
-                         len + sizeof(u32));
-
-        bcm_xdr_pack_u32(b, rpc_id);
-
-        return rpc_buf;
-}
-
-#if defined(BCMDBG)
-static __inline wlc_rpc_id_t
-wlc_rpc_id_get(struct rpc_info *rpc, rpc_buf_t *buf)
-{
-        wlc_rpc_id_t rpc_id;
-        bcm_xdr_buf_t b;
-
-        bcm_xdr_buf_init(&b, bcm_rpc_buf_data(bcm_rpc_tp_get(rpc), buf),
-                         sizeof(u32));
-
-        bcm_xdr_unpack_u32(&b, (u32 *)((unsigned long) & rpc_id));
-        return rpc_id;
-}
-#endif
-
-static __inline int _wlc_rpc_call(struct rpc_info *rpc, rpc_buf_t *send)
-{
-        int _err = 0;
-#if defined(BCMDBG)
-        wlc_rpc_id_t rpc_id = wlc_rpc_id_get(rpc, send);
-        /* const struct name_entry rpc_name_tbl[] = RPC_ID_TABLE; */
-        static struct name_entry rpc_name_tbl[] = RPC_ID_TABLE;
-        WL_TRACE(("%s: Called id %s\n", __func__,
-                  WLC_RPC_ID_LOOKUP(rpc_name_tbl, rpc_id)));
-#endif
-        _err = bcm_rpc_call(rpc, send);
-        if (_err) {
-#if defined(BCMDBG)
-                WL_ERROR(("%s: Call id %s FAILED\n", __func__,
-                          WLC_RPC_ID_LOOKUP(rpc_name_tbl, rpc_id)));
-#endif
-                _err = 0;
-        }
-        return _err;
-}
-
-#define wlc_rpc_call(rpc, send) (_wlc_rpc_call(rpc, send))
-
-#include <sbhnddma.h>
-#include <sbhndpio.h>
-#include <d11.h>
-
-#ifdef WLC_LOW
-extern void wlc_rpc_bmac_dispatch(wlc_rpc_ctx_t *rpc_ctx, struct rpc_buf *buf);
-extern void wlc_rpc_bmac_dump_txfifohist(wlc_hw_info_t *wlc_hw,
-                                         bool dump_clear);
-#else
-extern void wlc_rpc_high_dispatch(wlc_rpc_ctx_t *ctx, struct rpc_buf *buf);
-#endif
-
-/* Packed structure for ease of transport across RPC bus along u32 boundary */
-typedef struct wlc_rpc_txstatus {
-        u32 PAD_framelen;
-        u32 status_frameid;
-        u32 sequence_lasttxtime;
-        u32 ackphyrxsh_phyerr;
-} wlc_rpc_txstatus_t;
-
-static inline
-    void txstatus2rpc_txstatus(tx_status_t *txstatus,
-                               wlc_rpc_txstatus_t *rpc_txstatus)
-{
-        rpc_txstatus->PAD_framelen = txstatus->framelen;
-        rpc_txstatus->status_frameid =
-            (txstatus->status << 16) | txstatus->frameid;
-        rpc_txstatus->sequence_lasttxtime =
-            (txstatus->sequence << 16) | txstatus->lasttxtime;
-        rpc_txstatus->ackphyrxsh_phyerr =
-            (txstatus->ackphyrxsh << 16) | txstatus->phyerr;
-}
-
-static inline
-    void rpc_txstatus2txstatus(wlc_rpc_txstatus_t *rpc_txstatus,
-                               tx_status_t *txstatus)
-{
-        txstatus->framelen = rpc_txstatus->PAD_framelen & 0xffff;
-        txstatus->status = (rpc_txstatus->status_frameid >> 16) & 0xffff;
-        txstatus->frameid = rpc_txstatus->status_frameid & 0xffff;
-        txstatus->sequence = (rpc_txstatus->sequence_lasttxtime >> 16) & 0xffff;
-        txstatus->lasttxtime = rpc_txstatus->sequence_lasttxtime & 0xffff;
-        txstatus->ackphyrxsh = (rpc_txstatus->ackphyrxsh_phyerr >> 16) & 0xffff;
-        txstatus->phyerr = rpc_txstatus->ackphyrxsh_phyerr & 0xffff;
-}
-
-extern void wlc_bmac_dngl_reboot(rpc_info_t *rpc);
-
-#endif                          /* WLC_RPC_H */
diff --git a/drivers/staging/brcm80211/sys/wlc_rpctx.h b/drivers/staging/brcm80211/sys/wlc_rpctx.h
deleted file mode 100644
index 7427154a4bd4..000000000000
--- a/drivers/staging/brcm80211/sys/wlc_rpctx.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _wlc_rpctx_h_
-#define _wlc_rpctx_h_
-
-/* forward declaration */
-struct wlc_info;
-
-/* This controls how many packets are given to the dongle. This is required as
- * NTXD needs to be power of 2 but we may not have enough memory to absorb that
- * large number of frames
- */
-#ifndef NRPCTXBUFPOST
-#define NRPCTXBUFPOST NTXD
-#endif
-
-#if defined(WLC_HIGH_ONLY)
-
-struct wlc_rpc_phy {
-        struct rpc_info *rpc;
-};
-
-#define RPCTX_ENAB(pub)         (true)
-extern rpctx_info_t *wlc_rpctx_attach(wlc_pub_t *pub, struct wlc_info *wlc);
-extern int wlc_rpctx_fifoinit(rpctx_info_t *rpctx, uint fifo, uint ntxd);
-extern void wlc_rpctx_detach(rpctx_info_t *rpctx);
-extern int wlc_rpctx_dump(rpctx_info_t *rpctx, struct bcmstrbuf *b);
-extern void *wlc_rpctx_getnexttxp(rpctx_info_t *rpctx, uint fifo);
-extern void wlc_rpctx_txreclaim(rpctx_info_t *rpctx);
-extern uint wlc_rpctx_txavail(rpctx_info_t *rpctx, uint fifo);
-extern int wlc_rpctx_pkteng(rpctx_info_t *rpctx, uint fifo, void *p);
-extern int wlc_rpctx_tx(rpctx_info_t *rpctx, uint fifo, void *p, bool commit,
-                        u16 frameid, u8 txpktpend);
-extern void wlc_rpctx_txpktpendinc(rpctx_info_t *rpctx, uint fifo, u8 val);
-extern void wlc_rpctx_txpktpenddec(rpctx_info_t *rpctx, uint fifo, u8 val);
-extern void wlc_rpctx_txpktpendclr(rpctx_info_t *rpctx, uint fifo);
-extern int wlc_rpctx_txpktpend(rpctx_info_t *rpctx, uint fifo, bool all);
-
-#else
-#define RPCTX_ENAB(pub)                 (false)
-#define wlc_rpctx_attach(pub, wlc)      (NULL)
-#define wlc_rpctx_fifoinit(rpctx, fifo, ntxd) (0)
-#define wlc_rpctx_detach(rpctx)         ASSERT(0)
-#define wlc_rpctx_txavail(rpctx, f)     (false)
-#define wlc_rpctx_dump(rpctx, b)                (0)
-#define wlc_rpctx_getnexttxp(rpctx, f)          (NULL)
-#define wlc_rpctx_txreclaim(rpctx)              ASSERT(0)
-#define wlc_rpctx_pkteng(rpctx, fifo, p)        do { } while (0)
-#define wlc_rpctx_tx(rpctx, f, p, c, fid, t)    (0)
-#define wlc_rpctx_txpktpendinc(rpctx, f, val)   do { } while (0)
-#define wlc_rpctx_txpktpenddec(rpctx, f, val)   do { } while (0)
-#define wlc_rpctx_txpktpendclr(rpctx, f)        do { } while (0)
-#define wlc_rpctx_txpktpend(rpctx, f, all)      (0)
-
-#endif                          /* WLC_HIGH */
-
-#endif                          /* _wlc_rpctx_h_ */
diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/sys/wlc_scb.h
index ce26c740e6c1..fe84e993b52a 100644
--- a/drivers/staging/brcm80211/sys/wlc_scb.h
+++ b/drivers/staging/brcm80211/sys/wlc_scb.h
@@ -19,7 +19,7 @@
 
 #include <proto/802.1d.h>
 
-extern bool wlc_aggregatable(wlc_info_t *wlc, u8 tid);
+extern bool wlc_aggregatable(struct wlc_info *wlc, u8 tid);
 
 #define AMPDU_TX_BA_MAX_WSIZE   64      /* max Tx ba window size (in pdu) */
 /* structure to store per-tid state for the ampdu initiator */
diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c
index 4728ad90e295..8975b09a7438 100644
--- a/drivers/staging/brcm80211/sys/wlc_stf.c
+++ b/drivers/staging/brcm80211/sys/wlc_stf.c
@@ -15,8 +15,8 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
@@ -25,29 +25,33 @@
 #include <proto/802.11.h>
 #include <wlioctl.h>
 #include <bcmwifi.h>
+#include <sbhndpio.h>
+#include <sbhnddma.h>
 #include <d11.h>
 #include <wlc_rate.h>
 #include <wlc_pub.h>
 #include <wlc_key.h>
 #include <wlc_channel.h>
 #include <wlc_bsscfg.h>
+#include <wlc_event.h>
 #include <wlc_mac80211.h>
 #include <wlc_scb.h>
 #include <wl_export.h>
 #include <wlc_bmac.h>
 #include <wlc_stf.h>
+#include <wl_dbg.h>
 
 #define WLC_STF_SS_STBC_RX(wlc) (WLCISNPHY(wlc->band) && \
         NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))
 
-static s8 wlc_stf_stbc_rx_get(wlc_info_t *wlc);
-static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, s32 int_val);
-static int wlc_stf_txcore_set(wlc_info_t *wlc, u8 Nsts, u8 val);
-static int wlc_stf_spatial_policy_set(wlc_info_t *wlc, int val);
-static void wlc_stf_stbc_rx_ht_update(wlc_info_t *wlc, int val);
+static s8 wlc_stf_stbc_rx_get(struct wlc_info *wlc);
+static bool wlc_stf_stbc_tx_set(struct wlc_info *wlc, s32 int_val);
+static int wlc_stf_txcore_set(struct wlc_info *wlc, u8 Nsts, u8 val);
+static int wlc_stf_spatial_policy_set(struct wlc_info *wlc, int val);
+static void wlc_stf_stbc_rx_ht_update(struct wlc_info *wlc, int val);
 
-static void _wlc_stf_phy_txant_upd(wlc_info_t *wlc);
-static u16 _wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec);
+static void _wlc_stf_phy_txant_upd(struct wlc_info *wlc);
+static u16 _wlc_stf_phytxchain_sel(struct wlc_info *wlc, ratespec_t rspec);
 
 #define NSTS_1  1
 #define NSTS_2  2
@@ -61,7 +65,7 @@ const u8 txcore_default[5] = {
         (0x0f)                  /* For Nsts = 4, enable all cores */
 };
 
-static void wlc_stf_stbc_rx_ht_update(wlc_info_t *wlc, int val)
+static void wlc_stf_stbc_rx_ht_update(struct wlc_info *wlc, int val)
 {
         ASSERT((val == HT_CAP_RX_STBC_NO)
                || (val == HT_CAP_RX_STBC_ONE_STREAM));
@@ -82,7 +86,7 @@ static void wlc_stf_stbc_rx_ht_update(wlc_info_t *wlc, int val)
 }
 
 /* every WLC_TEMPSENSE_PERIOD seconds temperature check to decide whether to turn on/off txchain */
-void wlc_tempsense_upd(wlc_info_t *wlc)
+void wlc_tempsense_upd(struct wlc_info *wlc)
 {
         wlc_phy_t *pi = wlc->band->pi;
         uint active_chains, txchain;
@@ -106,7 +110,7 @@ void wlc_tempsense_upd(wlc_info_t *wlc)
 }
 
 void
-wlc_stf_ss_algo_channel_get(wlc_info_t *wlc, u16 *ss_algo_channel,
+wlc_stf_ss_algo_channel_get(struct wlc_info *wlc, u16 *ss_algo_channel,
                             chanspec_t chanspec)
 {
         tx_power_t power;
@@ -147,12 +151,12 @@ wlc_stf_ss_algo_channel_get(wlc_info_t *wlc, u16 *ss_algo_channel,
                 setbit(ss_algo_channel, PHY_TXC1_MODE_STBC);
 }
 
-static s8 wlc_stf_stbc_rx_get(wlc_info_t *wlc)
+static s8 wlc_stf_stbc_rx_get(struct wlc_info *wlc)
 {
         return (wlc->ht_cap.cap & HT_CAP_RX_STBC_MASK) >> HT_CAP_RX_STBC_SHIFT;
 }
 
-static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, s32 int_val)
+static bool wlc_stf_stbc_tx_set(struct wlc_info *wlc, s32 int_val)
 {
         if ((int_val != AUTO) && (int_val != OFF) && (int_val != ON)) {
                 return false;
@@ -173,7 +177,7 @@ static bool wlc_stf_stbc_tx_set(wlc_info_t *wlc, s32 int_val)
         return true;
 }
 
-bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, s32 int_val)
+bool wlc_stf_stbc_rx_set(struct wlc_info *wlc, s32 int_val)
 {
         if ((int_val != HT_CAP_RX_STBC_NO)
             && (int_val != HT_CAP_RX_STBC_ONE_STREAM)) {
@@ -190,10 +194,10 @@ bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, s32 int_val)
         return true;
 }
 
-static int wlc_stf_txcore_set(wlc_info_t *wlc, u8 Nsts, u8 core_mask)
+static int wlc_stf_txcore_set(struct wlc_info *wlc, u8 Nsts, u8 core_mask)
 {
-        WL_TRACE(("wl%d: %s: Nsts %d core_mask %x\n",
-                  wlc->pub->unit, __func__, Nsts, core_mask));
+        WL_TRACE("wl%d: %s: Nsts %d core_mask %x\n",
+                 wlc->pub->unit, __func__, Nsts, core_mask);
 
         ASSERT((Nsts > 0) && (Nsts <= MAX_STREAMS_SUPPORTED));
 
@@ -227,12 +231,12 @@ static int wlc_stf_txcore_set(wlc_info_t *wlc, u8 Nsts, u8 core_mask)
         return BCME_OK;
 }
 
-static int wlc_stf_spatial_policy_set(wlc_info_t *wlc, int val)
+static int wlc_stf_spatial_policy_set(struct wlc_info *wlc, int val)
 {
         int i;
         u8 core_mask = 0;
 
-        WL_TRACE(("wl%d: %s: val %x\n", wlc->pub->unit, __func__, val));
+        WL_TRACE("wl%d: %s: val %x\n", wlc->pub->unit, __func__, val);
 
         wlc->stf->spatial_policy = (s8) val;
         for (i = 1; i <= MAX_STREAMS_SUPPORTED; i++) {
@@ -243,7 +247,7 @@ static int wlc_stf_spatial_policy_set(wlc_info_t *wlc, int val)
         return BCME_OK;
 }
 
-int wlc_stf_txchain_set(wlc_info_t *wlc, s32 int_val, bool force)
+int wlc_stf_txchain_set(struct wlc_info *wlc, s32 int_val, bool force)
 {
         u8 txchain = (u8) int_val;
         u8 txstreams;
@@ -274,13 +278,15 @@ int wlc_stf_txchain_set(wlc_info_t *wlc, s32 int_val, bool force)
                                 if (RSPEC_STF(wlc->bandstate[i]->rspec_override)
                                     != PHY_TXC1_MODE_SISO) {
                                         wlc->bandstate[i]->rspec_override = 0;
-                                        WL_ERROR(("%s(): temp sense override non-SISO" " rspec_override.\n", __func__));
+                                        WL_ERROR("%s(): temp sense override non-SISO rspec_override\n",
+                                                 __func__);
                                 }
                                 if (RSPEC_STF
                                     (wlc->bandstate[i]->mrspec_override) !=
                                     PHY_TXC1_MODE_SISO) {
                                         wlc->bandstate[i]->mrspec_override = 0;
-                                        WL_ERROR(("%s(): temp sense override non-SISO" " mrspec_override.\n", __func__));
+                                        WL_ERROR("%s(): temp sense override non-SISO mrspec_override\n",
+                                                 __func__);
                                 }
                         }
         }
@@ -303,7 +309,7 @@ int wlc_stf_txchain_set(wlc_info_t *wlc, s32 int_val, bool force)
         return BCME_OK;
 }
 
-int wlc_stf_rxchain_set(wlc_info_t *wlc, s32 int_val)
+int wlc_stf_rxchain_set(struct wlc_info *wlc, s32 int_val)
 {
         u8 rxchain_cnt;
         u8 rxchain = (u8) int_val;
@@ -367,7 +373,7 @@ int wlc_stf_rxchain_set(wlc_info_t *wlc, s32 int_val)
 }
 
 /* update wlc->stf->ss_opmode which represents the operational stf_ss mode we're using */
-int wlc_stf_ss_update(wlc_info_t *wlc, wlcband_t *band)
+int wlc_stf_ss_update(struct wlc_info *wlc, struct wlcband *band)
 {
         int ret_code = 0;
         u8 prev_stf_ss;
@@ -402,7 +408,7 @@ int wlc_stf_ss_update(wlc_info_t *wlc, wlcband_t *band)
         return ret_code;
 }
 
-int wlc_stf_attach(wlc_info_t *wlc)
+int wlc_stf_attach(struct wlc_info *wlc)
 {
         wlc->bandstate[BAND_2G_INDEX]->band_stf_ss_mode = PHY_TXC1_MODE_SISO;
         wlc->bandstate[BAND_5G_INDEX]->band_stf_ss_mode = PHY_TXC1_MODE_CDD;
@@ -425,11 +431,11 @@ int wlc_stf_attach(wlc_info_t *wlc)
         return 0;
 }
 
-void wlc_stf_detach(wlc_info_t *wlc)
+void wlc_stf_detach(struct wlc_info *wlc)
 {
 }
 
-int wlc_stf_ant_txant_validate(wlc_info_t *wlc, s8 val)
+int wlc_stf_ant_txant_validate(struct wlc_info *wlc, s8 val)
 {
         int bcmerror = BCME_OK;
 
@@ -476,7 +482,7 @@ int wlc_stf_ant_txant_validate(wlc_info_t *wlc, s8 val)
  *    do tx-antenna selection for SISO transmissions
  * for NREV>=7, bit 6 and bit 7 mean antenna 0 and 1 respectively, nit6+bit7 means both cores active
 */
-static void _wlc_stf_phy_txant_upd(wlc_info_t *wlc)
+static void _wlc_stf_phy_txant_upd(struct wlc_info *wlc)
 {
         s8 txant;
 
@@ -517,12 +523,12 @@ static void _wlc_stf_phy_txant_upd(wlc_info_t *wlc)
         wlc_bmac_txant_set(wlc->hw, wlc->stf->phytxant);
 }
 
-void wlc_stf_phy_txant_upd(wlc_info_t *wlc)
+void wlc_stf_phy_txant_upd(struct wlc_info *wlc)
 {
         _wlc_stf_phy_txant_upd(wlc);
 }
 
-void wlc_stf_phy_chain_calc(wlc_info_t *wlc)
+void wlc_stf_phy_chain_calc(struct wlc_info *wlc)
 {
         /* get available rx/tx chains */
         wlc->stf->hw_txchain = (u8) getintvar(wlc->pub->vars, "txchain");
@@ -559,7 +565,7 @@ void wlc_stf_phy_chain_calc(wlc_info_t *wlc)
         wlc_stf_spatial_policy_set(wlc, MIN_SPATIAL_EXPANSION);
 }
 
-static u16 _wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec)
+static u16 _wlc_stf_phytxchain_sel(struct wlc_info *wlc, ratespec_t rspec)
 {
         u16 phytxant = wlc->stf->phytxant;
 
@@ -572,12 +578,12 @@ static u16 _wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec)
         return phytxant;
 }
 
-u16 wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec)
+u16 wlc_stf_phytxchain_sel(struct wlc_info *wlc, ratespec_t rspec)
 {
         return _wlc_stf_phytxchain_sel(wlc, rspec);
 }
 
-u16 wlc_stf_d11hdrs_phyctl_txant(wlc_info_t *wlc, ratespec_t rspec)
+u16 wlc_stf_d11hdrs_phyctl_txant(struct wlc_info *wlc, ratespec_t rspec)
 {
         u16 phytxant = wlc->stf->phytxant;
         u16 mask = PHY_TXC_ANT_MASK;
diff --git a/drivers/staging/brcm80211/sys/wlc_stf.h b/drivers/staging/brcm80211/sys/wlc_stf.h
index ee9b02a119bb..8de6382e620d 100644
--- a/drivers/staging/brcm80211/sys/wlc_stf.h
+++ b/drivers/staging/brcm80211/sys/wlc_stf.h
@@ -20,23 +20,24 @@
 #define MIN_SPATIAL_EXPANSION   0
 #define MAX_SPATIAL_EXPANSION   1
 
-extern int wlc_stf_attach(wlc_info_t *wlc);
-extern void wlc_stf_detach(wlc_info_t *wlc);
+extern int wlc_stf_attach(struct wlc_info *wlc);
+extern void wlc_stf_detach(struct wlc_info *wlc);
 
-extern void wlc_tempsense_upd(wlc_info_t *wlc);
-extern void wlc_stf_ss_algo_channel_get(wlc_info_t *wlc,
+extern void wlc_tempsense_upd(struct wlc_info *wlc);
+extern void wlc_stf_ss_algo_channel_get(struct wlc_info *wlc,
                                         u16 *ss_algo_channel,
                                         chanspec_t chanspec);
-extern int wlc_stf_ss_update(wlc_info_t *wlc, struct wlcband *band);
-extern void wlc_stf_phy_txant_upd(wlc_info_t *wlc);
-extern int wlc_stf_txchain_set(wlc_info_t *wlc, s32 int_val, bool force);
-extern int wlc_stf_rxchain_set(wlc_info_t *wlc, s32 int_val);
-extern bool wlc_stf_stbc_rx_set(wlc_info_t *wlc, s32 int_val);
+extern int wlc_stf_ss_update(struct wlc_info *wlc, struct wlcband *band);
+extern void wlc_stf_phy_txant_upd(struct wlc_info *wlc);
+extern int wlc_stf_txchain_set(struct wlc_info *wlc, s32 int_val, bool force);
+extern int wlc_stf_rxchain_set(struct wlc_info *wlc, s32 int_val);
+extern bool wlc_stf_stbc_rx_set(struct wlc_info *wlc, s32 int_val);
 
-extern int wlc_stf_ant_txant_validate(wlc_info_t *wlc, s8 val);
-extern void wlc_stf_phy_txant_upd(wlc_info_t *wlc);
-extern void wlc_stf_phy_chain_calc(wlc_info_t *wlc);
-extern u16 wlc_stf_phytxchain_sel(wlc_info_t *wlc, ratespec_t rspec);
-extern u16 wlc_stf_d11hdrs_phyctl_txant(wlc_info_t *wlc, ratespec_t rspec);
-extern u16 wlc_stf_spatial_expansion_get(wlc_info_t *wlc, ratespec_t rspec);
+extern int wlc_stf_ant_txant_validate(struct wlc_info *wlc, s8 val);
+extern void wlc_stf_phy_txant_upd(struct wlc_info *wlc);
+extern void wlc_stf_phy_chain_calc(struct wlc_info *wlc);
+extern u16 wlc_stf_phytxchain_sel(struct wlc_info *wlc, ratespec_t rspec);
+extern u16 wlc_stf_d11hdrs_phyctl_txant(struct wlc_info *wlc, ratespec_t rspec);
+extern u16 wlc_stf_spatial_expansion_get(struct wlc_info *wlc,
+                                         ratespec_t rspec);
 #endif                          /* _wlc_stf_h_ */
diff --git a/drivers/staging/brcm80211/sys/wlc_types.h b/drivers/staging/brcm80211/sys/wlc_types.h
index 33047ebab979..df6e04c6ac58 100644
--- a/drivers/staging/brcm80211/sys/wlc_types.h
+++ b/drivers/staging/brcm80211/sys/wlc_types.h
@@ -19,34 +19,19 @@
 
 /* forward declarations */
 
-typedef struct wlc_info wlc_info_t;
-typedef struct wlc_hw_info wlc_hw_info_t;
-typedef struct wlc_if wlc_if_t;
-typedef struct wl_if wl_if_t;
-typedef struct led_info led_info_t;
-typedef struct bmac_led bmac_led_t;
-typedef struct bmac_led_info bmac_led_info_t;
-typedef struct scb_module scb_module_t;
-typedef struct ba_info ba_info_t;
-typedef struct ampdu_info ampdu_info_t;
-typedef struct ratesel_info ratesel_info_t;
-typedef struct wlc_ap_info wlc_ap_info_t;
-typedef struct wlc_auth_info wlc_auth_info_t;
-typedef struct supplicant supplicant_t;
-typedef struct authenticator authenticator_t;
-typedef struct antsel_info antsel_info_t;
-#if !defined(WLC_LOW)
-typedef struct rpctx_info rpctx_info_t;
-#endif
-#ifdef WLC_LOW
-typedef struct bmac_pmq bmac_pmq_t;
-#endif
+struct wlc_info;
+struct wlc_hw_info;
+struct wlc_if;
+struct wl_if;
+struct ampdu_info;
+struct antsel_info;
+struct bmac_pmq;
 
 struct d11init;
 
 #ifndef _hnddma_pub_
 #define _hnddma_pub_
-typedef const struct hnddma_pub hnddma_t;
+struct hnddma_pub;
 #endif                          /* _hnddma_pub_ */
 
 #endif                          /* _wlc_types_h_ */
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index 75a7e3a5c009..ddd2f9d64c20 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -14,11 +14,16 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <hndsoc.h>
@@ -26,8 +31,8 @@
 #include <pcicfg.h>
 #include <bcmdevs.h>
 
-#define BCM47162_DMP() ((CHIPID(sih->chip) == BCM47162_CHIP_ID) && \
-                (CHIPREV(sih->chiprev) == 0) && \
+#define BCM47162_DMP() ((sih->chip == BCM47162_CHIP_ID) && \
+                (sih->chiprev == 0) && \
                 (sii->coreid[sii->curidx] == MIPS74K_CORE_ID))
 
 /* EROM parsing */
@@ -115,7 +120,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
 
         erombase = R_REG(sii->osh, &cc->eromptr);
 
-        switch (BUSTYPE(sih->bustype)) {
+        switch (sih->bustype) {
         case SI_BUS:
                 eromptr = (u32 *) REG_MAP(erombase, SI_CORE_SIZE);
                 break;
@@ -125,7 +130,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
                 sii->curwrap = (void *)((unsigned long)regs + SI_CORE_SIZE);
 
                 /* Now point the window at the erom */
-                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, erombase);
+                pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, erombase);
                 eromptr = regs;
                 break;
 
@@ -330,7 +335,7 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
         ASSERT((sii->intrsenabled_fn == NULL)
                || !(*(sii)->intrsenabled_fn) ((sii)->intr_arg));
 
-        switch (BUSTYPE(sih->bustype)) {
+        switch (sih->bustype) {
         case SI_BUS:
                 /* map new one */
                 if (!sii->regs[coreidx]) {
@@ -347,10 +352,10 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
 
         case PCI_BUS:
                 /* point bar0 window */
-                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, addr);
+                pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, addr);
                 regs = sii->curmap;
                 /* point bar0 2nd 4KB window */
-                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN2, 4, wrap);
+                pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap);
                 break;
 
 #ifdef BCMSDIO
@@ -504,7 +509,7 @@ uint ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
         if (coreidx >= SI_MAXCORES)
                 return 0;
 
-        if (BUSTYPE(sih->bustype) == SI_BUS) {
+        if (sih->bustype == SI_BUS) {
                 /* If internal bus, we can always get at everything */
                 fast = true;
                 /* map if does not exist */
@@ -514,7 +519,7 @@ uint ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
                         ASSERT(GOODREGS(sii->regs[coreidx]));
                 }
                 r = (u32 *) ((unsigned char *) sii->regs[coreidx] + regoff);
-        } else if (BUSTYPE(sih->bustype) == PCI_BUS) {
+        } else if (sih->bustype == PCI_BUS) {
                 /* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
 
                 if ((sii->coreid[coreidx] == CC_CORE_ID) && SI_FAST(sii)) {
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index c909832c7ee1..d820e7b9e970 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -14,11 +14,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
 #include <siutils.h>
@@ -77,7 +79,7 @@ typedef struct {
         uint ccrev;             /* chipc revision */
         otp_fn_t *fn;           /* OTP functions */
         si_t *sih;              /* Saved sb handle */
-        osl_t *osh;
+        struct osl_info *osh;
 
 #ifdef BCMIPXOTP
         /* IPX OTP section */
@@ -221,7 +223,7 @@ static int ipxotp_max_rgnsz(si_t *sih, int osizew)
 {
         int ret = 0;
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
                 ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
@@ -271,8 +273,8 @@ static void _ipxotp_init(otpinfo_t *oi, chipcregs_t *cc)
         /* Read OTP lock bits and subregion programmed indication bits */
         oi->status = R_REG(oi->osh, &cc->otpstatus);
 
-        if ((CHIPID(oi->sih->chip) == BCM43224_CHIP_ID)
-            || (CHIPID(oi->sih->chip) == BCM43225_CHIP_ID)) {
+        if ((oi->sih->chip == BCM43224_CHIP_ID)
+            || (oi->sih->chip == BCM43225_CHIP_ID)) {
                 u32 p_bits;
                 p_bits =
                     (ipxotp_otpr(oi, cc, oi->otpgu_base + OTPGU_P_OFF) &
@@ -569,7 +571,7 @@ static int hndotp_size(void *oh)
 static u16 hndotp_otpr(void *oh, chipcregs_t *cc, uint wn)
 {
         otpinfo_t *oi = (otpinfo_t *) oh;
-        osl_t *osh;
+        struct osl_info *osh;
         volatile u16 *ptr;
 
         ASSERT(wn < ((oi->size / 2) + OTP_RC_LIM_OFF));
@@ -584,7 +586,7 @@ static u16 hndotp_otpr(void *oh, chipcregs_t *cc, uint wn)
 static u16 hndotp_otproff(void *oh, chipcregs_t *cc, int woff)
 {
         otpinfo_t *oi = (otpinfo_t *) oh;
-        osl_t *osh;
+        struct osl_info *osh;
         volatile u16 *ptr;
 
         ASSERT(woff >= (-((int)oi->size / 2)));
@@ -603,7 +605,7 @@ static u16 hndotp_read_bit(void *oh, chipcregs_t *cc, uint idx)
         otpinfo_t *oi = (otpinfo_t *) oh;
         uint k, row, col;
         u32 otpp, st;
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = si_osh(oi->sih);
         row = idx / 65;
@@ -636,7 +638,7 @@ static void *hndotp_init(si_t *sih)
         otpinfo_t *oi;
         u32 cap = 0, clkdiv, otpdiv = 0;
         void *ret = NULL;
-        osl_t *osh;
+        struct osl_info *osh;
 
         oi = &otpinfo;
 
@@ -900,7 +902,7 @@ void *otp_init(si_t *sih)
         void *ret = NULL;
 
         oi = &otpinfo;
-        bzero(oi, sizeof(otpinfo_t));
+        memset(oi, 0, sizeof(otpinfo_t));
 
         oi->ccrev = sih->ccrev;
 
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 1282ef7eb922..19d45026a5ee 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -15,9 +15,11 @@
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/etherdevice.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <stdarg.h>
 #include <bcmutils.h>
 #include <hndsoc.h>
@@ -66,29 +68,30 @@ extern uint _varsz;
 
 #define SROM_CIS_SINGLE 1
 
-static int initvars_srom_si(si_t *sih, osl_t *osh, void *curmap, char **vars,
-                            uint *count);
+static int initvars_srom_si(si_t *sih, struct osl_info *osh, void *curmap,
+                            char **vars, uint *count);
 static void _initvars_srom_pci(u8 sromrev, u16 *srom, uint off,
                                varbuf_t *b);
 static int initvars_srom_pci(si_t *sih, void *curmap, char **vars,
                              uint *count);
 static int initvars_flash_si(si_t *sih, char **vars, uint *count);
 #ifdef BCMSDIO
-static int initvars_cis_sdio(osl_t *osh, char **vars, uint *count);
-static int sprom_cmd_sdio(osl_t *osh, u8 cmd);
-static int sprom_read_sdio(osl_t *osh, u16 addr, u16 *data);
+static int initvars_cis_sdio(struct osl_info *osh, char **vars, uint *count);
+static int sprom_cmd_sdio(struct osl_info *osh, u8 cmd);
+static int sprom_read_sdio(struct osl_info *osh, u16 addr, u16 *data);
 #endif                          /* BCMSDIO */
-static int sprom_read_pci(osl_t *osh, si_t *sih, u16 *sprom, uint wordoff,
-                          u16 *buf, uint nwords, bool check_crc);
+static int sprom_read_pci(struct osl_info *osh, si_t *sih, u16 *sprom,
+                          uint wordoff, u16 *buf, uint nwords, bool check_crc);
 #if defined(BCMNVRAMR)
-static int otp_read_pci(osl_t *osh, si_t *sih, u16 *buf, uint bufsz);
+static int otp_read_pci(struct osl_info *osh, si_t *sih, u16 *buf, uint bufsz);
 #endif
-static u16 srom_cc_cmd(si_t *sih, osl_t *osh, void *ccregs, u32 cmd,
+static u16 srom_cc_cmd(si_t *sih, struct osl_info *osh, void *ccregs, u32 cmd,
                           uint wordoff, u16 data);
 
-static int initvars_table(osl_t *osh, char *start, char *end, char **vars,
-                          uint *count);
-static int initvars_flash(si_t *sih, osl_t *osh, char **vp, uint len);
+static int initvars_table(struct osl_info *osh, char *start, char *end,
+                          char **vars, uint *count);
+static int initvars_flash(si_t *sih, struct osl_info *osh, char **vp,
+                          uint len);
 
 /* Initialization of varbuf structure */
 static void varbuf_init(varbuf_t *b, char *buf, uint size)
@@ -129,7 +132,7 @@ static int varbuf_append(varbuf_t *b, const char *fmt, ...)
         if (s != NULL) {
                 len = (size_t) (s - b->buf);
                 for (s = b->base; s < b->buf;) {
-                        if ((bcmp(s, b->buf, len) == 0) && s[len] == '=') {
+                        if ((memcmp(s, b->buf, len) == 0) && s[len] == '=') {
                                 len = strlen(s) + 1;
                                 memmove(s, (s + len),
                                         ((b->buf + r + 1) - (s + len)));
@@ -155,21 +158,21 @@ static int varbuf_append(varbuf_t *b, const char *fmt, ...)
  * Initialize local vars from the right source for this platform.
  * Return 0 on success, nonzero on error.
  */
-int srom_var_init(si_t *sih, uint bustype, void *curmap, osl_t *osh,
+int srom_var_init(si_t *sih, uint bustype, void *curmap, struct osl_info *osh,
                   char **vars, uint *count)
 {
         uint len;
 
         len = 0;
 
-        ASSERT(bustype == BUSTYPE(bustype));
+        ASSERT(bustype == bustype);
         if (vars == NULL || count == NULL)
                 return 0;
 
         *vars = NULL;
         *count = 0;
 
-        switch (BUSTYPE(bustype)) {
+        switch (bustype) {
         case SI_BUS:
         case JTAG_BUS:
                 return initvars_srom_si(sih, osh, curmap, vars, count);
@@ -194,7 +197,7 @@ int srom_var_init(si_t *sih, uint bustype, void *curmap, osl_t *osh,
 
 /* support only 16-bit word read from srom */
 int
-srom_read(si_t *sih, uint bustype, void *curmap, osl_t *osh,
+srom_read(si_t *sih, uint bustype, void *curmap, struct osl_info *osh,
           uint byteoff, uint nbytes, u16 *buf, bool check_crc)
 {
         uint off, nw;
@@ -202,7 +205,7 @@ srom_read(si_t *sih, uint bustype, void *curmap, osl_t *osh,
         uint i;
 #endif                          /* BCMSDIO */
 
-        ASSERT(bustype == BUSTYPE(bustype));
+        ASSERT(bustype == bustype);
 
         /* check input - 16-bit access only */
         if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > SROM_MAX)
@@ -211,7 +214,7 @@ srom_read(si_t *sih, uint bustype, void *curmap, osl_t *osh,
         off = byteoff / 2;
         nw = nbytes / 2;
 
-        if (BUSTYPE(bustype) == PCI_BUS) {
+        if (bustype == PCI_BUS) {
                 if (!curmap)
                         return 1;
 
@@ -233,7 +236,7 @@ srom_read(si_t *sih, uint bustype, void *curmap, osl_t *osh,
                 }
 #endif
 #ifdef BCMSDIO
-        } else if (BUSTYPE(bustype) == SDIO_BUS) {
+        } else if (bustype == SDIO_BUS) {
                 off = byteoff / 2;
                 nw = nbytes / 2;
                 for (i = 0; i < nw; i++) {
@@ -242,7 +245,7 @@ srom_read(si_t *sih, uint bustype, void *curmap, osl_t *osh,
                                 return 1;
                 }
 #endif                          /* BCMSDIO */
-        } else if (BUSTYPE(bustype) == SI_BUS) {
+        } else if (bustype == SI_BUS) {
                 return 1;
         } else {
                 return 1;
@@ -376,7 +379,8 @@ u8 patch_pair;
 /* For dongle HW, accept partial calibration parameters */
 #define BCMDONGLECASE(n)
 
-int srom_parsecis(osl_t *osh, u8 *pcis[], uint ciscnt, char **vars, uint *count)
+int srom_parsecis(struct osl_info *osh, u8 *pcis[], uint ciscnt, char **vars,
+                  uint *count)
 {
         char eabuf[32];
         char *base;
@@ -402,7 +406,7 @@ int srom_parsecis(osl_t *osh, u8 *pcis[], uint ciscnt, char **vars, uint *count)
                 return -2;
 
         varbuf_init(&b, base, MAXSZ_NVRAM_VARS);
-        bzero(base, MAXSZ_NVRAM_VARS);
+        memset(base, 0, MAXSZ_NVRAM_VARS);
         eabuf[0] = '\0';
         for (cisnum = 0; cisnum < ciscnt; cisnum++) {
                 cis = *pcis++;
@@ -496,12 +500,12 @@ int srom_parsecis(osl_t *osh, u8 *pcis[], uint ciscnt, char **vars, uint *count)
                                         break;
                                 default:
                                         /* set macaddr if HNBU_MACADDR not seen yet */
-                                        if (eabuf[0] == '\0'
-                                            && cis[i] == LAN_NID
-                                            && !(ETHER_ISNULLADDR(&cis[i + 2]))
-                                            && !(ETHER_ISMULTI(&cis[i + 2]))) {
+                                        if (eabuf[0] == '\0' &&
+                                            cis[i] == LAN_NID &&
+                                            !is_zero_ether_addr(&cis[i + 2]) &&
+                                            !is_multicast_ether_addr(&cis[i + 2])) {
                                                 ASSERT(cis[i + 1] ==
-                                                       ETHER_ADDR_LEN);
+                                                       ETH_ALEN);
                                                 snprintf(eabuf, sizeof(eabuf),
                                                         "%pM", &cis[i + 2]);
 
@@ -970,8 +974,8 @@ int srom_parsecis(osl_t *osh, u8 *pcis[], uint ciscnt, char **vars, uint *count)
                                         break;
 
                                 case HNBU_MACADDR:
-                                        if (!(ETHER_ISNULLADDR(&cis[i + 1])) &&
-                                            !(ETHER_ISMULTI(&cis[i + 1]))) {
+                                        if (!is_zero_ether_addr(&cis[i + 1]) &&
+                                            !is_multicast_ether_addr(&cis[i + 1])) {
                                                 snprintf(eabuf, sizeof(eabuf),
                                                         "%pM", &cis[i + 1]);
 
@@ -1405,8 +1409,8 @@ int srom_parsecis(osl_t *osh, u8 *pcis[], uint ciscnt, char **vars, uint *count)
  * not in the bus cores.
  */
 static u16
-srom_cc_cmd(si_t *sih, osl_t *osh, void *ccregs, u32 cmd, uint wordoff,
-            u16 data)
+srom_cc_cmd(si_t *sih, struct osl_info *osh, void *ccregs, u32 cmd,
+            uint wordoff, u16 data)
 {
         chipcregs_t *cc = (chipcregs_t *) ccregs;
         uint wait_cnt = 1000;
@@ -1439,7 +1443,7 @@ srom_cc_cmd(si_t *sih, osl_t *osh, void *ccregs, u32 cmd, uint wordoff,
  * Return 0 on success, nonzero on error.
  */
 static int
-sprom_read_pci(osl_t *osh, si_t *sih, u16 *sprom, uint wordoff,
+sprom_read_pci(struct osl_info *osh, si_t *sih, u16 *sprom, uint wordoff,
                u16 *buf, uint nwords, bool check_crc)
 {
         int err = 0;
@@ -1499,7 +1503,7 @@ sprom_read_pci(osl_t *osh, si_t *sih, u16 *sprom, uint wordoff,
 }
 
 #if defined(BCMNVRAMR)
-static int otp_read_pci(osl_t *osh, si_t *sih, u16 *buf, uint bufsz)
+static int otp_read_pci(struct osl_info *osh, si_t *sih, u16 *buf, uint bufsz)
 {
         u8 *otp;
         uint sz = OTP_SZ_MAX / 2;       /* size in words */
@@ -1547,8 +1551,8 @@ static int otp_read_pci(osl_t *osh, si_t *sih, u16 *buf, uint bufsz)
 * Create variable table from memory.
 * Return 0 on success, nonzero on error.
 */
-static int initvars_table(osl_t *osh, char *start, char *end, char **vars,
-                          uint *count)
+static int initvars_table(struct osl_info *osh, char *start, char *end,
+                          char **vars, uint *count)
 {
         int c = (int)(end - start);
 
@@ -1574,7 +1578,8 @@ static int initvars_table(osl_t *osh, char *start, char *end, char **vars,
  * of the table upon enter and to the end of the table upon exit when success.
  * Return 0 on success, nonzero on error.
  */
-static int initvars_flash(si_t *sih, osl_t *osh, char **base, uint len)
+static int initvars_flash(si_t *sih, struct osl_info *osh, char **base,
+                          uint len)
 {
         char *vp = *base;
         char *flash;
@@ -1634,7 +1639,7 @@ static int initvars_flash(si_t *sih, osl_t *osh, char **base, uint len)
  */
 static int initvars_flash_si(si_t *sih, char **vars, uint *count)
 {
-        osl_t *osh = si_osh(sih);
+        struct osl_info *osh = si_osh(sih);
         char *vp, *base;
         int err;
 
@@ -1845,7 +1850,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
         u32 sr;
         varbuf_t b;
         char *vp, *base = NULL;
-        osl_t *osh = si_osh(sih);
+        struct osl_info *osh = si_osh(sih);
         bool flash = false;
         int err = 0;
 
@@ -1986,7 +1991,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
  * Read the SDIO cis and call parsecis to initialize the vars.
  * Return 0 on success, nonzero on error.
  */
-static int initvars_cis_sdio(osl_t *osh, char **vars, uint *count)
+static int initvars_cis_sdio(struct osl_info *osh, char **vars, uint *count)
 {
         u8 *cis[SBSDIO_NUM_FUNCTION + 1];
         uint fn, numfn;
@@ -2020,7 +2025,7 @@ static int initvars_cis_sdio(osl_t *osh, char **vars, uint *count)
 }
 
 /* set SDIO sprom command register */
-static int sprom_cmd_sdio(osl_t *osh, u8 cmd)
+static int sprom_cmd_sdio(struct osl_info *osh, u8 cmd)
 {
         u8 status = 0;
         uint wait_cnt = 1000;
@@ -2040,7 +2045,7 @@ static int sprom_cmd_sdio(osl_t *osh, u8 cmd)
 }
 
 /* read a word from the SDIO srom */
-static int sprom_read_sdio(osl_t *osh, u16 addr, u16 *data)
+static int sprom_read_sdio(struct osl_info *osh, u16 addr, u16 *data)
 {
         u8 addr_l, addr_h, data_l, data_h;
 
@@ -2068,8 +2073,8 @@ static int sprom_read_sdio(osl_t *osh, u16 addr, u16 *data)
 }
 #endif                          /* BCMSDIO */
 
-static int initvars_srom_si(si_t *sih, osl_t *osh, void *curmap, char **vars,
-                            uint *varsz)
+static int initvars_srom_si(si_t *sih, struct osl_info *osh, void *curmap,
+                            char **vars, uint *varsz)
 {
         /* Search flash nvram section for srom variables */
         return initvars_flash_si(sih, vars, varsz);
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 9789ea45ecd6..fd30cc6fb7f8 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -19,8 +19,10 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <stdarg.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
 #include <osl.h>
-#include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmnvram.h>
@@ -30,26 +32,26 @@
 #include <proto/802.1d.h>
 #include <proto/802.11.h>
 
-
 /* copy a buffer into a pkt buffer chain */
-uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)
+uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, uint offset, int len,
+                unsigned char *buf)
 {
         uint n, ret = 0;
 
         /* skip 'offset' bytes */
-        for (; p && offset; p = PKTNEXT(p)) {
-                if (offset < (uint) PKTLEN(p))
+        for (; p && offset; p = p->next) {
+                if (offset < (uint) (p->len))
                         break;
-                offset -= PKTLEN(p);
+                offset -= p->len;
         }
 
         if (!p)
                 return 0;
 
         /* copy the data */
-        for (; p && len; p = PKTNEXT(p)) {
-                n = min((uint) PKTLEN(p) - offset, (uint) len);
-                bcopy(buf, PKTDATA(p) + offset, n);
+        for (; p && len; p = p->next) {
+                n = min((uint) (p->len) - offset, (uint) len);
+                bcopy(buf, p->data + offset, n);
                 buf += n;
                 len -= n;
                 ret += n;
@@ -59,13 +61,13 @@ uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)
         return ret;
 }
 /* return total length of buffer chain */
-uint BCMFASTPATH pkttotlen(osl_t *osh, void *p)
+uint BCMFASTPATH pkttotlen(struct osl_info *osh, struct sk_buff *p)
 {
         uint total;
 
         total = 0;
-        for (; p; p = PKTNEXT(p))
-                total += PKTLEN(p);
+        for (; p; p = p->next)
+                total += p->len;
         return total;
 }
 
@@ -73,12 +75,13 @@ uint BCMFASTPATH pkttotlen(osl_t *osh, void *p)
  * osl multiple-precedence packet queue
  * hi_prec is always >= the number of the highest non-empty precedence
  */
-void *BCMFASTPATH pktq_penq(struct pktq *pq, int prec, void *p)
+struct sk_buff *BCMFASTPATH pktq_penq(struct pktq *pq, int prec,
+                                      struct sk_buff *p)
 {
         struct pktq_prec *q;
 
         ASSERT(prec >= 0 && prec < pq->num_prec);
-        ASSERT(PKTLINK(p) == NULL);     /* queueing chains not allowed */
+        ASSERT(p->prev == NULL);        /* queueing chains not allowed */
 
         ASSERT(!pktq_full(pq));
         ASSERT(!pktq_pfull(pq, prec));
@@ -86,7 +89,7 @@ void *BCMFASTPATH pktq_penq(struct pktq *pq, int prec, void *p)
         q = &pq->q[prec];
 
         if (q->head)
-                PKTSETLINK(q->tail, p);
+                q->tail->prev = p;
         else
                 q->head = p;
 
@@ -101,12 +104,13 @@ void *BCMFASTPATH pktq_penq(struct pktq *pq, int prec, void *p)
         return p;
 }
 
-void *BCMFASTPATH pktq_penq_head(struct pktq *pq, int prec, void *p)
+struct sk_buff *BCMFASTPATH pktq_penq_head(struct pktq *pq, int prec,
+                                           struct sk_buff *p)
 {
         struct pktq_prec *q;
 
         ASSERT(prec >= 0 && prec < pq->num_prec);
-        ASSERT(PKTLINK(p) == NULL);     /* queueing chains not allowed */
+        ASSERT(p->prev == NULL);        /* queueing chains not allowed */
 
         ASSERT(!pktq_full(pq));
         ASSERT(!pktq_pfull(pq, prec));
@@ -116,7 +120,7 @@ void *BCMFASTPATH pktq_penq_head(struct pktq *pq, int prec, void *p)
         if (q->head == NULL)
                 q->tail = p;
 
-        PKTSETLINK(p, q->head);
+        p->prev = q->head;
         q->head = p;
         q->len++;
 
@@ -128,10 +132,10 @@ void *BCMFASTPATH pktq_penq_head(struct pktq *pq, int prec, void *p)
         return p;
 }
 
-void *BCMFASTPATH pktq_pdeq(struct pktq *pq, int prec)
+struct sk_buff *BCMFASTPATH pktq_pdeq(struct pktq *pq, int prec)
 {
         struct pktq_prec *q;
-        void *p;
+        struct sk_buff *p;
 
         ASSERT(prec >= 0 && prec < pq->num_prec);
 
@@ -141,7 +145,7 @@ void *BCMFASTPATH pktq_pdeq(struct pktq *pq, int prec)
         if (p == NULL)
                 return NULL;
 
-        q->head = PKTLINK(p);
+        q->head = p->prev;
         if (q->head == NULL)
                 q->tail = NULL;
 
@@ -149,15 +153,15 @@ void *BCMFASTPATH pktq_pdeq(struct pktq *pq, int prec)
 
         pq->len--;
 
-        PKTSETLINK(p, NULL);
+        p->prev = NULL;
 
         return p;
 }
 
-void *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
+struct sk_buff *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
 {
         struct pktq_prec *q;
-        void *p, *prev;
+        struct sk_buff *p, *prev;
 
         ASSERT(prec >= 0 && prec < pq->num_prec);
 
@@ -167,11 +171,11 @@ void *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
         if (p == NULL)
                 return NULL;
 
-        for (prev = NULL; p != q->tail; p = PKTLINK(p))
+        for (prev = NULL; p != q->tail; p = p->prev)
                 prev = p;
 
         if (prev)
-                PKTSETLINK(prev, NULL);
+                prev->prev = NULL;
         else
                 q->head = NULL;
 
@@ -184,17 +188,17 @@ void *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
 }
 
 #ifdef BRCM_FULLMAC
-void pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir)
+void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir)
 {
         struct pktq_prec *q;
-        void *p;
+        struct sk_buff *p;
 
         q = &pq->q[prec];
         p = q->head;
         while (p) {
-                q->head = PKTLINK(p);
-                PKTSETLINK(p, NULL);
-                PKTFREE(osh, p, dir);
+                q->head = p->prev;
+                p->prev = NULL;
+                pkt_buf_free_skb(osh, p, dir);
                 q->len--;
                 pq->len--;
                 p = q->head;
@@ -203,7 +207,7 @@ void pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir)
         q->tail = NULL;
 }
 
-void pktq_flush(osl_t *osh, struct pktq *pq, bool dir)
+void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir)
 {
         int prec;
         for (prec = 0; prec < pq->num_prec; prec++)
@@ -212,11 +216,11 @@ void pktq_flush(osl_t *osh, struct pktq *pq, bool dir)
 }
 #else /* !BRCM_FULLMAC */
 void
-pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir, ifpkt_cb_t fn,
-            int arg)
+pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir,
+            ifpkt_cb_t fn, int arg)
 {
         struct pktq_prec *q;
-        void *p, *prev = NULL;
+        struct sk_buff *p, *prev = NULL;
 
         q = &pq->q[prec];
         p = q->head;
@@ -224,17 +228,17 @@ pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir, ifpkt_cb_t fn,
                 if (fn == NULL || (*fn) (p, arg)) {
                         bool head = (p == q->head);
                         if (head)
-                                q->head = PKTLINK(p);
+                                q->head = p->prev;
                         else
-                                PKTSETLINK(prev, PKTLINK(p));
-                        PKTSETLINK(p, NULL);
-                        PKTFREE(osh, p, dir);
+                                prev->prev = p->prev;
+                        p->prev = NULL;
+                        pkt_buf_free_skb(osh, p, dir);
                         q->len--;
                         pq->len--;
-                        p = (head ? q->head : PKTLINK(prev));
+                        p = (head ? q->head : prev->prev);
                 } else {
                         prev = p;
-                        p = PKTLINK(p);
+                        p = p->prev;
                 }
         }
 
@@ -244,7 +248,8 @@ pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir, ifpkt_cb_t fn,
         }
 }
 
-void pktq_flush(osl_t *osh, struct pktq *pq, bool dir, ifpkt_cb_t fn, int arg)
+void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir,
+                ifpkt_cb_t fn, int arg)
 {
         int prec;
         for (prec = 0; prec < pq->num_prec; prec++)
@@ -261,7 +266,7 @@ void pktq_init(struct pktq *pq, int num_prec, int max_len)
         ASSERT(num_prec > 0 && num_prec <= PKTQ_MAX_PREC);
 
         /* pq is variable size; only zero out what's requested */
-        bzero(pq,
+        memset(pq, 0,
               offsetof(struct pktq, q) + (sizeof(struct pktq_prec) * num_prec));
 
         pq->num_prec = (u16) num_prec;
@@ -272,7 +277,7 @@ void pktq_init(struct pktq *pq, int num_prec, int max_len)
                 pq->q[prec].max = pq->max;
 }
 
-void *pktq_peek_tail(struct pktq *pq, int *prec_out)
+struct sk_buff *pktq_peek_tail(struct pktq *pq, int *prec_out)
 {
         int prec;
 
@@ -303,10 +308,11 @@ int pktq_mlen(struct pktq *pq, uint prec_bmp)
         return len;
 }
 /* Priority dequeue from a specific set of precedences */
-void *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
+struct sk_buff *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp,
+                                      int *prec_out)
 {
         struct pktq_prec *q;
-        void *p;
+        struct sk_buff *p;
         int prec;
 
         if (pq->len == 0)
@@ -325,7 +331,7 @@ void *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
         if (p == NULL)
                 return NULL;
 
-        q->head = PKTLINK(p);
+        q->head = p->prev;
         if (q->head == NULL)
                 q->tail = NULL;
 
@@ -336,7 +342,7 @@ void *BCMFASTPATH pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
 
         pq->len--;
 
-        PKTSETLINK(p, NULL);
+        p->prev = NULL;
 
         return p;
 }
@@ -373,7 +379,7 @@ char *getvar(char *vars, const char *name)
 
         /* first look in vars[] */
         for (s = vars; s && *s;) {
-                if ((bcmp(s, name, len) == 0) && (s[len] == '='))
+                if ((memcmp(s, name, len) == 0) && (s[len] == '='))
                         return &s[len + 1];
 
                 while (*s++)
@@ -404,15 +410,15 @@ int getintvar(char *vars, const char *name)
 
 #if defined(BCMDBG)
 /* pretty hex print a pkt buffer chain */
-void prpkt(const char *msg, osl_t *osh, void *p0)
+void prpkt(const char *msg, struct osl_info *osh, struct sk_buff *p0)
 {
-        void *p;
+        struct sk_buff *p;
 
         if (msg && (msg[0] != '\0'))
                 printf("%s:\n", msg);
 
-        for (p = p0; p; p = PKTNEXT(p))
-                prhex(NULL, PKTDATA(p), PKTLEN(p));
+        for (p = p0; p; p = p->next)
+                prhex(NULL, p->data, p->len);
 }
 #endif                          /* defined(BCMDBG) */
 
diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c
index 1bb6c78eece7..81e54bd7a554 100644
--- a/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/drivers/staging/brcm80211/util/bcmwifi.c
@@ -15,6 +15,10 @@
  */
 #include <linux/ctype.h>
 #include <linux/kernel.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
+#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index fe503e7de563..d08869239d5b 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -16,7 +16,8 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <osl.h>
@@ -28,6 +29,10 @@
 #include <sbhnddma.h>
 #include <hnddma.h>
 
+#if defined(__mips__)
+#include <asm/addrspace.h>
+#endif
+
 /* debug/trace */
 #ifdef BCMDBG
 #define DMA_ERROR(args) \
@@ -68,11 +73,12 @@ static uint dma_msg_level;
 
 #define DI_INFO(dmah)   ((dma_info_t *)dmah)
 
+#define R_SM(r)         (*(r))
+#define W_SM(r, v)      (*(r) = (v))
+
 /* dma engine software state */
 typedef struct dma_info {
-        struct hnddma_pub hnddma;       /* exported structure, don't use hnddma_t,
-                                         * which could be const
-                                         */
+        struct hnddma_pub hnddma; /* exported structure */
         uint *msg_level;        /* message level pointer */
         char name[MAXNAMEL];    /* callers name for diag msgs */
 
@@ -222,7 +228,7 @@ static void _dma_counterreset(dma_info_t *di);
 static void _dma_fifoloopbackenable(dma_info_t *di);
 static uint _dma_ctrlflags(dma_info_t *di, uint mask, uint flags);
 static u8 dma_align_sizetobits(uint size);
-static void *dma_ringalloc(osl_t *osh, u32 boundary, uint size,
+static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size,
                            u16 *alignbits, uint *alloced,
                            dmaaddr_t *descpa, osldma_t **dmah);
 
@@ -231,7 +237,7 @@ static bool dma32_alloc(dma_info_t *di, uint direction);
 static bool dma32_txreset(dma_info_t *di);
 static bool dma32_rxreset(dma_info_t *di);
 static bool dma32_txsuspendedidle(dma_info_t *di);
-static int dma32_txfast(dma_info_t *di, void *p0, bool commit);
+static int dma32_txfast(dma_info_t *di, struct sk_buff *p0, bool commit);
 static void *dma32_getnexttxp(dma_info_t *di, txd_range_t range);
 static void *dma32_getnextrxp(dma_info_t *di, bool forceall);
 static void dma32_txrotate(dma_info_t *di);
@@ -246,14 +252,14 @@ static bool dma32_txstopped(dma_info_t *di);
 static bool dma32_rxstopped(dma_info_t *di);
 static bool dma32_rxenabled(dma_info_t *di);
 
-static bool _dma32_addrext(osl_t *osh, dma32regs_t *dma32regs);
+static bool _dma32_addrext(struct osl_info *osh, dma32regs_t *dma32regs);
 
 /* Prototypes for 64-bit routines */
 static bool dma64_alloc(dma_info_t *di, uint direction);
 static bool dma64_txreset(dma_info_t *di);
 static bool dma64_rxreset(dma_info_t *di);
 static bool dma64_txsuspendedidle(dma_info_t *di);
-static int dma64_txfast(dma_info_t *di, void *p0, bool commit);
+static int dma64_txfast(dma_info_t *di, struct sk_buff *p0, bool commit);
 static int dma64_txunframed(dma_info_t *di, void *p0, uint len, bool commit);
 static void *dma64_getpos(dma_info_t *di, bool direction);
 static void *dma64_getnexttxp(dma_info_t *di, txd_range_t range);
@@ -270,7 +276,7 @@ static void dma64_txreclaim(dma_info_t *di, txd_range_t range);
 static bool dma64_txstopped(dma_info_t *di);
 static bool dma64_rxstopped(dma_info_t *di);
 static bool dma64_rxenabled(dma_info_t *di);
-static bool _dma64_addrext(osl_t *osh, dma64regs_t *dma64regs);
+static bool _dma64_addrext(struct osl_info *osh, dma64regs_t *dma64regs);
 
 static inline u32 parity32(u32 data);
 
@@ -368,10 +374,10 @@ static const di_fcn_t dma32proc = {
         39
 };
 
-hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih, void *dmaregstx,
-                     void *dmaregsrx, uint ntxd, uint nrxd, uint rxbufsize,
-                     int rxextheadroom, uint nrxpost, uint rxoffset,
-                     uint *msg_level)
+struct hnddma_pub *dma_attach(struct osl_info *osh, char *name, si_t *sih,
+                     void *dmaregstx, void *dmaregsrx, uint ntxd,
+                     uint nrxd, uint rxbufsize, int rxextheadroom,
+                     uint nrxpost, uint rxoffset, uint *msg_level)
 {
         dma_info_t *di;
         uint size;
@@ -570,7 +576,7 @@ hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih, void *dmaregstx,
                 }
         }
 
-        return (hnddma_t *) di;
+        return (struct hnddma_pub *) di;
 
  fail:
         _dma_detach(di);
@@ -663,7 +669,7 @@ dma64_dd_upd(dma_info_t *di, dma64dd_t *ddring, dmaaddr_t pa, uint outidx,
         }
 }
 
-static bool _dma32_addrext(osl_t *osh, dma32regs_t *dma32regs)
+static bool _dma32_addrext(struct osl_info *osh, dma32regs_t *dma32regs)
 {
         u32 w;
 
@@ -902,7 +908,7 @@ static void _dma_rxinit(dma_info_t *di)
 
         /* clear rx descriptor ring */
         if (DMA64_ENAB(di) && DMA64_MODE(di)) {
-                BZERO_SM((void *)di->rxd64,
+                memset((void *)di->rxd64, '\0',
                          (di->nrxd * sizeof(dma64dd_t)));
 
                 /* DMA engine with out alignment requirement requires table to be inited
@@ -916,7 +922,7 @@ static void _dma_rxinit(dma_info_t *di)
                 if (di->aligndesc_4k)
                         _dma_ddtable_init(di, DMA_RX, di->rxdpa);
         } else if (DMA32_ENAB(di)) {
-                BZERO_SM((void *)di->rxd32,
+                memset((void *)di->rxd32, '\0',
                          (di->nrxd * sizeof(dma32dd_t)));
                 _dma_rxenable(di);
                 _dma_ddtable_init(di, DMA_RX, di->rxdpa);
@@ -978,7 +984,7 @@ _dma_rx_param_get(dma_info_t *di, u16 *rxoffset, u16 *rxbufsize)
  */
 static void *BCMFASTPATH _dma_rx(dma_info_t *di)
 {
-        void *p, *head, *tail;
+        struct sk_buff *p, *head, *tail;
         uint len;
         uint pkt_len;
         int resid = 0;
@@ -988,30 +994,31 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di)
         if (head == NULL)
                 return NULL;
 
-        len = ltoh16(*(u16 *) (PKTDATA(head)));
+        len = ltoh16(*(u16 *) (head->data));
         DMA_TRACE(("%s: dma_rx len %d\n", di->name, len));
 
 #if defined(__mips__)
+#define OSL_UNCACHED(va)        ((void *)KSEG1ADDR((va)))
         if (!len) {
-                while (!(len = *(u16 *) OSL_UNCACHED(PKTDATA(head))))
+                while (!(len = *(u16 *) OSL_UNCACHED(head->data)))
                         udelay(1);
 
-                *(u16 *) PKTDATA(head) = htol16((u16) len);
+                *(u16 *) (head->data) = htol16((u16) len);
         }
 #endif                          /* defined(__mips__) */
 
         /* set actual length */
         pkt_len = min((di->rxoffset + len), di->rxbufsize);
-        PKTSETLEN(head, pkt_len);
+        __skb_trim(head, pkt_len);
         resid = len - (di->rxbufsize - di->rxoffset);
 
         /* check for single or multi-buffer rx */
         if (resid > 0) {
                 tail = head;
                 while ((resid > 0) && (p = _dma_getnextrxp(di, false))) {
-                        PKTSETNEXT(tail, p);
+                        tail->next = p;
                         pkt_len = min(resid, (int)di->rxbufsize);
-                        PKTSETLEN(p, pkt_len);
+                        __skb_trim(p, pkt_len);
 
                         tail = p;
                         resid -= di->rxbufsize;
@@ -1037,7 +1044,7 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di)
                 if ((di->hnddma.dmactrlflags & DMA_CTRL_RXMULTI) == 0) {
                         DMA_ERROR(("%s: dma_rx: bad frame length (%d)\n",
                                    di->name, len));
-                        PKTFREE(di->osh, head, false);
+                        pkt_buf_free_skb(di->osh, head, false);
                         di->hnddma.rxgiants++;
                         goto next_frame;
                 }
@@ -1053,7 +1060,7 @@ static void *BCMFASTPATH _dma_rx(dma_info_t *di)
  */
 static bool BCMFASTPATH _dma_rxfill(dma_info_t *di)
 {
-        void *p;
+        struct sk_buff *p;
         u16 rxin, rxout;
         u32 flags = 0;
         uint n;
@@ -1085,7 +1092,7 @@ static bool BCMFASTPATH _dma_rxfill(dma_info_t *di)
                    size to be allocated
                  */
 
-                p = osl_pktget(di->osh, di->rxbufsize + extra_offset);
+                p = pkt_buf_get_skb(di->osh, di->rxbufsize + extra_offset);
 
                 if (p == NULL) {
                         DMA_ERROR(("%s: dma_rxfill: out of rxbufs\n",
@@ -1109,17 +1116,18 @@ static bool BCMFASTPATH _dma_rxfill(dma_info_t *di)
                 }
                 /* reserve an extra headroom, if applicable */
                 if (extra_offset)
-                        PKTPULL(p, extra_offset);
+                        skb_pull(p, extra_offset);
 
                 /* Do a cached write instead of uncached write since DMA_MAP
                  * will flush the cache.
                  */
-                *(u32 *) (PKTDATA(p)) = 0;
+                *(u32 *) (p->data) = 0;
 
                 if (DMASGLIST_ENAB)
-                        bzero(&di->rxp_dmah[rxout], sizeof(hnddma_seg_map_t));
+                        memset(&di->rxp_dmah[rxout], 0,
+                                sizeof(hnddma_seg_map_t));
 
-                pa = DMA_MAP(di->osh, PKTDATA(p),
+                pa = DMA_MAP(di->osh, p->data,
                              di->rxbufsize, DMA_RX, p, &di->rxp_dmah[rxout]);
 
                 ASSERT(IS_ALIGNED(PHYSADDRLO(pa), 4));
@@ -1220,15 +1228,10 @@ static void _dma_rxreclaim(dma_info_t *di)
 {
         void *p;
 
-        /* "unused local" warning suppression for OSLs that
-         * define PKTFREE() without using the di->osh arg
-         */
-        di = di;
-
         DMA_TRACE(("%s: dma_rxreclaim\n", di->name));
 
         while ((p = _dma_getnextrxp(di, true)))
-                PKTFREE(di->osh, p, false);
+                pkt_buf_free_skb(di->osh, p, false);
 }
 
 static void *BCMFASTPATH _dma_getnextrxp(dma_info_t *di, bool forceall)
@@ -1372,7 +1375,7 @@ static unsigned long _dma_getvar(dma_info_t *di, const char *name)
         return 0;
 }
 
-void dma_txpioloopback(osl_t *osh, dma32regs_t *regs)
+void dma_txpioloopback(struct osl_info *osh, dma32regs_t *regs)
 {
         OR_REG(osh, &regs->control, XC_LE);
 }
@@ -1395,7 +1398,7 @@ u8 dma_align_sizetobits(uint size)
  * descriptor ring size aligned location. This will ensure that the ring will
  * not cross page boundary
  */
-static void *dma_ringalloc(osl_t *osh, u32 boundary, uint size,
+static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size,
                            u16 *alignbits, uint *alloced,
                            dmaaddr_t *descpa, osldma_t **dmah)
 {
@@ -1434,7 +1437,7 @@ static void dma32_txinit(dma_info_t *di)
         di->hnddma.txavail = di->ntxd - 1;
 
         /* clear tx descriptor ring */
-        BZERO_SM((void *)di->txd32, (di->ntxd * sizeof(dma32dd_t)));
+        memset((void *)di->txd32, '\0', (di->ntxd * sizeof(dma32dd_t)));
 
         if ((di->hnddma.dmactrlflags & DMA_CTRL_PEN) == 0)
                 control |= XC_PD;
@@ -1491,7 +1494,7 @@ static void dma32_txreclaim(dma_info_t *di, txd_range_t range)
                 return;
 
         while ((p = dma32_getnexttxp(di, range)))
-                PKTFREE(di->osh, p, true);
+                pkt_buf_free_skb(di->osh, p, true);
 }
 
 static bool dma32_txstopped(dma_info_t *di)
@@ -1651,9 +1654,9 @@ static bool dma32_txsuspendedidle(dma_info_t *di)
  * WARNING: call must check the return value for error.
  *   the error(toss frames) could be fatal and cause many subsequent hard to debug problems
  */
-static int dma32_txfast(dma_info_t *di, void *p0, bool commit)
+static int dma32_txfast(dma_info_t *di, struct sk_buff *p0, bool commit)
 {
-        void *p, *next;
+        struct sk_buff *p, *next;
         unsigned char *data;
         uint len;
         u16 txout;
@@ -1672,12 +1675,12 @@ static int dma32_txfast(dma_info_t *di, void *p0, bool commit)
                 uint nsegs, j;
                 hnddma_seg_map_t *map;
 
-                data = PKTDATA(p);
-                len = PKTLEN(p);
+                data = p->data;
+                len = p->len;
 #ifdef BCM_DMAPAD
                 len += PKTDMAPAD(di->osh, p);
 #endif
-                next = PKTNEXT(p);
+                next = p->next;
 
                 /* return nonzero if out of tx descriptors */
                 if (NEXTTXD(txout) == di->txin)
@@ -1687,7 +1690,8 @@ static int dma32_txfast(dma_info_t *di, void *p0, bool commit)
                         continue;
 
                 if (DMASGLIST_ENAB)
-                        bzero(&di->txp_dmah[txout], sizeof(hnddma_seg_map_t));
+                        memset(&di->txp_dmah[txout], 0,
+                                sizeof(hnddma_seg_map_t));
 
                 /* get physical address of buffer start */
                 pa = DMA_MAP(di->osh, data, len, DMA_TX, p,
@@ -1761,7 +1765,7 @@ static int dma32_txfast(dma_info_t *di, void *p0, bool commit)
 
  outoftxd:
         DMA_ERROR(("%s: dma_txfast: out of txds\n", di->name));
-        PKTFREE(di->osh, p0, true);
+        pkt_buf_free_skb(di->osh, p0, true);
         di->hnddma.txavail = 0;
         di->hnddma.txnobuf++;
         return -1;
@@ -1959,7 +1963,7 @@ static void dma32_txrotate(dma_info_t *di)
                 if (DMASGLIST_ENAB) {
                         bcopy(&di->txp_dmah[old], &di->txp_dmah[new],
                               sizeof(hnddma_seg_map_t));
-                        bzero(&di->txp_dmah[old], sizeof(hnddma_seg_map_t));
+                        memset(&di->txp_dmah[old], 0, sizeof(hnddma_seg_map_t));
                 }
 
                 di->txp[old] = NULL;
@@ -1989,7 +1993,7 @@ static void dma64_txinit(dma_info_t *di)
         di->hnddma.txavail = di->ntxd - 1;
 
         /* clear tx descriptor ring */
-        BZERO_SM((void *)di->txd64, (di->ntxd * sizeof(dma64dd_t)));
+        memset((void *)di->txd64, '\0', (di->ntxd * sizeof(dma64dd_t)));
 
         /* DMA engine with out alignment requirement requires table to be inited
          * before enabling the engine
@@ -2060,7 +2064,7 @@ static void BCMFASTPATH dma64_txreclaim(dma_info_t *di, txd_range_t range)
         while ((p = dma64_getnexttxp(di, range))) {
                 /* For unframed data, we don't have any packets to free */
                 if (!(di->hnddma.dmactrlflags & DMA_CTRL_UNFRAMED))
-                        PKTFREE(di->osh, p, true);
+                        pkt_buf_free_skb(di->osh, p, true);
         }
 }
 
@@ -2300,9 +2304,10 @@ static int dma64_txunframed(dma_info_t *di, void *buf, uint len, bool commit)
  * WARNING: call must check the return value for error.
  *   the error(toss frames) could be fatal and cause many subsequent hard to debug problems
  */
-static int BCMFASTPATH dma64_txfast(dma_info_t *di, void *p0, bool commit)
+static int BCMFASTPATH dma64_txfast(dma_info_t *di, struct sk_buff *p0,
+                                    bool commit)
 {
-        void *p, *next;
+        struct sk_buff *p, *next;
         unsigned char *data;
         uint len;
         u16 txout;
@@ -2321,12 +2326,12 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, void *p0, bool commit)
                 uint nsegs, j;
                 hnddma_seg_map_t *map;
 
-                data = PKTDATA(p);
-                len = PKTLEN(p);
+                data = p->data;
+                len = p->len;
 #ifdef BCM_DMAPAD
                 len += PKTDMAPAD(di->osh, p);
 #endif                          /* BCM_DMAPAD */
-                next = PKTNEXT(p);
+                next = p->next;
 
                 /* return nonzero if out of tx descriptors */
                 if (NEXTTXD(txout) == di->txin)
@@ -2337,7 +2342,8 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, void *p0, bool commit)
 
                 /* get physical address of buffer start */
                 if (DMASGLIST_ENAB)
-                        bzero(&di->txp_dmah[txout], sizeof(hnddma_seg_map_t));
+                        memset(&di->txp_dmah[txout], 0,
+                                sizeof(hnddma_seg_map_t));
 
                 pa = DMA_MAP(di->osh, data, len, DMA_TX, p,
                              &di->txp_dmah[txout]);
@@ -2409,7 +2415,7 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, void *p0, bool commit)
 
  outoftxd:
         DMA_ERROR(("%s: dma_txfast: out of txds !!!\n", di->name));
-        PKTFREE(di->osh, p0, true);
+        pkt_buf_free_skb(di->osh, p0, true);
         di->hnddma.txavail = 0;
         di->hnddma.txnobuf++;
         return -1;
@@ -2563,7 +2569,7 @@ static void *BCMFASTPATH dma64_getnextrxp(dma_info_t *di, bool forceall)
         return rxp;
 }
 
-static bool _dma64_addrext(osl_t *osh, dma64regs_t * dma64regs)
+static bool _dma64_addrext(struct osl_info *osh, dma64regs_t * dma64regs)
 {
         u32 w;
         OR_REG(osh, &dma64regs->control, D64_XC_AE);
@@ -2635,7 +2641,7 @@ static void dma64_txrotate(dma_info_t *di)
                 if (DMASGLIST_ENAB) {
                         bcopy(&di->txp_dmah[old], &di->txp_dmah[new],
                               sizeof(hnddma_seg_map_t));
-                        bzero(&di->txp_dmah[old], sizeof(hnddma_seg_map_t));
+                        memset(&di->txp_dmah[old], 0, sizeof(hnddma_seg_map_t));
                 }
 
                 di->txp[old] = NULL;
@@ -2654,7 +2660,7 @@ static void dma64_txrotate(dma_info_t *di)
 uint dma_addrwidth(si_t *sih, void *dmaregs)
 {
         dma32regs_t *dma32regs;
-        osl_t *osh;
+        struct osl_info *osh;
 
         osh = si_osh(sih);
 
@@ -2664,8 +2670,8 @@ uint dma_addrwidth(si_t *sih, void *dmaregs)
                 /* backplane are 64-bit capable */
                 if (si_backplane64(sih))
                         /* If bus is System Backplane or PCIE then we can access 64-bits */
-                        if ((BUSTYPE(sih->bustype) == SI_BUS) ||
-                            ((BUSTYPE(sih->bustype) == PCI_BUS) &&
+                        if ((sih->bustype == SI_BUS) ||
+                            ((sih->bustype == PCI_BUS) &&
                              (sih->buscoretype == PCIE_CORE_ID)))
                                 return DMADDRWIDTH_64;
 
@@ -2679,8 +2685,8 @@ uint dma_addrwidth(si_t *sih, void *dmaregs)
         dma32regs = (dma32regs_t *) dmaregs;
 
         /* For System Backplane, PCIE bus or addrext feature, 32-bits ok */
-        if ((BUSTYPE(sih->bustype) == SI_BUS) ||
-            ((BUSTYPE(sih->bustype) == PCI_BUS)
+        if ((sih->bustype == SI_BUS) ||
+            ((sih->bustype == PCI_BUS)
              && sih->buscoretype == PCIE_CORE_ID)
             || (_dma32_addrext(osh, dma32regs)))
                 return DMADDRWIDTH_32;
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index a8f3306c1d2b..6cc59a895868 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -13,9 +13,14 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
@@ -40,23 +45,23 @@
 #define PMU_NONE(args)
 
 /* PLL controls/clocks */
-static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc,
+static void si_pmu1_pllinit0(si_t *sih, struct osl_info *osh, chipcregs_t *cc,
                              u32 xtal);
-static u32 si_pmu1_cpuclk0(si_t *sih, osl_t *osh, chipcregs_t *cc);
-static u32 si_pmu1_alpclk0(si_t *sih, osl_t *osh, chipcregs_t *cc);
+static u32 si_pmu1_cpuclk0(si_t *sih, struct osl_info *osh, chipcregs_t *cc);
+static u32 si_pmu1_alpclk0(si_t *sih, struct osl_info *osh, chipcregs_t *cc);
 
 /* PMU resources */
 static bool si_pmu_res_depfltr_bb(si_t *sih);
 static bool si_pmu_res_depfltr_ncb(si_t *sih);
 static bool si_pmu_res_depfltr_paldo(si_t *sih);
 static bool si_pmu_res_depfltr_npaldo(si_t *sih);
-static u32 si_pmu_res_deps(si_t *sih, osl_t *osh, chipcregs_t *cc,
+static u32 si_pmu_res_deps(si_t *sih, struct osl_info *osh, chipcregs_t *cc,
                               u32 rsrcs, bool all);
-static uint si_pmu_res_uptime(si_t *sih, osl_t *osh, chipcregs_t *cc,
+static uint si_pmu_res_uptime(si_t *sih, struct osl_info *osh, chipcregs_t *cc,
                               u8 rsrc);
 static void si_pmu_res_masks(si_t *sih, u32 * pmin, u32 * pmax);
 static void si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc,
-                                       osl_t *osh, u8 spuravoid);
+                                       struct osl_info *osh, u8 spuravoid);
 
 static void si_pmu_set_4330_plldivs(si_t *sih);
 
@@ -101,7 +106,7 @@ void si_pmu_pllupd(si_t *sih)
 }
 
 /* Setup switcher voltage */
-void si_pmu_set_switcher_voltage(si_t *sih, osl_t *osh, u8 bb_voltage,
+void si_pmu_set_switcher_voltage(si_t *sih, struct osl_info *osh, u8 bb_voltage,
                                  u8 rf_voltage)
 {
         chipcregs_t *cc;
@@ -124,14 +129,14 @@ void si_pmu_set_switcher_voltage(si_t *sih, osl_t *osh, u8 bb_voltage,
         si_setcoreidx(sih, origidx);
 }
 
-void si_pmu_set_ldo_voltage(si_t *sih, osl_t *osh, u8 ldo, u8 voltage)
+void si_pmu_set_ldo_voltage(si_t *sih, struct osl_info *osh, u8 ldo, u8 voltage)
 {
         u8 sr_cntl_shift = 0, rc_shift = 0, shift = 0, mask = 0;
         u8 addr = 0;
 
         ASSERT(sih->cccaps & CC_CAP_PMU);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4336_CHIP_ID:
                 switch (ldo) {
                 case SET_LDO_VOLTAGE_CLDO_PWM:
@@ -182,7 +187,7 @@ void si_pmu_set_ldo_voltage(si_t *sih, osl_t *osh, u8 ldo, u8 voltage)
 /* d11 slow to fast clock transition time in slow clock cycles */
 #define D11SCC_SLOW2FAST_TRANSITION     2
 
-u16 si_pmu_fast_pwrup_delay(si_t *sih, osl_t *osh)
+u16 si_pmu_fast_pwrup_delay(si_t *sih, struct osl_info *osh)
 {
         uint delay = PMU_MAX_TRANSITION_DLY;
         chipcregs_t *cc;
@@ -199,7 +204,7 @@ u16 si_pmu_fast_pwrup_delay(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM43421_CHIP_ID:
@@ -259,7 +264,7 @@ u16 si_pmu_fast_pwrup_delay(si_t *sih, osl_t *osh)
         return (u16) delay;
 }
 
-u32 si_pmu_force_ilp(si_t *sih, osl_t *osh, bool force)
+u32 si_pmu_force_ilp(si_t *sih, struct osl_info *osh, bool force)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -599,7 +604,7 @@ static void si_pmu_res_masks(si_t *sih, u32 * pmin, u32 * pmax)
         rsrcs = (sih->pmucaps & PCAP_RC_MASK) >> PCAP_RC_SHIFT;
 
         /* determine min/max rsrc masks */
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM43421_CHIP_ID:
@@ -677,7 +682,7 @@ static void si_pmu_res_masks(si_t *sih, u32 * pmin, u32 * pmax)
 }
 
 /* initialize PMU resources */
-void si_pmu_res_init(si_t *sih, osl_t *osh)
+void si_pmu_res_init(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -696,7 +701,7 @@ void si_pmu_res_init(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 /* Optimize resources up/down timers */
                 if (ISSIM_ENAB(sih)) {
@@ -1095,7 +1100,7 @@ static const pmu1_xtaltab0_t *si_pmu1_xtaltab0(si_t *sih)
 #ifdef BCMDBG
         char chn[8];
 #endif
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 return pmu1_xtaltab0_880_4329;
         case BCM4319_CHIP_ID:
@@ -1123,7 +1128,7 @@ static const pmu1_xtaltab0_t *si_pmu1_xtaldef0(si_t *sih)
         char chn[8];
 #endif
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 /* Default to 38400Khz */
                 return &pmu1_xtaltab0_880_4329[PMU1_XTALTAB0_880_38400K];
@@ -1155,7 +1160,7 @@ static u32 si_pmu1_pllfvco0(si_t *sih)
         char chn[8];
 #endif
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 return FVCO_880;
         case BCM4319_CHIP_ID:
@@ -1178,7 +1183,7 @@ static u32 si_pmu1_pllfvco0(si_t *sih)
 
 /* query alp/xtal clock frequency */
 static u32
-si_pmu1_alpclk0(si_t *sih, osl_t *osh, chipcregs_t *cc)
+si_pmu1_alpclk0(si_t *sih, struct osl_info *osh, chipcregs_t *cc)
 {
         const pmu1_xtaltab0_t *xt;
         u32 xf;
@@ -1203,7 +1208,8 @@ si_pmu1_alpclk0(si_t *sih, osl_t *osh, chipcregs_t *cc)
  * case the xtal frequency is unknown to the s/w so we need to call
  * si_pmu1_xtaldef0() wherever it is needed to return a default value.
  */
-static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
+static void si_pmu1_pllinit0(si_t *sih, struct osl_info *osh, chipcregs_t *cc,
+                             u32 xtal)
 {
         const pmu1_xtaltab0_t *xt;
         u32 tmp;
@@ -1233,8 +1239,8 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
          */
         if ((((R_REG(osh, &cc->pmucontrol) & PCTL_XTALFREQ_MASK) >>
               PCTL_XTALFREQ_SHIFT) == xt->xf) &&
-            !((CHIPID(sih->chip) == BCM4319_CHIP_ID)
-              || (CHIPID(sih->chip) == BCM4330_CHIP_ID))) {
+            !((sih->chip == BCM4319_CHIP_ID)
+              || (sih->chip == BCM4330_CHIP_ID))) {
                 PMU_MSG(("PLL already programmed for %d.%d MHz\n",
                          xt->fref / 1000, xt->fref % 1000));
                 return;
@@ -1244,7 +1250,7 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
         PMU_MSG(("Programming PLL for %d.%d MHz\n", xt->fref / 1000,
                  xt->fref % 1000));
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 /* Change the BBPLL drive strength to 8 for all channels */
                 buf_strength = 0x888888;
@@ -1351,11 +1357,11 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
               p2div << PMU1_PLL0_PC0_P2DIV_SHIFT) & PMU1_PLL0_PC0_P2DIV_MASK);
         W_REG(osh, &cc->pllcontrol_data, tmp);
 
-        if ((CHIPID(sih->chip) == BCM4330_CHIP_ID))
+        if ((sih->chip == BCM4330_CHIP_ID))
                 si_pmu_set_4330_plldivs(sih);
 
-        if ((CHIPID(sih->chip) == BCM4329_CHIP_ID)
-            && (CHIPREV(sih->chiprev) == 0)) {
+        if ((sih->chip == BCM4329_CHIP_ID)
+            && (sih->chiprev == 0)) {
 
                 W_REG(osh, &cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);
                 tmp = R_REG(osh, &cc->pllcontrol_data);
@@ -1363,9 +1369,9 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
                 tmp = tmp | DOT11MAC_880MHZ_CLK_DIVISOR_VAL;
                 W_REG(osh, &cc->pllcontrol_data, tmp);
         }
-        if ((CHIPID(sih->chip) == BCM4319_CHIP_ID) ||
-            (CHIPID(sih->chip) == BCM4336_CHIP_ID) ||
-            (CHIPID(sih->chip) == BCM4330_CHIP_ID))
+        if ((sih->chip == BCM4319_CHIP_ID) ||
+            (sih->chip == BCM4336_CHIP_ID) ||
+            (sih->chip == BCM4330_CHIP_ID))
                 ndiv_mode = PMU1_PLL0_PC2_NDIV_MODE_MFB;
         else
                 ndiv_mode = PMU1_PLL0_PC2_NDIV_MODE_MASH;
@@ -1407,7 +1413,7 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
         /* to operate the 4319 usb in 24MHz/48MHz; chipcontrol[2][84:83] needs
          * to be updated.
          */
-        if ((CHIPID(sih->chip) == BCM4319_CHIP_ID)
+        if ((sih->chip == BCM4319_CHIP_ID)
             && (xt->fref != XTAL_FREQ_30000MHZ)) {
                 W_REG(osh, &cc->chipcontrol_addr, PMU1_PLL0_CHIPCTL2);
                 tmp =
@@ -1436,8 +1442,8 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
                 PCTL_ILP_DIV_MASK) |
             ((xt->xf << PCTL_XTALFREQ_SHIFT) & PCTL_XTALFREQ_MASK);
 
-        if ((CHIPID(sih->chip) == BCM4329_CHIP_ID)
-            && CHIPREV(sih->chiprev) == 0) {
+        if ((sih->chip == BCM4329_CHIP_ID)
+            && sih->chiprev == 0) {
                 /* clear the htstretch before clearing HTReqEn */
                 AND_REG(osh, &cc->clkstretch, ~CSTRETCH_HT);
                 tmp &= ~PCTL_HT_REQ_EN;
@@ -1448,7 +1454,7 @@ static void si_pmu1_pllinit0(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 xtal)
 
 /* query the CPU clock frequency */
 static u32
-si_pmu1_cpuclk0(si_t *sih, osl_t *osh, chipcregs_t *cc)
+si_pmu1_cpuclk0(si_t *sih, struct osl_info *osh, chipcregs_t *cc)
 {
         u32 tmp, m1div;
 #ifdef BCMDBG
@@ -1502,7 +1508,7 @@ si_pmu1_cpuclk0(si_t *sih, osl_t *osh, chipcregs_t *cc)
 }
 
 /* initialize PLL */
-void si_pmu_pll_init(si_t *sih, osl_t *osh, uint xtalfreq)
+void si_pmu_pll_init(si_t *sih, struct osl_info *osh, uint xtalfreq)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1517,7 +1523,7 @@ void si_pmu_pll_init(si_t *sih, osl_t *osh, uint xtalfreq)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 if (xtalfreq == 0)
                         xtalfreq = 38400;
@@ -1555,7 +1561,7 @@ void si_pmu_pll_init(si_t *sih, osl_t *osh, uint xtalfreq)
 }
 
 /* query alp/xtal clock frequency */
-u32 si_pmu_alp_clock(si_t *sih, osl_t *osh)
+u32 si_pmu_alp_clock(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1571,7 +1577,7 @@ u32 si_pmu_alp_clock(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM43421_CHIP_ID:
@@ -1616,7 +1622,7 @@ u32 si_pmu_alp_clock(si_t *sih, osl_t *osh)
  * pllreg "pll0" i.e. 12 for main 6 for phy, 0 for misc.
  */
 static u32
-si_pmu5_clock(si_t *sih, osl_t *osh, chipcregs_t *cc, uint pll0,
+si_pmu5_clock(si_t *sih, struct osl_info *osh, chipcregs_t *cc, uint pll0,
                           uint m) {
         u32 tmp, div, ndiv, p1, p2, fc;
 
@@ -1631,7 +1637,7 @@ si_pmu5_clock(si_t *sih, osl_t *osh, chipcregs_t *cc, uint pll0,
                 return 0;
         }
 
-        if (CHIPID(sih->chip) == BCM5357_CHIP_ID) {
+        if (sih->chip == BCM5357_CHIP_ID) {
                 /* Detect failure in clock setting */
                 if ((R_REG(osh, &cc->chipstatus) & 0x40000) != 0) {
                         return 133 * 1000000;
@@ -1669,7 +1675,7 @@ si_pmu5_clock(si_t *sih, osl_t *osh, chipcregs_t *cc, uint pll0,
 /* For designs that feed the same clock to both backplane
  * and CPU just return the CPU clock speed.
  */
-u32 si_pmu_si_clock(si_t *sih, osl_t *osh)
+u32 si_pmu_si_clock(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1685,7 +1691,7 @@ u32 si_pmu_si_clock(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM43421_CHIP_ID:
@@ -1702,7 +1708,7 @@ u32 si_pmu_si_clock(si_t *sih, osl_t *osh)
                                   PMU5_MAINPLL_SI);
                 break;
         case BCM4329_CHIP_ID:
-                if (CHIPREV(sih->chiprev) == 0)
+                if (sih->chiprev == 0)
                         clock = 38400 * 1000;
                 else
                         clock = si_pmu1_cpuclk0(sih, osh, cc);
@@ -1748,7 +1754,7 @@ u32 si_pmu_si_clock(si_t *sih, osl_t *osh)
 }
 
 /* query CPU clock frequency */
-u32 si_pmu_cpu_clock(si_t *sih, osl_t *osh)
+u32 si_pmu_cpu_clock(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1757,14 +1763,14 @@ u32 si_pmu_cpu_clock(si_t *sih, osl_t *osh)
         ASSERT(sih->cccaps & CC_CAP_PMU);
 
         if ((sih->pmurev >= 5) &&
-            !((CHIPID(sih->chip) == BCM4329_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4319_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM43236_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4336_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4330_CHIP_ID))) {
+            !((sih->chip == BCM4329_CHIP_ID) ||
+              (sih->chip == BCM4319_CHIP_ID) ||
+              (sih->chip == BCM43236_CHIP_ID) ||
+              (sih->chip == BCM4336_CHIP_ID) ||
+              (sih->chip == BCM4330_CHIP_ID))) {
                 uint pll;
 
-                switch (CHIPID(sih->chip)) {
+                switch (sih->chip) {
                 case BCM5356_CHIP_ID:
                         pll = PMU5356_MAINPLL_PLL0;
                         break;
@@ -1792,7 +1798,7 @@ u32 si_pmu_cpu_clock(si_t *sih, osl_t *osh)
 }
 
 /* query memory clock frequency */
-u32 si_pmu_mem_clock(si_t *sih, osl_t *osh)
+u32 si_pmu_mem_clock(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1801,14 +1807,14 @@ u32 si_pmu_mem_clock(si_t *sih, osl_t *osh)
         ASSERT(sih->cccaps & CC_CAP_PMU);
 
         if ((sih->pmurev >= 5) &&
-            !((CHIPID(sih->chip) == BCM4329_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4319_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4330_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM4336_CHIP_ID) ||
-              (CHIPID(sih->chip) == BCM43236_CHIP_ID))) {
+            !((sih->chip == BCM4329_CHIP_ID) ||
+              (sih->chip == BCM4319_CHIP_ID) ||
+              (sih->chip == BCM4330_CHIP_ID) ||
+              (sih->chip == BCM4336_CHIP_ID) ||
+              (sih->chip == BCM43236_CHIP_ID))) {
                 uint pll;
 
-                switch (CHIPID(sih->chip)) {
+                switch (sih->chip) {
                 case BCM5356_CHIP_ID:
                         pll = PMU5356_MAINPLL_PLL0;
                         break;
@@ -1841,7 +1847,7 @@ u32 si_pmu_mem_clock(si_t *sih, osl_t *osh)
 
 static u32 ilpcycles_per_sec;
 
-u32 si_pmu_ilp_clock(si_t *sih, osl_t *osh)
+u32 si_pmu_ilp_clock(si_t *sih, struct osl_info *osh)
 {
         if (ISSIM_ENAB(sih))
                 return ILP_CLOCK;
@@ -1905,7 +1911,7 @@ static const sdiod_drive_str_t sdiod_drive_strength_tab3[] = {
 #define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) << 16) | (pmu))
 
 void
-si_sdiod_drive_strength_init(si_t *sih, osl_t *osh,
+si_sdiod_drive_strength_init(si_t *sih, struct osl_info *osh,
                                          u32 drivestrength) {
         chipcregs_t *cc;
         uint origidx, intr_val = 0;
@@ -1976,7 +1982,7 @@ si_sdiod_drive_strength_init(si_t *sih, osl_t *osh,
 }
 
 /* initialize PMU */
-void si_pmu_init(si_t *sih, osl_t *osh)
+void si_pmu_init(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -1993,7 +1999,7 @@ void si_pmu_init(si_t *sih, osl_t *osh)
         else if (sih->pmurev >= 2)
                 OR_REG(osh, &cc->pmucontrol, PCTL_NOILP_ON_WAIT);
 
-        if ((CHIPID(sih->chip) == BCM4329_CHIP_ID) && (sih->chiprev == 2)) {
+        if ((sih->chip == BCM4329_CHIP_ID) && (sih->chiprev == 2)) {
                 /* Fix for 4329b0 bad LPOM state. */
                 W_REG(osh, &cc->regcontrol_addr, 2);
                 OR_REG(osh, &cc->regcontrol_data, 0x100);
@@ -2008,7 +2014,7 @@ void si_pmu_init(si_t *sih, osl_t *osh)
 
 /* Return up time in ILP cycles for the given resource. */
 static uint
-si_pmu_res_uptime(si_t *sih, osl_t *osh, chipcregs_t *cc,
+si_pmu_res_uptime(si_t *sih, struct osl_info *osh, chipcregs_t *cc,
                               u8 rsrc) {
         u32 deps;
         uint up, i, dup, dmax;
@@ -2045,7 +2051,7 @@ si_pmu_res_uptime(si_t *sih, osl_t *osh, chipcregs_t *cc,
 
 /* Return dependancies (direct or all/indirect) for the given resources */
 static u32
-si_pmu_res_deps(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 rsrcs,
+si_pmu_res_deps(si_t *sih, struct osl_info *osh, chipcregs_t *cc, u32 rsrcs,
                 bool all)
 {
         u32 deps = 0;
@@ -2065,7 +2071,7 @@ si_pmu_res_deps(si_t *sih, osl_t *osh, chipcregs_t *cc, u32 rsrcs,
 }
 
 /* power up/down OTP through PMU resources */
-void si_pmu_otp_power(si_t *sih, osl_t *osh, bool on)
+void si_pmu_otp_power(si_t *sih, struct osl_info *osh, bool on)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -2084,7 +2090,7 @@ void si_pmu_otp_power(si_t *sih, osl_t *osh, bool on)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 rsrcs = PMURES_BIT(RES4329_OTP_PU);
                 break;
@@ -2135,7 +2141,7 @@ void si_pmu_otp_power(si_t *sih, osl_t *osh, bool on)
         si_setcoreidx(sih, origidx);
 }
 
-void si_pmu_rcal(si_t *sih, osl_t *osh)
+void si_pmu_rcal(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
@@ -2147,7 +2153,7 @@ void si_pmu_rcal(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:{
                         u8 rcal_code;
                         u32 val;
@@ -2218,7 +2224,7 @@ void si_pmu_rcal(si_t *sih, osl_t *osh)
         si_setcoreidx(sih, origidx);
 }
 
-void si_pmu_spuravoid(si_t *sih, osl_t *osh, u8 spuravoid)
+void si_pmu_spuravoid(si_t *sih, struct osl_info *osh, u8 spuravoid)
 {
         chipcregs_t *cc;
         uint origidx, intr_val;
@@ -2230,7 +2236,7 @@ void si_pmu_spuravoid(si_t *sih, osl_t *osh, u8 spuravoid)
         ASSERT(cc != NULL);
 
         /* force the HT off  */
-        if (CHIPID(sih->chip) == BCM4336_CHIP_ID) {
+        if (sih->chip == BCM4336_CHIP_ID) {
                 tmp = R_REG(osh, &cc->max_res_mask);
                 tmp &= ~RES4336_HT_AVAIL;
                 W_REG(osh, &cc->max_res_mask, tmp);
@@ -2244,7 +2250,7 @@ void si_pmu_spuravoid(si_t *sih, osl_t *osh, u8 spuravoid)
         si_pmu_spuravoid_pllupdate(sih, cc, osh, spuravoid);
 
         /* enable HT back on  */
-        if (CHIPID(sih->chip) == BCM4336_CHIP_ID) {
+        if (sih->chip == BCM4336_CHIP_ID) {
                 tmp = R_REG(osh, &cc->max_res_mask);
                 tmp |= RES4336_HT_AVAIL;
                 W_REG(osh, &cc->max_res_mask, tmp);
@@ -2255,7 +2261,7 @@ void si_pmu_spuravoid(si_t *sih, osl_t *osh, u8 spuravoid)
 }
 
 static void
-si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, osl_t *osh,
+si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, struct osl_info *osh,
                            u8 spuravoid)
 {
         u32 tmp = 0;
@@ -2263,14 +2269,14 @@ si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, osl_t *osh,
         u8 bcm5357_bcm43236_p1div[] = { 0x1, 0x5, 0x5 };
         u8 bcm5357_bcm43236_ndiv[] = { 0x30, 0xf6, 0xfc };
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM5357_CHIP_ID:
         case BCM43235_CHIP_ID:
         case BCM43236_CHIP_ID:
         case BCM43238_CHIP_ID:
 
                 /* BCM5357 needs to touch PLL1_PLLCTL[02], so offset PLL0_PLLCTL[02] by 6 */
-                phypll_offset = (CHIPID(sih->chip) == BCM5357_CHIP_ID) ? 6 : 0;
+                phypll_offset = (sih->chip == BCM5357_CHIP_ID) ? 6 : 0;
 
                 /* RMW only the P1 divider */
                 W_REG(osh, &cc->pllcontrol_addr,
@@ -2451,7 +2457,7 @@ si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, osl_t *osh,
         W_REG(osh, &cc->pmucontrol, tmp);
 }
 
-bool si_pmu_is_otp_powered(si_t *sih, osl_t *osh)
+bool si_pmu_is_otp_powered(si_t *sih, struct osl_info *osh)
 {
         uint idx;
         chipcregs_t *cc;
@@ -2462,7 +2468,7 @@ bool si_pmu_is_otp_powered(si_t *sih, osl_t *osh)
         cc = si_setcoreidx(sih, SI_CC_IDX);
         ASSERT(cc != NULL);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 st = (R_REG(osh, &cc->res_state) & PMURES_BIT(RES4329_OTP_PU))
                     != 0;
@@ -2503,9 +2509,9 @@ bool si_pmu_is_otp_powered(si_t *sih, osl_t *osh)
 
 void
 #if defined(BCMDBG)
-si_pmu_sprom_enable(si_t *sih, osl_t *osh, bool enable)
+si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
 #else
-si_pmu_sprom_enable(si_t *sih, osl_t *osh, bool enable)
+si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
 #endif
 {
         chipcregs_t *cc;
@@ -2521,7 +2527,7 @@ si_pmu_sprom_enable(si_t *sih, osl_t *osh, bool enable)
 }
 
 /* initialize PMU chip controls and other chip level stuff */
-void si_pmu_chip_init(si_t *sih, osl_t *osh)
+void si_pmu_chip_init(si_t *sih, struct osl_info *osh)
 {
         uint origidx;
 
@@ -2543,11 +2549,11 @@ void si_pmu_chip_init(si_t *sih, osl_t *osh)
 }
 
 /* initialize PMU switch/regulators */
-void si_pmu_swreg_init(si_t *sih, osl_t *osh)
+void si_pmu_swreg_init(si_t *sih, struct osl_info *osh)
 {
         ASSERT(sih->cccaps & CC_CAP_PMU);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4336_CHIP_ID:
                 /* Reduce CLDO PWM output voltage to 1.2V */
                 si_pmu_set_ldo_voltage(sih, osh, SET_LDO_VOLTAGE_CLDO_PWM, 0xe);
@@ -2556,7 +2562,7 @@ void si_pmu_swreg_init(si_t *sih, osl_t *osh)
                                        0xe);
                 /* Reduce LNLDO1 output voltage to 1.2V */
                 si_pmu_set_ldo_voltage(sih, osh, SET_LDO_VOLTAGE_LNLDO1, 0xe);
-                if (CHIPREV(sih->chiprev) == 0)
+                if (sih->chiprev == 0)
                         si_pmu_regcontrol(sih, 2, 0x400000, 0x400000);
                 break;
 
@@ -2573,7 +2579,7 @@ void si_pmu_radio_enable(si_t *sih, bool enable)
 {
         ASSERT(sih->cccaps & CC_CAP_PMU);
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4319_CHIP_ID:
                 if (enable)
                         si_write_wrapperreg(sih, AI_OOBSELOUTB74,
@@ -2587,7 +2593,7 @@ void si_pmu_radio_enable(si_t *sih, bool enable)
 
 /* Wait for a particular clock level to be on the backplane */
 u32
-si_pmu_waitforclk_on_backplane(si_t *sih, osl_t *osh, u32 clk,
+si_pmu_waitforclk_on_backplane(si_t *sih, struct osl_info *osh, u32 clk,
                                u32 delay)
 {
         chipcregs_t *cc;
@@ -2616,7 +2622,7 @@ si_pmu_waitforclk_on_backplane(si_t *sih, osl_t *osh, u32 clk,
 
 #define EXT_ILP_HZ 32768
 
-u32 si_pmu_measure_alpclk(si_t *sih, osl_t *osh)
+u32 si_pmu_measure_alpclk(si_t *sih, struct osl_info *osh)
 {
         chipcregs_t *cc;
         uint origidx;
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index 2bb5b8722df6..e6716e823baa 100644
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -20,145 +20,57 @@
 #include <asm/paccess.h>
 #endif                          /* mips */
 #include <bcmendian.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/sched.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <pcicfg.h>
 
 
-#define PCI_CFG_RETRY           10
-
 #define OS_HANDLE_MAGIC         0x1234abcd      /* Magic # to recognise osh */
 #define BCM_MEM_FILENAME_LEN    24      /* Mem. filename length */
 
-struct osl_info {
-        osl_pubinfo_t pub;
-        uint magic;
-        void *pdev;
-        uint failed;
-        uint bustype;
-};
-
 /* Global ASSERT type flag */
 u32 g_assert_type;
 
-#ifdef BRCM_FULLMAC
-static s16 linuxbcmerrormap[] = { 0,    /* 0 */
-        -EINVAL,                /* BCME_ERROR */
-        -EINVAL,                /* BCME_BADARG */
-        -EINVAL,                /* BCME_BADOPTION */
-        -EINVAL,                /* BCME_NOTUP */
-        -EINVAL,                /* BCME_NOTDOWN */
-        -EINVAL,                /* BCME_NOTAP */
-        -EINVAL,                /* BCME_NOTSTA */
-        -EINVAL,                /* BCME_BADKEYIDX */
-        -EINVAL,                /* BCME_RADIOOFF */
-        -EINVAL,                /* BCME_NOTBANDLOCKED */
-        -EINVAL,                /* BCME_NOCLK */
-        -EINVAL,                /* BCME_BADRATESET */
-        -EINVAL,                /* BCME_BADBAND */
-        -E2BIG,                 /* BCME_BUFTOOSHORT */
-        -E2BIG,                 /* BCME_BUFTOOLONG */
-        -EBUSY,                 /* BCME_BUSY */
-        -EINVAL,                /* BCME_NOTASSOCIATED */
-        -EINVAL,                /* BCME_BADSSIDLEN */
-        -EINVAL,                /* BCME_OUTOFRANGECHAN */
-        -EINVAL,                /* BCME_BADCHAN */
-        -EFAULT,                /* BCME_BADADDR */
-        -ENOMEM,                /* BCME_NORESOURCE */
-        -EOPNOTSUPP,            /* BCME_UNSUPPORTED */
-        -EMSGSIZE,              /* BCME_BADLENGTH */
-        -EINVAL,                /* BCME_NOTREADY */
-        -EPERM,                 /* BCME_NOTPERMITTED */
-        -ENOMEM,                /* BCME_NOMEM */
-        -EINVAL,                /* BCME_ASSOCIATED */
-        -ERANGE,                /* BCME_RANGE */
-        -EINVAL,                /* BCME_NOTFOUND */
-        -EINVAL,                /* BCME_WME_NOT_ENABLED */
-        -EINVAL,                /* BCME_TSPEC_NOTFOUND */
-        -EINVAL,                /* BCME_ACM_NOTSUPPORTED */
-        -EINVAL,                /* BCME_NOT_WME_ASSOCIATION */
-        -EIO,                   /* BCME_SDIO_ERROR */
-        -ENODEV,                /* BCME_DONGLE_DOWN */
-        -EINVAL,                /* BCME_VERSION */
-        -EIO,                   /* BCME_TXFAIL */
-        -EIO,                   /* BCME_RXFAIL */
-        -EINVAL,                /* BCME_NODEVICE */
-        -EINVAL,                /* BCME_NMODE_DISABLED */
-        -ENODATA,               /* BCME_NONRESIDENT */
-
-/* When an new error code is added to bcmutils.h, add os
- * spcecific error translation here as well
- */
-/* check if BCME_LAST changed since the last time this function was updated */
-#if BCME_LAST != -42
-#error "You need to add a OS error translation in the linuxbcmerrormap \
-        for new error code defined in bcmutils.h"
-#endif
-};
-
-/* translate bcmerrors into linux errors */
-int osl_error(int bcmerror)
-{
-        if (bcmerror > 0)
-                bcmerror = 0;
-        else if (bcmerror < BCME_LAST)
-                bcmerror = BCME_ERROR;
-
-        /* Array bounds covered by ASSERT in osl_attach */
-        return linuxbcmerrormap[-bcmerror];
-}
-#endif /* BRCM_FULLMAC */
-
-osl_t *osl_attach(void *pdev, uint bustype, bool pkttag)
+struct osl_info *osl_attach(void *pdev, uint bustype)
 {
-        osl_t *osh;
+        struct osl_info *osh;
 
-        osh = kmalloc(sizeof(osl_t), GFP_ATOMIC);
+        osh = kmalloc(sizeof(struct osl_info), GFP_ATOMIC);
         ASSERT(osh);
 
-        bzero(osh, sizeof(osl_t));
-
-#ifdef BRCM_FULLMAC
-        /* Check that error map has the right number of entries in it */
-        ASSERT(ABS(BCME_LAST) == (ARRAY_SIZE(linuxbcmerrormap) - 1));
-#endif /* BRCM_FULLMAC */
+        memset(osh, 0, sizeof(struct osl_info));
 
         osh->magic = OS_HANDLE_MAGIC;
-        osh->failed = 0;
         osh->pdev = pdev;
-        osh->pub.pkttag = pkttag;
         osh->bustype = bustype;
 
         switch (bustype) {
         case PCI_BUS:
         case SI_BUS:
         case PCMCIA_BUS:
-                osh->pub.mmbus = true;
+                osh->mmbus = true;
                 break;
         case JTAG_BUS:
         case SDIO_BUS:
         case USB_BUS:
         case SPI_BUS:
         case RPC_BUS:
-                osh->pub.mmbus = false;
+                osh->mmbus = false;
                 break;
         default:
                 ASSERT(false);
                 break;
         }
 
-#if defined(BCMDBG) && !defined(BRCM_FULLMAC)
-        if (pkttag) {
-                struct sk_buff *skb;
-                ASSERT(OSL_PKTTAG_SZ <= sizeof(skb->cb));
-        }
-#endif
         return osh;
 }
 
-void osl_detach(osl_t *osh)
+void osl_detach(struct osl_info *osh)
 {
         if (osh == NULL)
                 return;
@@ -167,8 +79,7 @@ void osl_detach(osl_t *osh)
         kfree(osh);
 }
 
-/* Return a new packet. zero out pkttag */
-void *BCMFASTPATH osl_pktget(osl_t *osh, uint len)
+struct sk_buff *BCMFASTPATH pkt_buf_get_skb(struct osl_info *osh, uint len)
 {
         struct sk_buff *skb;
 
@@ -177,24 +88,20 @@ void *BCMFASTPATH osl_pktget(osl_t *osh, uint len)
                 skb_put(skb, len);
                 skb->priority = 0;
 
-                osh->pub.pktalloced++;
+                osh->pktalloced++;
         }
 
-        return (void *)skb;
+        return skb;
 }
 
 /* Free the driver packet. Free the tag if present */
-void BCMFASTPATH osl_pktfree(osl_t *osh, void *p, bool send)
+void BCMFASTPATH pkt_buf_free_skb(struct osl_info *osh, struct sk_buff *skb, bool send)
 {
-        struct sk_buff *skb, *nskb;
+        struct sk_buff *nskb;
         int nest = 0;
 
-        skb = (struct sk_buff *)p;
         ASSERT(skb);
 
-        if (send && osh->pub.tx_fn)
-                osh->pub.tx_fn(osh->pub.tx_ctx, p, 0);
-
         /* perversion: we use skb->next to chain multi-skb packets */
         while (skb) {
                 nskb = skb->next;
@@ -211,63 +118,14 @@ void BCMFASTPATH osl_pktfree(osl_t *osh, void *p, bool send)
                          */
                         dev_kfree_skb(skb);
 
-                osh->pub.pktalloced--;
+                osh->pktalloced--;
                 nest++;
                 skb = nskb;
         }
 }
 
-u32 osl_pci_read_config(osl_t *osh, uint offset, uint size)
-{
-        uint val = 0;
-        uint retry = PCI_CFG_RETRY;
-
-        ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-        /* only 4byte access supported */
-        ASSERT(size == 4);
-
-        do {
-                pci_read_config_dword(osh->pdev, offset, &val);
-                if (val != 0xffffffff)
-                        break;
-        } while (retry--);
-
-#ifdef BCMDBG
-        if (retry < PCI_CFG_RETRY)
-                printk("PCI CONFIG READ access to %d required %d retries\n",
-                       offset, (PCI_CFG_RETRY - retry));
-#endif                          /* BCMDBG */
-
-        return val;
-}
-
-void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val)
-{
-        uint retry = PCI_CFG_RETRY;
-
-        ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-
-        /* only 4byte access supported */
-        ASSERT(size == 4);
-
-        do {
-                pci_write_config_dword(osh->pdev, offset, val);
-                if (offset != PCI_BAR0_WIN)
-                        break;
-                if (osl_pci_read_config(osh, offset, size) == val)
-                        break;
-        } while (retry--);
-
-#if defined(BCMDBG) && !defined(BRCM_FULLMAC)
-        if (retry < PCI_CFG_RETRY)
-                printk("PCI CONFIG WRITE access to %d required %d retries\n",
-                       offset, (PCI_CFG_RETRY - retry));
-#endif                          /* BCMDBG */
-}
-
 /* return bus # for the pci device pointed by osh->pdev */
-uint osl_pci_bus(osl_t *osh)
+uint osl_pci_bus(struct osl_info *osh)
 {
         ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev);
 
@@ -275,40 +133,37 @@ uint osl_pci_bus(osl_t *osh)
 }
 
 /* return slot # for the pci device pointed by osh->pdev */
-uint osl_pci_slot(osl_t *osh)
+uint osl_pci_slot(struct osl_info *osh)
 {
         ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev);
 
         return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn);
 }
 
-uint osl_dma_consistent_align(void)
-{
-        return PAGE_SIZE;
-}
-
-void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align_bits,
+void *osl_dma_alloc_consistent(struct osl_info *osh, uint size, u16 align_bits,
                                uint *alloced, unsigned long *pap)
 {
         ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 
         if (align_bits) {
                 u16 align = (1 << align_bits);
-                if (!IS_ALIGNED(DMA_CONSISTENT_ALIGN, align))
+                if (!IS_ALIGNED(PAGE_SIZE, align))
                         size += align;
                 *alloced = size;
         }
         return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap);
 }
 
-void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa)
+void osl_dma_free_consistent(struct osl_info *osh, void *va, uint size,
+                             unsigned long pa)
 {
         ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 
         pci_free_consistent(osh->pdev, size, va, (dma_addr_t) pa);
 }
 
-uint BCMFASTPATH osl_dma_map(osl_t *osh, void *va, uint size, int direction)
+uint BCMFASTPATH osl_dma_map(struct osl_info *osh, void *va, uint size,
+                             int direction)
 {
         int dir;
 
@@ -317,7 +172,8 @@ uint BCMFASTPATH osl_dma_map(osl_t *osh, void *va, uint size, int direction)
         return pci_map_single(osh->pdev, va, size, dir);
 }
 
-void BCMFASTPATH osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction)
+void BCMFASTPATH osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
+                               int direction)
 {
         int dir;
 
@@ -373,52 +229,3 @@ void osl_assert(char *exp, char *file, int line)
 }
 #endif                          /* defined(BCMDBG_ASSERT) */
 
-#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
-u8 osl_readb(osl_t *osh, volatile u8 *r)
-{
-        osl_rreg_fn_t rreg = ((osl_pubinfo_t *) osh)->rreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        return (u8) ((rreg) (ctx, (void *)r, sizeof(u8)));
-}
-
-u16 osl_readw(osl_t *osh, volatile u16 *r)
-{
-        osl_rreg_fn_t rreg = ((osl_pubinfo_t *) osh)->rreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        return (u16) ((rreg) (ctx, (void *)r, sizeof(u16)));
-}
-
-u32 osl_readl(osl_t *osh, volatile u32 *r)
-{
-        osl_rreg_fn_t rreg = ((osl_pubinfo_t *) osh)->rreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        return (u32) ((rreg) (ctx, (void *)r, sizeof(u32)));
-}
-
-void osl_writeb(osl_t *osh, volatile u8 *r, u8 v)
-{
-        osl_wreg_fn_t wreg = ((osl_pubinfo_t *) osh)->wreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        ((wreg) (ctx, (void *)r, v, sizeof(u8)));
-}
-
-void osl_writew(osl_t *osh, volatile u16 *r, u16 v)
-{
-        osl_wreg_fn_t wreg = ((osl_pubinfo_t *) osh)->wreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        ((wreg) (ctx, (void *)r, v, sizeof(u16)));
-}
-
-void osl_writel(osl_t *osh, volatile u32 *r, u32 v)
-{
-        osl_wreg_fn_t wreg = ((osl_pubinfo_t *) osh)->wreg_fn;
-        void *ctx = ((osl_pubinfo_t *) osh)->reg_ctx;
-
-        ((wreg) (ctx, (void *)r, v, sizeof(u32)));
-}
-#endif  /* BCMSDIO */
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index 23f86dd7b159..56e658c429a8 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -14,8 +14,9 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/delay.h>
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
@@ -35,7 +36,7 @@ typedef struct {
         } regs;                 /* Memory mapped register to the core */
 
         si_t *sih;              /* System interconnect handle */
-        osl_t *osh;             /* OSL handle */
+        struct osl_info *osh;           /* OSL handle */
         u8 pciecap_lcreg_offset;        /* PCIE capability LCreg offset in the config space */
         bool pcie_pr42767;
         u8 pcie_polarity;
@@ -47,7 +48,8 @@ typedef struct {
 
 /* debug/trace */
 #define PCI_ERROR(args)
-#define PCIE_PUB(sih) ((BUSTYPE((sih)->bustype) == PCI_BUS) && ((sih)->buscoretype == PCIE_CORE_ID))
+#define PCIE_PUB(sih) \
+        (((sih)->bustype == PCI_BUS) && ((sih)->buscoretype == PCIE_CORE_ID))
 
 /* routines to access mdio slave device registers */
 static bool pcie_mdiosetblock(pcicore_info_t *pi, uint blk);
@@ -71,35 +73,6 @@ static bool pcicore_pmecap(pcicore_info_t *pi);
 
 #define PCIE_ASPM(sih)  ((PCIE_PUB(sih)) && (((sih)->buscorerev >= 3) && ((sih)->buscorerev <= 5)))
 
-#define DWORD_ALIGN(x)  (x & ~(0x03))
-#define BYTE_POS(x) (x & 0x3)
-#define WORD_POS(x) (x & 0x1)
-
-#define BYTE_SHIFT(x)  (8 * BYTE_POS(x))
-#define WORD_SHIFT(x)  (16 * WORD_POS(x))
-
-#define BYTE_VAL(a, x) ((a >> BYTE_SHIFT(x)) & 0xFF)
-#define WORD_VAL(a, x) ((a >> WORD_SHIFT(x)) & 0xFFFF)
-
-#define read_pci_cfg_byte(a) \
-        (BYTE_VAL(OSL_PCI_READ_CONFIG(osh, DWORD_ALIGN(a), 4), a) & 0xff)
-
-#define read_pci_cfg_word(a) \
-        (WORD_VAL(OSL_PCI_READ_CONFIG(osh, DWORD_ALIGN(a), 4), a) & 0xffff)
-
-#define write_pci_cfg_byte(a, val) do { \
-        u32 tmpval; \
-        tmpval = (OSL_PCI_READ_CONFIG(osh, DWORD_ALIGN(a), 4) & ~0xFF << BYTE_POS(a)) | \
-                val << BYTE_POS(a); \
-        OSL_PCI_WRITE_CONFIG(osh, DWORD_ALIGN(a), 4, tmpval); \
-        } while (0)
-
-#define write_pci_cfg_word(a, val) do { \
-        u32 tmpval; \
-        tmpval = (OSL_PCI_READ_CONFIG(osh, DWORD_ALIGN(a), 4) & ~0xFFFF << WORD_POS(a)) | \
-                val << WORD_POS(a); \
-        OSL_PCI_WRITE_CONFIG(osh, DWORD_ALIGN(a), 4, tmpval); \
-        } while (0)
 
 /* delay needed between the mdio control/ mdiodata register data access */
 #define PR28829_DELAY() udelay(10)
@@ -107,7 +80,7 @@ static bool pcicore_pmecap(pcicore_info_t *pi);
 /* Initialize the PCI core. It's caller's responsibility to make sure that this is done
  * only once
  */
-void *pcicore_init(si_t *sih, osl_t *osh, void *regs)
+void *pcicore_init(si_t *sih, struct osl_info *osh, void *regs)
 {
         pcicore_info_t *pi;
 
@@ -149,8 +122,8 @@ void pcicore_deinit(void *pch)
 /* return cap_offset if requested capability exists in the PCI config space */
 /* Note that it's caller's responsibility to make sure it's a pci bus */
 u8
-pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, unsigned char *buf,
-                            u32 *buflen)
+pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id,
+                            unsigned char *buf, u32 *buflen)
 {
         u8 cap_id;
         u8 cap_ptr = 0;
@@ -158,29 +131,29 @@ pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, unsigned char *buf,
         u8 byte_val;
 
         /* check for Header type 0 */
-        byte_val = read_pci_cfg_byte(PCI_CFG_HDR);
+        pci_read_config_byte(osh->pdev, PCI_CFG_HDR, &byte_val);
         if ((byte_val & 0x7f) != PCI_HEADER_NORMAL)
                 goto end;
 
         /* check if the capability pointer field exists */
-        byte_val = read_pci_cfg_byte(PCI_CFG_STAT);
+        pci_read_config_byte(osh->pdev, PCI_CFG_STAT, &byte_val);
         if (!(byte_val & PCI_CAPPTR_PRESENT))
                 goto end;
 
-        cap_ptr = read_pci_cfg_byte(PCI_CFG_CAPPTR);
+        pci_read_config_byte(osh->pdev, PCI_CFG_CAPPTR, &cap_ptr);
         /* check if the capability pointer is 0x00 */
         if (cap_ptr == 0x00)
                 goto end;
 
         /* loop thr'u the capability list and see if the pcie capabilty exists */
 
-        cap_id = read_pci_cfg_byte(cap_ptr);
+        pci_read_config_byte(osh->pdev, cap_ptr, &cap_id);
 
         while (cap_id != req_cap_id) {
-                cap_ptr = read_pci_cfg_byte((cap_ptr + 1));
+                pci_read_config_byte(osh->pdev, cap_ptr + 1, &cap_ptr);
                 if (cap_ptr == 0x00)
                         break;
-                cap_id = read_pci_cfg_byte(cap_ptr);
+                pci_read_config_byte(osh->pdev, cap_ptr, &cap_id);
         }
         if (cap_id != req_cap_id) {
                 goto end;
@@ -199,7 +172,7 @@ pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, unsigned char *buf,
                         bufsize = SZPCR - cap_data;
                 *buflen = bufsize;
                 while (bufsize--) {
-                        *buf = read_pci_cfg_byte(cap_data);
+                        pci_read_config_byte(osh->pdev, cap_data, buf);
                         cap_data++;
                         buf++;
                 }
@@ -210,7 +183,8 @@ pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, unsigned char *buf,
 
 /* ***** Register Access API */
 uint
-pcie_readreg(osl_t *osh, sbpcieregs_t *pcieregs, uint addrtype, uint offset)
+pcie_readreg(struct osl_info *osh, sbpcieregs_t *pcieregs, uint addrtype,
+             uint offset)
 {
         uint retval = 0xFFFFFFFF;
 
@@ -236,8 +210,8 @@ pcie_readreg(osl_t *osh, sbpcieregs_t *pcieregs, uint addrtype, uint offset)
 }
 
 uint
-pcie_writereg(osl_t *osh, sbpcieregs_t *pcieregs, uint addrtype, uint offset,
-              uint val)
+pcie_writereg(struct osl_info *osh, sbpcieregs_t *pcieregs, uint addrtype,
+              uint offset, uint val)
 {
         ASSERT(pcieregs != NULL);
 
@@ -373,15 +347,15 @@ u8 pcie_clkreq(void *pch, u32 mask, u32 val)
         if (!offset)
                 return 0;
 
-        reg_val = OSL_PCI_READ_CONFIG(pi->osh, offset, sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, offset, &reg_val);
         /* set operation */
         if (mask) {
                 if (val)
                         reg_val |= PCIE_CLKREQ_ENAB;
                 else
                         reg_val &= ~PCIE_CLKREQ_ENAB;
-                OSL_PCI_WRITE_CONFIG(pi->osh, offset, sizeof(u32), reg_val);
-                reg_val = OSL_PCI_READ_CONFIG(pi->osh, offset, sizeof(u32));
+                pci_write_config_dword(pi->osh->pdev, offset, reg_val);
+                pci_read_config_dword(pi->osh->pdev, offset, &reg_val);
         }
         if (reg_val & PCIE_CLKREQ_ENAB)
                 return 1;
@@ -393,7 +367,7 @@ static void pcie_extendL1timer(pcicore_info_t *pi, bool extend)
 {
         u32 w;
         si_t *sih = pi->sih;
-        osl_t *osh = pi->osh;
+        struct osl_info *osh = pi->osh;
         sbpcieregs_t *pcieregs = pi->regs.pcieregs;
 
         if (!PCIE_PUB(sih) || sih->buscorerev < 7)
@@ -502,12 +476,12 @@ static void pcie_war_aspm_clkreq(pcicore_info_t *pi)
 
                 W_REG(pi->osh, reg16, val16);
 
-                w = OSL_PCI_READ_CONFIG(pi->osh, pi->pciecap_lcreg_offset,
-                                        sizeof(u32));
+                pci_read_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset,
+                                        &w);
                 w &= ~PCIE_ASPM_ENAB;
                 w |= pi->pcie_war_aspm_ovr;
-                OSL_PCI_WRITE_CONFIG(pi->osh, pi->pciecap_lcreg_offset,
-                                     sizeof(u32), w);
+                pci_write_config_dword(pi->osh->pdev,
+                                        pi->pciecap_lcreg_offset, w);
         }
 
         reg16 = &pcieregs->sprom[SRSH_CLKREQ_OFFSET_REV5];
@@ -577,7 +551,7 @@ static void pcie_war_noplldown(pcicore_info_t *pi)
 static void pcie_war_pci_setup(pcicore_info_t *pi)
 {
         si_t *sih = pi->sih;
-        osl_t *osh = pi->osh;
+        struct osl_info *osh = pi->osh;
         sbpcieregs_t *pcieregs = pi->regs.pcieregs;
         u32 w;
 
@@ -694,11 +668,9 @@ void pcicore_sleep(void *pch)
         if (!pi || !PCIE_ASPM(pi->sih))
                 return;
 
-        w = OSL_PCI_READ_CONFIG(pi->osh, pi->pciecap_lcreg_offset,
-                                sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset, &w);
         w &= ~PCIE_CAP_LCREG_ASPML1;
-        OSL_PCI_WRITE_CONFIG(pi->osh, pi->pciecap_lcreg_offset, sizeof(u32),
-                             w);
+        pci_write_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset, w);
 
         pi->pcie_pr42767 = false;
 }
@@ -718,7 +690,7 @@ void pcicore_down(void *pch, int state)
 
 /* ***** Wake-on-wireless-LAN (WOWL) support functions ***** */
 /* Just uses PCI config accesses to find out, when needed before sb_attach is done */
-bool pcicore_pmecap_fast(osl_t *osh)
+bool pcicore_pmecap_fast(struct osl_info *osh)
 {
         u8 cap_ptr;
         u32 pmecap;
@@ -730,7 +702,7 @@ bool pcicore_pmecap_fast(osl_t *osh)
         if (!cap_ptr)
                 return false;
 
-        pmecap = OSL_PCI_READ_CONFIG(osh, cap_ptr, sizeof(u32));
+        pci_read_config_dword(osh->pdev, cap_ptr, &pmecap);
 
         return (pmecap & PME_CAP_PM_STATES) != 0;
 }
@@ -753,9 +725,8 @@ static bool pcicore_pmecap(pcicore_info_t *pi)
 
                 pi->pmecap_offset = cap_ptr;
 
-                pmecap =
-                    OSL_PCI_READ_CONFIG(pi->osh, pi->pmecap_offset,
-                                        sizeof(u32));
+                pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset,
+                                        &pmecap);
 
                 /* At least one state can generate PME */
                 pi->pmecap = (pmecap & PME_CAP_PM_STATES) != 0;
@@ -774,11 +745,11 @@ void pcicore_pmeen(void *pch)
         if (!pcicore_pmecap(pi))
                 return;
 
-        w = OSL_PCI_READ_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
-                                sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET,
+                                &w);
         w |= (PME_CSR_PME_EN);
-        OSL_PCI_WRITE_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
-                             sizeof(u32), w);
+        pci_write_config_dword(pi->osh->pdev,
+                                pi->pmecap_offset + PME_CSR_OFFSET, w);
 }
 
 /*
@@ -792,8 +763,8 @@ bool pcicore_pmestat(void *pch)
         if (!pcicore_pmecap(pi))
                 return false;
 
-        w = OSL_PCI_READ_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
-                                sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET,
+                                &w);
 
         return (w & PME_CSR_PME_STAT) == PME_CSR_PME_STAT;
 }
@@ -808,22 +779,23 @@ void pcicore_pmeclr(void *pch)
         if (!pcicore_pmecap(pi))
                 return;
 
-        w = OSL_PCI_READ_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
-                                sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET,
+                                &w);
 
         PCI_ERROR(("pcicore_pci_pmeclr PMECSR : 0x%x\n", w));
 
         /* PMESTAT is cleared by writing 1 to it */
         w &= ~(PME_CSR_PME_EN);
 
-        OSL_PCI_WRITE_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
-                             sizeof(u32), w);
+        pci_write_config_dword(pi->osh->pdev,
+                                pi->pmecap_offset + PME_CSR_OFFSET, w);
 }
 
 u32 pcie_lcreg(void *pch, u32 mask, u32 val)
 {
         pcicore_info_t *pi = (pcicore_info_t *) pch;
         u8 offset;
+        u32 tmpval;
 
         offset = pi->pciecap_lcreg_offset;
         if (!offset)
@@ -831,9 +803,10 @@ u32 pcie_lcreg(void *pch, u32 mask, u32 val)
 
         /* set operation */
         if (mask)
-                OSL_PCI_WRITE_CONFIG(pi->osh, offset, sizeof(u32), val);
+                pci_write_config_dword(pi->osh->pdev, offset, val);
 
-        return OSL_PCI_READ_CONFIG(pi->osh, offset, sizeof(u32));
+        pci_read_config_dword(pi->osh->pdev, offset, &tmpval);
+        return tmpval;
 }
 
 u32
@@ -842,7 +815,7 @@ pcicore_pciereg(void *pch, u32 offset, u32 mask, u32 val, uint type)
         u32 reg_val = 0;
         pcicore_info_t *pi = (pcicore_info_t *) pch;
         sbpcieregs_t *pcieregs = pi->regs.pcieregs;
-        osl_t *osh = pi->osh;
+        struct osl_info *osh = pi->osh;
 
         if (mask) {
                 PCI_ERROR(("PCIEREG: 0x%x writeval  0x%x\n", offset, val));
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index f80375cd6801..e4d41ee78e2a 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -49,7 +49,7 @@ static char *findvar(char *vars, char *lim, const char *name);
 /* copy flash to ram */
 static void get_flash_nvram(si_t *sih, struct nvram_header *nvh)
 {
-        osl_t *osh;
+        struct osl_info *osh;
         uint nvs, bufsz;
         vars_t *new;
 
@@ -133,7 +133,7 @@ static char *findvar(char *vars, char *lim, const char *name)
         len = strlen(name);
 
         for (s = vars; (s < lim) && *s;) {
-                if ((bcmp(s, name, len) == 0) && (s[len] == '='))
+                if ((memcmp(s, name, len) == 0) && (s[len] == '='))
                         return &s[len + 1];
 
                 while (*s++)
diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index e4c0baba553d..63c3ab1866a4 100644
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -16,6 +16,9 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
@@ -87,7 +90,7 @@ static u32 _sb_coresba(si_info_t *sii)
 {
         u32 sbaddr = 0;
 
-        switch (BUSTYPE(sii->pub.bustype)) {
+        switch (sii->pub.bustype) {
         case SPI_BUS:
         case SDIO_BUS:
                 sbaddr = (u32)(unsigned long)sii->curmap;
@@ -248,7 +251,7 @@ static uint _sb_scan(si_info_t *sii, u32 sba, void *regs, uint bus, u32 sbba,
                         else {
                                 /* Older chips */
                                 SI_ERROR(("sb_chip2numcores: unsupported chip "
-                                        "0x%x\n", CHIPID(sii->pub.chip)));
+                                                  "0x%x\n", sii->pub.chip));
                                 ASSERT(0);
                                 numcores = 1;
                         }
@@ -344,7 +347,7 @@ static void *_sb_setcoreidx(si_info_t *sii, uint coreidx)
         u32 sbaddr = sii->coresba[coreidx];
         void *regs;
 
-        switch (BUSTYPE(sii->pub.bustype)) {
+        switch (sii->pub.bustype) {
 #ifdef BCMSDIO
         case SPI_BUS:
         case SDIO_BUS:
@@ -409,8 +412,8 @@ bool sb_taclear(si_t *sih, bool details)
 
         sii = SI_INFO(sih);
 
-        if ((BUSTYPE(sii->pub.bustype) == SDIO_BUS) ||
-            (BUSTYPE(sii->pub.bustype) == SPI_BUS)) {
+        if ((sii->pub.bustype == SDIO_BUS) ||
+            (sii->pub.bustype == SPI_BUS)) {
 
                 INTR_OFF(sii, intr_val);
                 origidx = si_coreidx(sih);
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index f3ea7e1a7aef..b66de9b35a5a 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -14,11 +14,16 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmdevs.h>
@@ -53,7 +58,7 @@
 #endif
 
 /* local prototypes */
-static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
+static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
                               void *regs, uint bustype, void *sdh, char **vars,
                               uint *varsz);
 static bool si_buscore_prep(si_info_t *sii, uint bustype, uint devid,
@@ -81,8 +86,8 @@ static u32 si_gpioreservation;
  * vars - pointer to a pointer area for "environment" variables
  * varsz - pointer to int to return the size of the vars
  */
-si_t *si_attach(uint devid, osl_t *osh, void *regs, uint bustype, void *sdh,
-                char **vars, uint *varsz)
+si_t *si_attach(uint devid, struct osl_info *osh, void *regs, uint bustype,
+                void *sdh, char **vars, uint *varsz)
 {
         si_info_t *sii;
 
@@ -113,12 +118,12 @@ static bool si_buscore_prep(si_info_t *sii, uint bustype, uint devid,
 
 #ifndef BRCM_FULLMAC
         /* kludge to enable the clock on the 4306 which lacks a slowclock */
-        if (BUSTYPE(bustype) == PCI_BUS && !si_ispcie(sii))
+        if (bustype == PCI_BUS && !si_ispcie(sii))
                 si_clkctl_xtal(&sii->pub, XTAL | PLL, ON);
 #endif
 
 #if defined(BCMSDIO)
-        if (BUSTYPE(bustype) == SDIO_BUS) {
+        if (bustype == SDIO_BUS) {
                 int err;
                 u8 clkset;
 
@@ -220,7 +225,7 @@ static bool si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype,
                 SI_VMSG(("CORE[%d]: id 0x%x rev %d base 0x%x regs 0x%p\n",
                          i, cid, crev, sii->coresba[i], sii->regs[i]));
 
-                if (BUSTYPE(bustype) == PCI_BUS) {
+                if (bustype == PCI_BUS) {
                         if (cid == PCI_CORE_ID) {
                                 pciidx = i;
                                 pcirev = crev;
@@ -232,8 +237,8 @@ static bool si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype,
                         }
                 }
 #ifdef BCMSDIO
-                else if (((BUSTYPE(bustype) == SDIO_BUS) ||
-                          (BUSTYPE(bustype) == SPI_BUS)) &&
+                else if (((bustype == SDIO_BUS) ||
+                          (bustype == SPI_BUS)) &&
                          ((cid == PCMCIA_CORE_ID) || (cid == SDIOD_CORE_ID))) {
                         sii->pub.buscorerev = crev;
                         sii->pub.buscoretype = cid;
@@ -255,7 +260,7 @@ static bool si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype,
         * or downloaded code was
         * already running.
         */
-        if ((BUSTYPE(bustype) == SDIO_BUS) || (BUSTYPE(bustype) == SPI_BUS)) {
+        if ((bustype == SDIO_BUS) || (bustype == SPI_BUS)) {
                 if (si_setcore(&sii->pub, ARM7S_CORE_ID, 0) ||
                         si_setcore(&sii->pub, ARMCM3_CORE_ID, 0))
                         si_core_disable(&sii->pub, 0);
@@ -281,7 +286,7 @@ static bool si_buscore_setup(si_info_t *sii, chipcregs_t *cc, uint bustype,
                  sii->pub.buscoretype, sii->pub.buscorerev));
 
         /* fixup necessary chip/core configurations */
-        if (BUSTYPE(sii->pub.bustype) == PCI_BUS) {
+        if (sii->pub.bustype == PCI_BUS) {
                 if (SI_FAST(sii)) {
                         if (!sii->pch) {
                                 sii->pch = (void *)pcicore_init(
@@ -308,10 +313,10 @@ static __used void si_nvram_process(si_info_t *sii, char *pvars)
         uint w = 0;
 
         /* get boardtype and boardrev */
-        switch (BUSTYPE(sii->pub.bustype)) {
+        switch (sii->pub.bustype) {
         case PCI_BUS:
                 /* do a pci config read to get subsystem id and subvendor id */
-                w = OSL_PCI_READ_CONFIG(sii->osh, PCI_CFG_SVID, sizeof(u32));
+                pci_read_config_dword(sii->osh->pdev, PCI_CFG_SVID, &w);
                 /* Let nvram variables override subsystem Vend/ID */
                 sii->pub.boardvendor = (u16)si_getdevpathintvar(&sii->pub,
                         "boardvendor");
@@ -364,7 +369,7 @@ static __used void si_nvram_process(si_info_t *sii, char *pvars)
 /* this is will make Sonics calls directly, since Sonics is no longer supported in the Si abstraction */
 /* this has been customized for the bcm 4329 ONLY */
 #ifdef BCMSDIO
-static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
+static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
                               void *regs, uint bustype, void *sdh,
                               char **vars, uint *varsz)
 {
@@ -376,7 +381,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
 
         ASSERT(GOODREGS(regs));
 
-        bzero((unsigned char *) sii, sizeof(si_info_t));
+        memset((unsigned char *) sii, 0, sizeof(si_info_t));
 
         savewin = 0;
 
@@ -390,11 +395,6 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
         cc = (chipcregs_t *) sii->curmap;
         sih->bustype = bustype;
 
-        if (bustype != BUSTYPE(bustype)) {
-                SI_ERROR(("si_doattach: bus type %d does not match configured bus type %d\n", bustype, BUSTYPE(bustype)));
-                return NULL;
-        }
-
         /* bus/core/clk setup for register access */
         if (!si_buscore_prep(sii, bustype, devid, sdh)) {
                 SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n",
@@ -414,7 +414,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
         sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
         sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
 
-        if ((CHIPID(sih->chip) == BCM4329_CHIP_ID) &&
+        if ((sih->chip == BCM4329_CHIP_ID) &&
                 (sih->chippkg != BCM4329_289PIN_PKG_ID))
                         sih->chippkg = BCM4329_182PIN_PKG_ID;
 
@@ -444,7 +444,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
 
         /* Init nvram from sprom/otp if they exist */
         if (srom_var_init
-            (&sii->pub, BUSTYPE(bustype), regs, sii->osh, vars, varsz)) {
+            (&sii->pub, bustype, regs, sii->osh, vars, varsz)) {
                 SI_ERROR(("si_doattach: srom_var_init failed: bad srom\n"));
                 goto exit;
         }
@@ -499,7 +499,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
 }
 
 #else                           /* BCMSDIO */
-static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
+static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
                               void *regs, uint bustype, void *sdh,
                               char **vars, uint *varsz)
 {
@@ -511,7 +511,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
 
         ASSERT(GOODREGS(regs));
 
-        bzero((unsigned char *) sii, sizeof(si_info_t));
+        memset((unsigned char *) sii, 0, sizeof(si_info_t));
 
         savewin = 0;
 
@@ -522,30 +522,29 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
         sii->osh = osh;
 
         /* check to see if we are a si core mimic'ing a pci core */
-        if ((bustype == PCI_BUS) &&
-            (OSL_PCI_READ_CONFIG(sii->osh, PCI_SPROM_CONTROL, sizeof(u32)) ==
-             0xffffffff)) {
-                SI_ERROR(("%s: incoming bus is PCI but it's a lie, switching to SI " "devid:0x%x\n", __func__, devid));
-                bustype = SI_BUS;
+        if (bustype == PCI_BUS) {
+                pci_read_config_dword(sii->osh->pdev, PCI_SPROM_CONTROL,  &w);
+                if (w == 0xffffffff) {
+                        SI_ERROR(("%s: incoming bus is PCI but it's a lie, "
+                                " switching to SI devid:0x%x\n",
+                                __func__, devid));
+                        bustype = SI_BUS;
+                }
         }
 
         /* find Chipcommon address */
         if (bustype == PCI_BUS) {
-                savewin =
-                    OSL_PCI_READ_CONFIG(sii->osh, PCI_BAR0_WIN, sizeof(u32));
+                pci_read_config_dword(sii->osh->pdev, PCI_BAR0_WIN, &savewin);
                 if (!GOODCOREADDR(savewin, SI_ENUM_BASE))
                         savewin = SI_ENUM_BASE;
-                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, SI_ENUM_BASE);
+                pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN,
+                                       SI_ENUM_BASE);
                 cc = (chipcregs_t *) regs;
         } else {
                 cc = (chipcregs_t *) REG_MAP(SI_ENUM_BASE, SI_CORE_SIZE);
         }
 
         sih->bustype = bustype;
-        if (bustype != BUSTYPE(bustype)) {
-                SI_ERROR(("si_doattach: bus type %d does not match configured bus type %d\n", bustype, BUSTYPE(bustype)));
-                return NULL;
-        }
 
         /* bus/core/clk setup for register access */
         if (!si_buscore_prep(sii, bustype, devid, sdh)) {
@@ -569,7 +568,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
         sih->issim = IS_SIM(sih->chippkg);
 
         /* scan for cores */
-        if (CHIPTYPE(sii->pub.socitype) == SOCI_AI) {
+        if (sii->pub.socitype == SOCI_AI) {
                 SI_MSG(("Found chip type AI (0x%08x)\n", w));
                 /* pass chipc address instead of original core base */
                 ai_scan(&sii->pub, (void *)cc, devid);
@@ -592,10 +591,10 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
         /* assume current core is CC */
         if ((sii->pub.ccrev == 0x25)
             &&
-            ((CHIPID(sih->chip) == BCM43236_CHIP_ID
-              || CHIPID(sih->chip) == BCM43235_CHIP_ID
-              || CHIPID(sih->chip) == BCM43238_CHIP_ID)
-             && (CHIPREV(sii->pub.chiprev) <= 2))) {
+            ((sih->chip == BCM43236_CHIP_ID
+              || sih->chip == BCM43235_CHIP_ID
+              || sih->chip == BCM43238_CHIP_ID)
+             && (sii->pub.chiprev <= 2))) {
 
                 if ((cc->chipstatus & CST43236_BP_CLK) != 0) {
                         uint clkdiv;
@@ -613,7 +612,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
 
         /* Init nvram from sprom/otp if they exist */
         if (srom_var_init
-            (&sii->pub, BUSTYPE(bustype), regs, sii->osh, vars, varsz)) {
+            (&sii->pub, bustype, regs, sii->osh, vars, varsz)) {
                 SI_ERROR(("si_doattach: srom_var_init failed: bad srom\n"));
                 goto exit;
         }
@@ -651,10 +650,10 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
                 pcicore_attach(sii->pch, pvars, SI_DOATTACH);
         }
 
-        if ((CHIPID(sih->chip) == BCM43224_CHIP_ID) ||
-            (CHIPID(sih->chip) == BCM43421_CHIP_ID)) {
+        if ((sih->chip == BCM43224_CHIP_ID) ||
+            (sih->chip == BCM43421_CHIP_ID)) {
                 /* enable 12 mA drive strenth for 43224 and set chipControl register bit 15 */
-                if (CHIPREV(sih->chiprev) == 0) {
+                if (sih->chiprev == 0) {
                         SI_MSG(("Applying 43224A0 WARs\n"));
                         si_corereg(sih, SI_CC_IDX,
                                    offsetof(chipcregs_t, chipcontrol),
@@ -663,28 +662,28 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, osl_t *osh,
                         si_pmu_chipcontrol(sih, 0, CCTRL_43224A0_12MA_LED_DRIVE,
                                            CCTRL_43224A0_12MA_LED_DRIVE);
                 }
-                if (CHIPREV(sih->chiprev) >= 1) {
+                if (sih->chiprev >= 1) {
                         SI_MSG(("Applying 43224B0+ WARs\n"));
                         si_pmu_chipcontrol(sih, 0, CCTRL_43224B0_12MA_LED_DRIVE,
                                            CCTRL_43224B0_12MA_LED_DRIVE);
                 }
         }
 
-        if (CHIPID(sih->chip) == BCM4313_CHIP_ID) {
+        if (sih->chip == BCM4313_CHIP_ID) {
                 /* enable 12 mA drive strenth for 4313 and set chipControl register bit 1 */
                 SI_MSG(("Applying 4313 WARs\n"));
                 si_pmu_chipcontrol(sih, 0, CCTRL_4313_12MA_LED_DRIVE,
                                    CCTRL_4313_12MA_LED_DRIVE);
         }
 
-        if (CHIPID(sih->chip) == BCM4331_CHIP_ID) {
+        if (sih->chip == BCM4331_CHIP_ID) {
                 /* Enable Ext PA lines depending on chip package option */
                 si_chipcontrl_epa4331(sih, true);
         }
 
         return sii;
  exit:
-        if (BUSTYPE(sih->bustype) == PCI_BUS) {
+        if (sih->bustype == PCI_BUS) {
                 if (sii->pch)
                         pcicore_deinit(sii->pch);
                 sii->pch = NULL;
@@ -708,17 +707,17 @@ void si_detach(si_t *sih)
         if (sii == NULL)
                 return;
 
-        if (BUSTYPE(sih->bustype) == SI_BUS)
+        if (sih->bustype == SI_BUS)
                 for (idx = 0; idx < SI_MAXCORES; idx++)
                         if (sii->regs[idx]) {
-                                REG_UNMAP(sii->regs[idx]);
+                                iounmap(sii->regs[idx]);
                                 sii->regs[idx] = NULL;
                         }
 
 #ifndef BRCM_FULLMAC
         nvram_exit((void *)si_local);   /* free up nvram buffers */
 
-        if (BUSTYPE(sih->bustype) == PCI_BUS) {
+        if (sih->bustype == PCI_BUS) {
                 if (sii->pch)
                         pcicore_deinit(sii->pch);
                 sii->pch = NULL;
@@ -730,7 +729,7 @@ void si_detach(si_t *sih)
                 kfree(sii);
 }
 
-void *si_osh(si_t *sih)
+struct osl_info *si_osh(si_t *sih)
 {
         si_info_t *sii;
 
@@ -766,7 +765,7 @@ void si_deregister_intr_callback(si_t *sih)
 
 uint si_flag(si_t *sih)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_flag(sih);
         else {
                 ASSERT(0);
@@ -776,7 +775,7 @@ uint si_flag(si_t *sih)
 
 void si_setint(si_t *sih, int siflag)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 ai_setint(sih, siflag);
         else
                 ASSERT(0);
@@ -808,7 +807,7 @@ bool si_backplane64(si_t *sih)
 #ifndef BCMSDIO
 uint si_corerev(si_t *sih)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_corerev(sih);
         else {
                 ASSERT(0);
@@ -851,7 +850,7 @@ void *si_setcore(si_t *sih, uint coreid, uint coreunit)
         if (!GOODIDX(idx))
                 return NULL;
 
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_setcoreidx(sih, idx);
         else {
 #ifdef BCMSDIO
@@ -866,7 +865,7 @@ void *si_setcore(si_t *sih, uint coreid, uint coreunit)
 #ifndef BCMSDIO
 void *si_setcoreidx(si_t *sih, uint coreidx)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_setcoreidx(sih, coreidx);
         else {
                 ASSERT(0);
@@ -918,7 +917,7 @@ void si_restore_core(si_t *sih, uint coreid, uint intr_val)
 
 u32 si_core_cflags(si_t *sih, u32 mask, u32 val)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_core_cflags(sih, mask, val);
         else {
                 ASSERT(0);
@@ -928,7 +927,7 @@ u32 si_core_cflags(si_t *sih, u32 mask, u32 val)
 
 u32 si_core_sflags(si_t *sih, u32 mask, u32 val)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_core_sflags(sih, mask, val);
         else {
                 ASSERT(0);
@@ -938,7 +937,7 @@ u32 si_core_sflags(si_t *sih, u32 mask, u32 val)
 
 bool si_iscoreup(si_t *sih)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_iscoreup(sih);
         else {
 #ifdef BCMSDIO
@@ -953,7 +952,7 @@ bool si_iscoreup(si_t *sih)
 void si_write_wrapperreg(si_t *sih, u32 offset, u32 val)
 {
         /* only for 4319, no requirement for SOCI_SB */
-        if (CHIPTYPE(sih->socitype) == SOCI_AI) {
+        if (sih->socitype == SOCI_AI) {
                 ai_write_wrap_reg(sih, offset, val);
         }
 }
@@ -961,7 +960,7 @@ void si_write_wrapperreg(si_t *sih, u32 offset, u32 val)
 uint si_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
 {
 
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 return ai_corereg(sih, coreidx, regoff, mask, val);
         else {
 #ifdef BCMSDIO
@@ -976,7 +975,7 @@ uint si_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
 void si_core_disable(si_t *sih, u32 bits)
 {
 
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 ai_core_disable(sih, bits);
 #ifdef BCMSDIO
         else
@@ -986,7 +985,7 @@ void si_core_disable(si_t *sih, u32 bits)
 
 void si_core_reset(si_t *sih, u32 bits, u32 resetbits)
 {
-        if (CHIPTYPE(sih->socitype) == SOCI_AI)
+        if (sih->socitype == SOCI_AI)
                 ai_core_reset(sih, bits, resetbits);
 #ifdef BCMSDIO
         else
@@ -1043,8 +1042,8 @@ void si_watchdog(si_t *sih, uint ticks)
 
         if (PMUCTL_ENAB(sih)) {
 
-                if ((CHIPID(sih->chip) == BCM4319_CHIP_ID) &&
-                    (CHIPREV(sih->chiprev) == 0) && (ticks != 0)) {
+                if ((sih->chip == BCM4319_CHIP_ID) &&
+                    (sih->chiprev == 0) && (ticks != 0)) {
                         si_corereg(sih, SI_CC_IDX,
                                    offsetof(chipcregs_t, clk_ctl_st), ~0, 0x2);
                         si_setcore(sih, USB20D_CORE_ID, 0);
@@ -1085,16 +1084,18 @@ void si_watchdog(si_t *sih, uint ticks)
 static uint si_slowclk_src(si_info_t *sii)
 {
         chipcregs_t *cc;
+        u32 val;
 
         ASSERT(SI_FAST(sii) || si_coreid(&sii->pub) == CC_CORE_ID);
 
         if (sii->pub.ccrev < 6) {
-                if ((BUSTYPE(sii->pub.bustype) == PCI_BUS) &&
-                    (OSL_PCI_READ_CONFIG(sii->osh, PCI_GPIO_OUT, sizeof(u32))
-                     & PCI_CFG_GPIO_SCS))
-                        return SCC_SS_PCI;
-                else
-                        return SCC_SS_XTAL;
+                if (sii->pub.bustype == PCI_BUS) {
+                        pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUT,
+                                              &val);
+                        if (val & PCI_CFG_GPIO_SCS)
+                                return SCC_SS_PCI;
+                }
+                return SCC_SS_XTAL;
         } else if (sii->pub.ccrev < 10) {
                 cc = (chipcregs_t *) si_setcoreidx(&sii->pub, sii->curidx);
                 return R_REG(sii->osh, &cc->slow_clk_ctl) & SCC_SS_MASK;
@@ -1264,7 +1265,7 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
 
         sii = SI_INFO(sih);
 
-        switch (BUSTYPE(sih->bustype)) {
+        switch (sih->bustype) {
 
 #ifdef BCMSDIO
         case SDIO_BUS:
@@ -1276,12 +1277,9 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
                 if (PCIE(sii))
                         return -1;
 
-                in = OSL_PCI_READ_CONFIG(sii->osh, PCI_GPIO_IN, sizeof(u32));
-                out =
-                    OSL_PCI_READ_CONFIG(sii->osh, PCI_GPIO_OUT, sizeof(u32));
-                outen =
-                    OSL_PCI_READ_CONFIG(sii->osh, PCI_GPIO_OUTEN,
-                                        sizeof(u32));
+                pci_read_config_dword(sii->osh->pdev, PCI_GPIO_IN, &in);
+                pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUT, &out);
+                pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUTEN, &outen);
 
                 /*
                  * Avoid glitching the clock if GPRS is already using it.
@@ -1302,18 +1300,18 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
                                 out |= PCI_CFG_GPIO_XTAL;
                                 if (what & PLL)
                                         out |= PCI_CFG_GPIO_PLL;
-                                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_GPIO_OUT,
-                                                     sizeof(u32), out);
-                                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_GPIO_OUTEN,
-                                                     sizeof(u32), outen);
+                                pci_write_config_dword(sii->osh->pdev,
+                                                       PCI_GPIO_OUT, out);
+                                pci_write_config_dword(sii->osh->pdev,
+                                                       PCI_GPIO_OUTEN, outen);
                                 udelay(XTAL_ON_DELAY);
                         }
 
                         /* turn pll on */
                         if (what & PLL) {
                                 out &= ~PCI_CFG_GPIO_PLL;
-                                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_GPIO_OUT,
-                                                     sizeof(u32), out);
+                                pci_write_config_dword(sii->osh->pdev,
+                                                       PCI_GPIO_OUT, out);
                                 mdelay(2);
                         }
                 } else {
@@ -1321,10 +1319,10 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
                                 out &= ~PCI_CFG_GPIO_XTAL;
                         if (what & PLL)
                                 out |= PCI_CFG_GPIO_PLL;
-                        OSL_PCI_WRITE_CONFIG(sii->osh, PCI_GPIO_OUT,
-                                             sizeof(u32), out);
-                        OSL_PCI_WRITE_CONFIG(sii->osh, PCI_GPIO_OUTEN,
-                                             sizeof(u32), outen);
+                        pci_write_config_dword(sii->osh->pdev,
+                                               PCI_GPIO_OUT, out);
+                        pci_write_config_dword(sii->osh->pdev,
+                                               PCI_GPIO_OUTEN, outen);
                 }
 
         default:
@@ -1378,7 +1376,7 @@ static bool _si_clkctl_cc(si_info_t *sii, uint mode)
                 INTR_OFF(sii, intr_val);
                 origidx = sii->curidx;
 
-                if ((BUSTYPE(sii->pub.bustype) == SI_BUS) &&
+                if ((sii->pub.bustype == SI_BUS) &&
                     si_setcore(&sii->pub, MIPS33_CORE_ID, 0) &&
                     (si_corerev(&sii->pub) <= 7) && (sii->pub.ccrev >= 10))
                         goto done;
@@ -1460,7 +1458,7 @@ int si_devpath(si_t *sih, char *path, int size)
         if (!path || size <= 0)
                 return -1;
 
-        switch (BUSTYPE(sih->bustype)) {
+        switch (sih->bustype) {
         case SI_BUS:
         case JTAG_BUS:
                 slen = snprintf(path, (size_t) size, "sb/%u/", si_coreidx(sih));
@@ -1550,7 +1548,7 @@ static __used bool si_ispcie(si_info_t *sii)
 {
         u8 cap_ptr;
 
-        if (BUSTYPE(sii->pub.bustype) != PCI_BUS)
+        if (sii->pub.bustype != PCI_BUS)
                 return false;
 
         cap_ptr =
@@ -1617,7 +1615,7 @@ void si_pci_up(si_t *sih)
         sii = SI_INFO(sih);
 
         /* if not pci bus, we're done */
-        if (BUSTYPE(sih->bustype) != PCI_BUS)
+        if (sih->bustype != PCI_BUS)
                 return;
 
         if (PCI_FORCEHT(sii))
@@ -1646,7 +1644,7 @@ void si_pci_down(si_t *sih)
         sii = SI_INFO(sih);
 
         /* if not pci bus, we're done */
-        if (BUSTYPE(sih->bustype) != PCI_BUS)
+        if (sih->bustype != PCI_BUS)
                 return;
 
         /* release FORCEHT since chip is going to "down" state */
@@ -1669,7 +1667,7 @@ void si_pci_setup(si_t *sih, uint coremask)
 
         sii = SI_INFO(sih);
 
-        if (BUSTYPE(sii->pub.bustype) != PCI_BUS)
+        if (sii->pub.bustype != PCI_BUS)
                 return;
 
         ASSERT(PCI(sii) || PCIE(sii));
@@ -1692,9 +1690,9 @@ void si_pci_setup(si_t *sih, uint coremask)
          */
         if (PCIE(sii) || (PCI(sii) && ((sii->pub.buscorerev) >= 6))) {
                 /* pci config write to set this core bit in PCIIntMask */
-                w = OSL_PCI_READ_CONFIG(sii->osh, PCI_INT_MASK, sizeof(u32));
+                pci_read_config_dword(sii->osh->pdev, PCI_INT_MASK, &w);
                 w |= (coremask << PCI_SBIM_SHIFT);
-                OSL_PCI_WRITE_CONFIG(sii->osh, PCI_INT_MASK, sizeof(u32), w);
+                pci_write_config_dword(sii->osh->pdev, PCI_INT_MASK, w);
         } else {
                 /* set sbintvec bit for our flag number */
                 si_setint(sih, siflag);
@@ -1731,7 +1729,7 @@ int si_pci_fixcfg(si_t *sih)
 
         si_info_t *sii = SI_INFO(sih);
 
-        ASSERT(BUSTYPE(sii->pub.bustype) == PCI_BUS);
+        ASSERT(sii->pub.bustype == PCI_BUS);
 
         /* Fixup PI in SROM shadow area to enable the correct PCI core access */
         /* save the current index */
@@ -1777,7 +1775,7 @@ u32 si_gpiocontrol(si_t *sih, u32 mask, u32 val, u8 priority)
          * ignore reservation if it's high priority (e.g., test apps)
          */
         if ((priority != GPIO_HI_PRIORITY) &&
-            (BUSTYPE(sih->bustype) == SI_BUS) && (val || mask)) {
+            (sih->bustype == SI_BUS) && (val || mask)) {
                 mask = priority ? (si_gpioreservation & mask) :
                     ((si_gpioreservation | mask) & ~(si_gpioreservation));
                 val &= mask;
@@ -1929,10 +1927,10 @@ bool si_deviceremoved(si_t *sih)
 
         sii = SI_INFO(sih);
 
-        switch (BUSTYPE(sih->bustype)) {
+        switch (sih->bustype) {
         case PCI_BUS:
                 ASSERT(sii->osh != NULL);
-                w = OSL_PCI_READ_CONFIG(sii->osh, PCI_CFG_VID, sizeof(u32));
+                pci_read_config_dword(sii->osh->pdev, PCI_CFG_VID, &w);
                 if ((w & 0xFFFF) != VENDOR_BROADCOM)
                         return true;
                 break;
@@ -1959,7 +1957,7 @@ bool si_is_sprom_available(si_t *sih)
                 return sromctrl & SRC_PRESENT;
         }
 
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 return (sih->chipst & CST4329_SPROM_SEL) != 0;
         case BCM4319_CHIP_ID:
@@ -1979,7 +1977,7 @@ bool si_is_sprom_available(si_t *sih)
 
 bool si_is_otp_disabled(si_t *sih)
 {
-        switch (CHIPID(sih->chip)) {
+        switch (sih->chip) {
         case BCM4329_CHIP_ID:
                 return (sih->chipst & CST4329_SPROM_OTP_SEL_MASK) ==
                     CST4329_OTP_PWRDN;
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 4a29ed737e3f..dca861ee0466 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -117,8 +117,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         for (driv = comedi_drivers; driv; driv = driv->next) {
                 if (!try_module_get(driv->module)) {
-                        printk
-                            (KERN_INFO "comedi: failed to increment module count, skipping\n");
+                        printk(KERN_INFO "comedi: failed to increment module count, skipping\n");
                         continue;
                 }
                 if (driv->num_names) {
@@ -205,9 +204,8 @@ int comedi_driver_unregister(struct comedi_driver *driver)
                 mutex_lock(&dev->mutex);
                 if (dev->attached && dev->driver == driver) {
                         if (dev->use_count)
-                                printk
-                                    (KERN_WARNING "BUG! detaching device with use_count=%d\n",
-                                     dev->use_count);
+                                printk(KERN_WARNING "BUG! detaching device with use_count=%d\n",
+                                                dev->use_count);
                         comedi_device_detach(dev);
                 }
                 mutex_unlock(&dev->mutex);
@@ -442,7 +440,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                 unsigned i;
                 for (i = 0; i < async->n_buf_pages; ++i) {
                         if (async->buf_page_list[i].virt_addr) {
-                                clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
+                                clear_bit(PG_reserved,
+                                        &(virt_to_page(async->buf_page_list[i].
+                                                        virt_addr)->flags));
                                 if (s->async_dma_dir != DMA_NONE) {
                                         dma_free_coherent(dev->hw_dev,
                                                           PAGE_SIZE,
@@ -470,10 +470,8 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                 struct page **pages = NULL;
 
                 async->buf_page_list =
-                    vmalloc(sizeof(struct comedi_buf_page) * n_pages);
+                    vzalloc(sizeof(struct comedi_buf_page) * n_pages);
                 if (async->buf_page_list) {
-                        memset(async->buf_page_list, 0,
-                               sizeof(struct comedi_buf_page) * n_pages);
                         pages = vmalloc(sizeof(struct page *) * n_pages);
                 }
                 if (pages) {
@@ -496,8 +494,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                                         break;
 
                                 set_bit(PG_reserved,
-                                        &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
-                                pages[i] = virt_to_page(async->buf_page_list[i].virt_addr);
+                                        &(virt_to_page(async->buf_page_list[i].
+                                                        virt_addr)->flags));
+                                pages[i] = virt_to_page(async->buf_page_list[i].
+                                                                virt_addr);
                         }
                 }
                 if (i == n_pages) {
@@ -514,7 +514,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                                             NULL) {
                                                 break;
                                         }
-                                        clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
+                                        clear_bit(PG_reserved,
+                                                &(virt_to_page(async->
+                                                        buf_page_list[i].
+                                                        virt_addr)->flags));
                                         if (s->async_dma_dir != DMA_NONE) {
                                                 dma_free_coherent(dev->hw_dev,
                                                                   PAGE_SIZE,
@@ -646,8 +649,7 @@ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes)
 {
         if ((int)(async->buf_write_count + nbytes -
                   async->buf_write_alloc_count) > 0) {
-                printk
-                    (KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
+                printk(KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
                 nbytes = async->buf_write_alloc_count - async->buf_write_count;
         }
         async->buf_write_count += nbytes;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 7361d508bf37..0e6affd95962 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -1008,7 +1008,7 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
         b_ExternGate = (unsigned char) data[3];
         b_CycleMode = (unsigned char) data[4];
         b_InterruptEnable = (unsigned char) data[5];
-        i_ReturnValue = insn->n;;
+        i_ReturnValue = insn->n;
         devpriv->tsk_Current = current; /*  Save the current process task structure */
         /**************************/
         /* Test the module number */
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 93d7c056741d..76f2483871a7 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -2710,10 +2710,10 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
                         } else {
                                 outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
                         }
-                        /*  Enable the interrupt for the controler */
+                        /*  Enable the interrupt for the controller */
                         dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
                         outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
-                        printk("\nEnable the interrupt for the controler");
+                        printk("\nEnable the interrupt for the controller");
                 }
                 printk("\nRead Eeprom");
                 i_EepromReadMainHeader(io_addr[0], this_board->pc_EepromChip,
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index 912bc0fc54bf..a76ed2553fb4 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -225,7 +225,7 @@ int i_APCI1710_Reset(struct comedi_device *dev)
 
         devpriv->s_BoardInfos.b_BoardVersion = 1;
 
-        /*  Enable the interrupt for the controler */
+        /*  Enable the interrupt for the controller */
         dw_Dummy = inl(devpriv->s_BoardInfos.ui_Address + 0x38);
         outl(dw_Dummy | 0x2000, devpriv->s_BoardInfos.ui_Address + 0x38);
 
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 2a8a6c730920..62f421a06f05 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -2850,7 +2850,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
         i_Logic = 0;
         i_CounterLogic = 0;
         i_InterruptMask = 0;
-        i_InputChannel = 0;;
+        i_InputChannel = 0;
         i_TimerCounter1Enabled = 0;
         i_TimerCounter2Enabled = 0;
         i_WatchdogCounter3Enabled = 0;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index 12fcc35ecc52..8a584a014b0b 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -335,7 +335,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
                         return -EINVAL;
                 }               /* if else data[3]==1) */
         }                       /* if else data[3]==0) */
-        return (insn->n);;
+        return (insn->n);
 }
 
 /*
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index b943a06e70dc..a93e2349ad3a 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -3011,7 +3011,7 @@ int i_APCI3200_Reset(struct comedi_device *dev)
 
         outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
 
-        /*  Enable the interrupt for the controler */
+        /*  Enable the interrupt for the controller */
         dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
         outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
         outl(0, devpriv->i_IobaseAddon);        /* Resets the output */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index 356a1891e2e7..acaceb01629a 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -339,7 +339,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
         struct comedi_insn *insn, unsigned int *data)
 {
-        unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;;
+        unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;
 
         ul_Channel_no = CR_CHAN(insn->chanspec);
 
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 5d064577b2f1..7edeb1103dc8 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -971,7 +971,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (thisboard->ao_chans > 0) {
                 s->type = COMEDI_SUBD_AO;
                 s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
-                s->n_chan = thisboard->ao_chans;;
+                s->n_chan = thisboard->ao_chans;
                 s->maxdata = (1 << thisboard->ao_bits) - 1;
                 s->range_table = &pci230_ao_range;
                 s->insn_write = &pci230_ao_winsn;
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 0345b4caba73..bb93685d8b93 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -169,7 +169,7 @@ static int das16cs_attach(struct comedi_device *dev,
         if (!link)
                 return -EIO;
 
-        dev->iobase = link->resource[0]->start;;
+        dev->iobase = link->resource[0]->start;
         printk("I/O base=0x%04lx ", dev->iobase);
 
         printk("fingerprint:\n");
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index cfcbd9b8f393..d8aefb23d6b9 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -370,7 +370,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)
         struct comedi_device *devs_opened[COMEDI_NUM_BOARD_MINORS];
 
         memset(devs_opened, 0, sizeof(devs_opened));
-        devpriv->name[0] = 0;;
+        devpriv->name[0] = 0;
         /* Loop through all comedi devices specified on the command-line,
            building our device list */
         for (i = 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) {
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c
index 39a6a850d63c..e4711ef54719 100644
--- a/drivers/staging/comedi/drivers/ii_pci20kc.c
+++ b/drivers/staging/comedi/drivers/ii_pci20kc.c
@@ -19,7 +19,7 @@
  *                              - 16 bit
  *
  *      only ONE PCI-20341 module possible
- *      only ONE PCI-20006 module possible
+ *      only ONE PCI-20006 module possible
  *      no extern trigger implemented
  *
  *      NOT WORKING (but soon) only 4 on-board differential channels supported
@@ -83,11 +83,11 @@ options for PCI-20341M:
 #include "../comedidev.h"
 
 #define PCI20000_ID                     0x1d
-#define PCI20341_ID                     0x77
-#define PCI20006_ID                     0xe3
+#define PCI20341_ID                     0x77
+#define PCI20006_ID                     0xe3
 #define PCI20xxx_EMPTY_ID               0xff
 
-#define PCI20000_OFFSET                 0x100
+#define PCI20000_OFFSET                 0x100
 #define PCI20000_MODULES                3
 
 #define PCI20000_DIO_0                  0x80
@@ -246,7 +246,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
                         pci20006_init(dev, s, it->options[2 * i + 2],
                                       it->options[2 * i + 3]);
                         printk(KERN_INFO "comedi%d: "
-                               "ii_pci20kc PCI-20006 module in slot %d \n",
+                               "ii_pci20kc PCI-20006 module in slot %d\n",
                                dev->minor, i + 1);
                         break;
                 case PCI20341_ID:
@@ -255,7 +255,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
                         pci20341_init(dev, s, it->options[2 * i + 2],
                                       it->options[2 * i + 3]);
                         printk(KERN_INFO "comedi%d: "
-                               "ii_pci20kc PCI-20341 module in slot %d \n",
+                               "ii_pci20kc PCI-20341 module in slot %d\n",
                                dev->minor, i + 1);
                         break;
                 default:
@@ -376,9 +376,20 @@ static int pci20341_insn_read(struct comedi_device *dev,
 static const int pci20341_timebase[] = { 0x00, 0x00, 0x00, 0x04 };
 static const int pci20341_settling_time[] = { 0x58, 0x58, 0x93, 0x99 };
 
-static const struct comedi_lrange range_bipolar0_5 = { 1, {BIP_RANGE(0.5)} };
-static const struct comedi_lrange range_bipolar0_05 = { 1, {BIP_RANGE(0.05)} };
-static const struct comedi_lrange range_bipolar0_025 = { 1, {BIP_RANGE(0.025)} };
+static const struct comedi_lrange range_bipolar0_5 = {
+        1,
+        {BIP_RANGE(0.5)}
+};
+
+static const struct comedi_lrange range_bipolar0_05 = {
+        1,
+        {BIP_RANGE(0.05)}
+};
+
+static const struct comedi_lrange range_bipolar0_025 = {
+        1,
+        {BIP_RANGE(0.025)}
+};
 
 static const struct comedi_lrange *const pci20341_ranges[] = {
         &range_bipolar5,
@@ -408,12 +419,18 @@ static int pci20341_init(struct comedi_device *dev, struct comedi_subdevice *s,
         s->maxdata = 0xffff;
         s->range_table = pci20341_ranges[opt0];
 
-        option = sdp->pci20341.timebase | PCI20341_REPMODE;     /* depends on gain, trigger, repetition mode */
-
-        writeb(PCI20341_INIT, sdp->iobase + PCI20341_CONFIG_REG);       /* initialize Module */
-        writeb(PCI20341_PACER, sdp->iobase + PCI20341_MOD_STATUS);      /* set Pacer */
-        writeb(option, sdp->iobase + PCI20341_OPT_REG); /* option register */
-        writeb(sdp->pci20341.settling_time, sdp->iobase + PCI20341_SET_TIME_REG);       /* settling time counter */
+        /* depends on gain, trigger, repetition mode */
+        option = sdp->pci20341.timebase | PCI20341_REPMODE;
+
+        /* initialize Module */
+        writeb(PCI20341_INIT, sdp->iobase + PCI20341_CONFIG_REG);
+        /* set Pacer */
+        writeb(PCI20341_PACER, sdp->iobase + PCI20341_MOD_STATUS);
+        /* option register */
+        writeb(option, sdp->iobase + PCI20341_OPT_REG);
+        /* settling time counter */
+        writeb(sdp->pci20341.settling_time,
+                sdp->iobase + PCI20341_SET_TIME_REG);
         /* trigger not implemented */
         return 0;
 }
@@ -429,11 +446,15 @@ static int pci20341_insn_read(struct comedi_device *dev,
         unsigned int clb;       /* channel list byte */
         unsigned int boarddata;
 
-        writeb(1, sdp->iobase + PCI20341_LCHAN_ADDR_REG);       /* write number of input channels */
+        /* write number of input channels */
+        writeb(1, sdp->iobase + PCI20341_LCHAN_ADDR_REG);
         clb = PCI20341_DAISY_CHAIN | PCI20341_MUX | (sdp->pci20341.ai_gain << 3)
             | CR_CHAN(insn->chanspec);
         writeb(clb, sdp->iobase + PCI20341_CHAN_LIST);
-        writeb(0x00, sdp->iobase + PCI20341_CC_RESET);  /* reset settling time counter and trigger delay counter */
+
+        /* reset settling time counter and trigger delay counter */
+        writeb(0x00, sdp->iobase + PCI20341_CC_RESET);
+
         writeb(0x00, sdp->iobase + PCI20341_CHAN_RESET);
 
         /* generate Pacer */
@@ -444,9 +465,12 @@ static int pci20341_insn_read(struct comedi_device *dev,
                  * the whole interrupt stuff
                  */
                 j = 0;
-                readb(sdp->iobase + PCI20341_SOFT_PACER);       /* generate Pacer */
+                /* generate Pacer */
+                readb(sdp->iobase + PCI20341_SOFT_PACER);
+
                 eoc = readb(sdp->iobase + PCI20341_STATUS_REG);
-                while ((eoc < 0x80) && j < 100) {       /* poll Interrupt Flag */
+                /* poll Interrupt Flag */
+                while ((eoc < 0x80) && j < 100) {
                         j++;
                         eoc = readb(sdp->iobase + PCI20341_STATUS_REG);
                 }
@@ -460,7 +484,9 @@ static int pci20341_insn_read(struct comedi_device *dev,
                 lo = readb(sdp->iobase + PCI20341_LDATA);
                 hi = readb(sdp->iobase + PCI20341_LDATA + 1);
                 boarddata = lo + 0x100 * hi;
-                data[i] = (short)((boarddata + 0x8000) & 0xffff);       /* board-data -> comedi-data */
+
+                /* board-data -> comedi-data */
+                data[i] = (short)((boarddata + 0x8000) & 0xffff);
         }
 
         return i;
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 8b383ee959b2..5c6c72744167 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -54,6 +54,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci)
 
 #define PCI_VENDOR_ID_JR3 0x1762
 #define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111
+#define PCI_DEVICE_ID_JR3_1_CHANNEL_NEW 0x1111
 #define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112
 #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113
 #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114
@@ -73,6 +74,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
         {
         PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL,
                     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
+        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW,
+                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
         PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL,
                     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
         PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,
@@ -807,6 +810,10 @@ static int jr3_pci_attach(struct comedi_device *dev,
                                         devpriv->n_channels = 1;
                                 }
                                 break;
+                        case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW:{
+                                        devpriv->n_channels = 1;
+                                }
+                                break;
                         case PCI_DEVICE_ID_JR3_2_CHANNEL:{
                                         devpriv->n_channels = 2;
                                 }
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index b0d44b547a69..a9611587460a 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -62,11 +62,10 @@ static void ni_tio_configure_dma(struct ni_gpct *counter, short enable,
         unsigned input_select_bits = 0;
 
         if (enable) {
-                if (read_not_write) {
+                if (read_not_write)
                         input_select_bits |= Gi_Read_Acknowledges_Irq;
-                } else {
+                else
                         input_select_bits |= Gi_Write_Acknowledges_Irq;
-                }
         }
         ni_tio_set_bits(counter,
                         NITIO_Gi_Input_Select_Reg(counter->counter_index),
@@ -84,9 +83,8 @@ static void ni_tio_configure_dma(struct ni_gpct *counter, short enable,
                                 gi_dma_config_bits |= Gi_DMA_Enable_Bit;
                                 gi_dma_config_bits |= Gi_DMA_Int_Bit;
                         }
-                        if (read_not_write == 0) {
+                        if (read_not_write == 0)
                                 gi_dma_config_bits |= Gi_DMA_Write_Bit;
-                        }
                         ni_tio_set_bits(counter,
                                         NITIO_Gi_DMA_Config_Reg(counter->
                                                                 counter_index),
@@ -174,7 +172,7 @@ static int ni_tio_input_cmd(struct ni_gpct *counter, struct comedi_async *async)
 static int ni_tio_output_cmd(struct ni_gpct *counter,
                              struct comedi_async *async)
 {
-        printk("ni_tio: output commands not yet implemented.\n");
+        printk(KERN_ERR "ni_tio: output commands not yet implemented.\n");
         return -ENOTSUPP;
 
         counter->mite_chan->dir = COMEDI_OUTPUT;
@@ -198,9 +196,8 @@ static int ni_tio_cmd_setup(struct ni_gpct *counter, struct comedi_async *async)
                 set_gate_source = 1;
                 gate_source = cmd->convert_arg;
         }
-        if (set_gate_source) {
+        if (set_gate_source)
                 retval = ni_tio_set_gate_src(counter, 0, gate_source);
-        }
         if (cmd->flags & TRIG_WAKE_EOS) {
                 ni_tio_set_bits(counter,
                                 NITIO_Gi_Interrupt_Enable_Reg(counter->
@@ -221,22 +218,21 @@ int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)
 
         spin_lock_irqsave(&counter->lock, flags);
         if (counter->mite_chan == NULL) {
-                printk
-                    ("ni_tio: commands only supported with DMA.  Interrupt-driven commands not yet implemented.\n");
+                printk(KERN_ERR "ni_tio: commands only supported with DMA.  Interrupt-driven commands not yet implemented.\n");
                 retval = -EIO;
         } else {
                 retval = ni_tio_cmd_setup(counter, async);
                 if (retval == 0) {
-                        if (cmd->flags & CMDF_WRITE) {
+                        if (cmd->flags & CMDF_WRITE)
                                 retval = ni_tio_output_cmd(counter, async);
-                        } else {
+                        else
                                 retval = ni_tio_input_cmd(counter, async);
-                        }
                 }
         }
         spin_unlock_irqrestore(&counter->lock, flags);
         return retval;
 }
+EXPORT_SYMBOL_GPL(ni_tio_cmd);
 
 int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
 {
@@ -342,6 +338,7 @@ int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(ni_tio_cmdtest);
 
 int ni_tio_cancel(struct ni_gpct *counter)
 {
@@ -349,9 +346,8 @@ int ni_tio_cancel(struct ni_gpct *counter)
 
         ni_tio_arm(counter, 0, 0);
         spin_lock_irqsave(&counter->lock, flags);
-        if (counter->mite_chan) {
+        if (counter->mite_chan)
                 mite_dma_disarm(counter->mite_chan);
-        }
         spin_unlock_irqrestore(&counter->lock, flags);
         ni_tio_configure_dma(counter, 0, 0);
 
@@ -361,10 +357,11 @@ int ni_tio_cancel(struct ni_gpct *counter)
                         0x0);
         return 0;
 }
+EXPORT_SYMBOL_GPL(ni_tio_cancel);
 
-        /* During buffered input counter operation for e-series, the gate interrupt is acked
-           automatically by the dma controller, due to the Gi_Read/Write_Acknowledges_IRQ bits
-           in the input select register.  */
+        /* During buffered input counter operation for e-series, the gate
+           interrupt is acked automatically by the dma controller, due to the
+           Gi_Read/Write_Acknowledges_IRQ bits in the input select register.  */
 static int should_ack_gate(struct ni_gpct *counter)
 {
         unsigned long flags;
@@ -372,7 +369,10 @@ static int should_ack_gate(struct ni_gpct *counter)
 
         switch (counter->counter_dev->variant) {
         case ni_gpct_variant_m_series:
-        case ni_gpct_variant_660x:      /*  not sure if 660x really supports gate interrupts (the bits are not listed in register-level manual) */
+        /*  not sure if 660x really supports gate
+            interrupts (the bits are not listed
+            in register-level manual) */
+        case ni_gpct_variant_660x:
                 return 1;
                 break;
         case ni_gpct_variant_e_series:
@@ -416,7 +416,8 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
         if (gxx_status & Gi_Gate_Error_Bit(counter->counter_index)) {
                 ack |= Gi_Gate_Error_Confirm_Bit(counter->counter_index);
                 if (gate_error) {
-                        /*660x don't support automatic acknowledgement of gate interrupt via dma read/write
+                        /*660x don't support automatic acknowledgement
+                          of gate interrupt via dma read/write
                            and report bogus gate errors */
                         if (counter->counter_dev->variant !=
                             ni_gpct_variant_660x) {
@@ -429,9 +430,8 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
                 if (tc_error)
                         *tc_error = 1;
         }
-        if (gi_status & Gi_TC_Bit) {
+        if (gi_status & Gi_TC_Bit)
                 ack |= Gi_TC_Interrupt_Ack_Bit;
-        }
         if (gi_status & Gi_Gate_Interrupt_Bit) {
                 if (should_ack_gate(counter))
                         ack |= Gi_Gate_Interrupt_Ack_Bit;
@@ -452,13 +452,14 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
                                   NITIO_Gxx_Joint_Status2_Reg
                                   (counter->counter_index)) &
                     Gi_Permanent_Stale_Bit(counter->counter_index)) {
-                        printk("%s: Gi_Permanent_Stale_Data detected.\n",
-                               __FUNCTION__);
+                        printk(KERN_INFO "%s: Gi_Permanent_Stale_Data detected.\n",
+                               __func__);
                         if (perm_stale_data)
                                 *perm_stale_data = 1;
                 }
         }
 }
+EXPORT_SYMBOL_GPL(ni_tio_acknowledge_and_confirm);
 
 void ni_tio_handle_interrupt(struct ni_gpct *counter,
                              struct comedi_subdevice *s)
@@ -472,20 +473,19 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
         ni_tio_acknowledge_and_confirm(counter, &gate_error, &tc_error,
                                        &perm_stale_data, NULL);
         if (gate_error) {
-                printk("%s: Gi_Gate_Error detected.\n", __FUNCTION__);
+                printk(KERN_NOTICE "%s: Gi_Gate_Error detected.\n", __func__);
                 s->async->events |= COMEDI_CB_OVERFLOW;
         }
-        if (perm_stale_data) {
+        if (perm_stale_data)
                 s->async->events |= COMEDI_CB_ERROR;
-        }
         switch (counter->counter_dev->variant) {
         case ni_gpct_variant_m_series:
         case ni_gpct_variant_660x:
                 if (read_register(counter,
-                                  NITIO_Gi_DMA_Status_Reg
-                                  (counter->counter_index)) & Gi_DRQ_Error_Bit)
-                {
-                        printk("%s: Gi_DRQ_Error detected.\n", __FUNCTION__);
+                                NITIO_Gi_DMA_Status_Reg
+                                (counter->counter_index)) & Gi_DRQ_Error_Bit) {
+                        printk(KERN_NOTICE "%s: Gi_DRQ_Error detected.\n",
+                                                        __func__);
                         s->async->events |= COMEDI_CB_OVERFLOW;
                 }
                 break;
@@ -506,6 +506,7 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
         mite_sync_input_dma(counter->mite_chan, s->async);
         spin_unlock_irqrestore(&counter->lock, flags);
 }
+EXPORT_SYMBOL_GPL(ni_tio_handle_interrupt);
 
 void ni_tio_set_mite_channel(struct ni_gpct *counter,
                              struct mite_channel *mite_chan)
@@ -516,6 +517,7 @@ void ni_tio_set_mite_channel(struct ni_gpct *counter,
         counter->mite_chan = mite_chan;
         spin_unlock_irqrestore(&counter->lock, flags);
 }
+EXPORT_SYMBOL_GPL(ni_tio_set_mite_channel);
 
 static int __init ni_tiocmd_init_module(void)
 {
@@ -529,10 +531,3 @@ static void __exit ni_tiocmd_cleanup_module(void)
 }
 
 module_exit(ni_tiocmd_cleanup_module);
-
-EXPORT_SYMBOL_GPL(ni_tio_cmd);
-EXPORT_SYMBOL_GPL(ni_tio_cmdtest);
-EXPORT_SYMBOL_GPL(ni_tio_cancel);
-EXPORT_SYMBOL_GPL(ni_tio_handle_interrupt);
-EXPORT_SYMBOL_GPL(ni_tio_set_mite_channel);
-EXPORT_SYMBOL_GPL(ni_tio_acknowledge_and_confirm);
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 60ebfc3c75fd..aa8aeeee043f 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -753,7 +753,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         struct comedi_subdevice *s;
         struct pci_dev *pcidev;
         int ret;
-        resource_size_t physLas0;       /* configuation */
+        resource_size_t physLas0;       /* configuration */
         resource_size_t physLas1;       /* data area */
         resource_size_t physLcfg;       /* PLX9080 */
 #ifdef USE_DMA
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index 3607aaee4af6..2b34daedc3d7 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -114,7 +114,7 @@ static const int s526_ports[] = {
 };
 
 struct counter_mode_register_t {
-#if defined (__LITTLE_ENDIAN_BITFIELD)
+#if defined(__LITTLE_ENDIAN_BITFIELD)
         unsigned short coutSource:1;
         unsigned short coutPolarity:1;
         unsigned short autoLoadResetRcap:3;
@@ -207,7 +207,9 @@ static const struct s526_board s526_boards[] = {
 
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,
-   feel free to suggest moving the variable to the struct comedi_device struct.  */
+   feel free to suggest moving the variable to the struct comedi_device
+   struct.
+*/
 struct s526_private {
 
         int data;
@@ -304,7 +306,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 /* int subdev_channel = 0; */
         union cmReg cmReg;
 
-        printk("comedi%d: s526: ", dev->minor);
+        printk(KERN_INFO "comedi%d: s526: ", dev->minor);
 
         iobase = it->options[0];
         if (!iobase || !request_region(iobase, S526_IOSIZE, thisboard->name)) {
@@ -317,7 +319,8 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         /*** make it a little quieter, exw, 8/29/06
         for (i = 0; i < S526_NUM_PORTS; i++) {
-                printk("0x%02x: 0x%04x\n", ADDR_REG(s526_ports[i]), inw(ADDR_REG(s526_ports[i])));
+                printk("0x%02x: 0x%04x\n", ADDR_REG(s526_ports[i]),
+                                inw(ADDR_REG(s526_ports[i])));
         }
         ***/
 
@@ -402,7 +405,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 s->type = COMEDI_SUBD_UNUSED;
         }
 
-        printk("attached\n");
+        printk(KERN_INFO "attached\n");
 
         return 1;
 
@@ -411,7 +414,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         /* One-shot (software trigger) */
         cmReg.reg.coutSource = 0;       /*  out RCAP */
         cmReg.reg.coutPolarity = 1;     /*  Polarity inverted */
-        cmReg.reg.autoLoadResetRcap = 1;        /*  Auto load 0:disabled, 1:enabled */
+        cmReg.reg.autoLoadResetRcap = 1;/*  Auto load 0:disabled, 1:enabled */
         cmReg.reg.hwCtEnableSource = 3; /*  NOT RCAP */
         cmReg.reg.ctEnableCtrl = 2;     /*  Hardware */
         cmReg.reg.clockSource = 2;      /*  Internal */
@@ -426,10 +429,12 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         outw(0x0001, ADDR_CHAN_REG(REG_C0H, subdev_channel));
         outw(0x3C68, ADDR_CHAN_REG(REG_C0L, subdev_channel));
 
-        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset the counter */
-        outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Load the counter from PR0 */
-
-        outw(0x0008, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset RCAP (fires one-shot) */
+        /*  Reset the counter */
+        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+        /*  Load the counter from PR0 */
+        outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+        /*  Reset RCAP (fires one-shot) */
+        outw(0x0008, ADDR_CHAN_REG(REG_C0C, subdev_channel));
 
 #else
 
@@ -447,11 +452,12 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         cmReg.reg.reserved = 0;
 
         n = 0;
-        printk("Mode reg=0x%04x, 0x%04lx\n", cmReg.value, ADDR_CHAN_REG(REG_C0M,
-                                                                        n));
+        printk(KERN_INFO "Mode reg=0x%04x, 0x%04lx\n",
+                cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
         outw(cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
         udelay(1000);
-        printk("Read back mode reg=0x%04x\n", inw(ADDR_CHAN_REG(REG_C0M, n)));
+        printk(KERN_INFO "Read back mode reg=0x%04x\n",
+                inw(ADDR_CHAN_REG(REG_C0M, n)));
 
         /*  Load the pre-load register high word */
 /* value = (short) (0x55); */
@@ -466,20 +472,23 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         /*  Reset the counter if it is software preload */
         if (cmReg.reg.autoLoadResetRcap == 0) {
-                outw(0x8000, ADDR_CHAN_REG(REG_C0C, n));        /*  Reset the counter */
-                outw(0x4000, ADDR_CHAN_REG(REG_C0C, n));        /*  Load the counter from PR0 */
+                /*  Reset the counter */
+                outw(0x8000, ADDR_CHAN_REG(REG_C0C, n));
+                /*  Load the counter from PR0 */
+                outw(0x4000, ADDR_CHAN_REG(REG_C0C, n));
         }
 
         outw(cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
         udelay(1000);
-        printk("Read back mode reg=0x%04x\n", inw(ADDR_CHAN_REG(REG_C0M, n)));
+        printk(KERN_INFO "Read back mode reg=0x%04x\n",
+                        inw(ADDR_CHAN_REG(REG_C0M, n)));
 
 #endif
-        printk("Current registres:\n");
+        printk(KERN_INFO "Current registres:\n");
 
         for (i = 0; i < S526_NUM_PORTS; i++) {
-                printk("0x%02lx: 0x%04x\n", ADDR_REG(s526_ports[i]),
-                       inw(ADDR_REG(s526_ports[i])));
+                printk(KERN_INFO "0x%02lx: 0x%04x\n",
+                        ADDR_REG(s526_ports[i]), inw(ADDR_REG(s526_ports[i])));
         }
         return 1;
 }
@@ -494,7 +503,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  */
 static int s526_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: s526: remove\n", dev->minor);
+        printk(KERN_INFO "comedi%d: s526: remove\n", dev->minor);
 
         if (dev->iobase > 0)
                 release_region(dev->iobase, S526_IOSIZE);
@@ -513,7 +522,7 @@ static int s526_gpct_rinsn(struct comedi_device *dev,
 
         /*  Check if (n > 0) */
         if (insn->n <= 0) {
-                printk("s526: INSN_READ: n should be > 0\n");
+                printk(KERN_ERR "s526: INSN_READ: n should be > 0\n");
                 return -EINVAL;
         }
         /*  Read the low word first */
@@ -522,7 +531,8 @@ static int s526_gpct_rinsn(struct comedi_device *dev,
                 datahigh = inw(ADDR_CHAN_REG(REG_C0H, counter_channel));
                 data[i] = (int)(datahigh & 0x00FF);
                 data[i] = (data[i] << 16) | (datalow & 0xFFFF);
-/* printk("s526 GPCT[%d]: %x(0x%04x, 0x%04x)\n", counter_channel, data[i], datahigh, datalow); */
+                /* printk("s526 GPCT[%d]: %x(0x%04x, 0x%04x)\n",
+                   counter_channel, data[i], datahigh, datalow); */
         }
         return i;
 }
@@ -536,7 +546,8 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
         short value;
         union cmReg cmReg;
 
-/* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel); */
+        /* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n",
+                                                subdev_channel); */
 
         for (i = 0; i < MAX_GPCT_CONFIG_DATA; i++) {
                 devpriv->s526_gpct_config[subdev_channel].data[i] =
@@ -554,7 +565,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                    data[2]: Pre-load Register Value
                    data[3]: Conter Control Register
                  */
-                printk("s526: GPCT_INSN_CONFIG: Configuring Encoder\n");
+                printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring Encoder\n");
                 devpriv->s526_gpct_config[subdev_channel].app =
                     PositionMeasurement;
 
@@ -563,7 +574,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                 /* One-shot (software trigger) */
                 cmReg.reg.coutSource = 0;       /*  out RCAP */
                 cmReg.reg.coutPolarity = 1;     /*  Polarity inverted */
-                cmReg.reg.autoLoadResetRcap = 0;        /*  Auto load disabled */
+                cmReg.reg.autoLoadResetRcap = 0;/*  Auto load disabled */
                 cmReg.reg.hwCtEnableSource = 3; /*  NOT RCAP */
                 cmReg.reg.ctEnableCtrl = 2;     /*  Hardware */
                 cmReg.reg.clockSource = 2;      /*  Internal */
@@ -578,10 +589,13 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                 outw(0x0001, ADDR_CHAN_REG(REG_C0H, subdev_channel));
                 outw(0x3C68, ADDR_CHAN_REG(REG_C0L, subdev_channel));
 
-                outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset the counter */
-                outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Load the counter from PR0 */
+                /*  Reset the counter */
+                outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+                /*  Load the counter from PR0 */
+                outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
 
-                outw(0x0008, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset RCAP (fires one-shot) */
+                /*  Reset RCAP (fires one-shot) */
+                outw(0x0008, ADDR_CHAN_REG(REG_C0C, subdev_channel));
 
 #endif
 
@@ -594,30 +608,34 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
 
                 /*  Reset the counter if it is software preload */
                 if (cmReg.reg.autoLoadResetRcap == 0) {
-                        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset the counter */
-/* outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));    Load the counter from PR0 */
+                        /*  Reset the counter */
+                        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+                        /* Load the counter from PR0
+                         * outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+                         */
                 }
 #else
-                cmReg.reg.countDirCtrl = 0;     /*  0 quadrature, 1 software control */
+                /*  0 quadrature, 1 software control */
+                cmReg.reg.countDirCtrl = 0;
 
                 /*  data[1] contains GPCT_X1, GPCT_X2 or GPCT_X4 */
-                if (insn->data[1] == GPCT_X2) {
+                if (insn->data[1] == GPCT_X2)
                         cmReg.reg.clockSource = 1;
-                } else if (insn->data[1] == GPCT_X4) {
+                else if (insn->data[1] == GPCT_X4)
                         cmReg.reg.clockSource = 2;
-                } else {
+                else
                         cmReg.reg.clockSource = 0;
-                }
 
                 /*  When to take into account the indexpulse: */
-                if (insn->data[2] == GPCT_IndexPhaseLowLow) {
+                /*if (insn->data[2] == GPCT_IndexPhaseLowLow) {
                 } else if (insn->data[2] == GPCT_IndexPhaseLowHigh) {
                 } else if (insn->data[2] == GPCT_IndexPhaseHighLow) {
                 } else if (insn->data[2] == GPCT_IndexPhaseHighHigh) {
-                }
+                }*/
                 /*  Take into account the index pulse? */
                 if (insn->data[3] == GPCT_RESET_COUNTER_ON_INDEX)
-                        cmReg.reg.autoLoadResetRcap = 4;        /*  Auto load with INDEX^ */
+                        /*  Auto load with INDEX^ */
+                        cmReg.reg.autoLoadResetRcap = 4;
 
                 /*  Set Counter Mode Register */
                 cmReg.value = (short)(insn->data[1] & 0xFFFF);
@@ -638,8 +656,10 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                 }
                 /*  Reset the counter if it is software preload */
                 if (cmReg.reg.autoLoadResetRcap == 0) {
-                        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Reset the counter */
-                        outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));   /*  Load the counter from PR0 */
+                        /*  Reset the counter */
+                        outw(0x8000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
+                        /*  Load the counter from PR0 */
+                        outw(0x4000, ADDR_CHAN_REG(REG_C0C, subdev_channel));
                 }
 #endif
                 break;
@@ -652,7 +672,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                    data[3]: Pre-load Register 1 Value
                    data[4]: Conter Control Register
                  */
-                printk("s526: GPCT_INSN_CONFIG: Configuring SPG\n");
+                printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring SPG\n");
                 devpriv->s526_gpct_config[subdev_channel].app =
                     SinglePulseGeneration;
 
@@ -697,7 +717,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                    data[3]: Pre-load Register 1 Value
                    data[4]: Conter Control Register
                  */
-                printk("s526: GPCT_INSN_CONFIG: Configuring PTG\n");
+                printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring PTG\n");
                 devpriv->s526_gpct_config[subdev_channel].app =
                     PulseTrainGeneration;
 
@@ -735,7 +755,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
                 break;
 
         default:
-                printk("s526: unsupported GPCT_insn_config\n");
+                printk(KERN_ERR "s526: unsupported GPCT_insn_config\n");
                 return -EINVAL;
                 break;
         }
@@ -751,20 +771,21 @@ static int s526_gpct_winsn(struct comedi_device *dev,
         short value;
         union cmReg cmReg;
 
-        printk("s526: GPCT_INSN_WRITE on channel %d\n", subdev_channel);
+        printk(KERN_INFO "s526: GPCT_INSN_WRITE on channel %d\n",
+                                        subdev_channel);
         cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));
-        printk("s526: Counter Mode Register: %x\n", cmReg.value);
+        printk(KERN_INFO "s526: Counter Mode Register: %x\n", cmReg.value);
         /*  Check what Application of Counter this channel is configured for */
         switch (devpriv->s526_gpct_config[subdev_channel].app) {
         case PositionMeasurement:
-                printk("S526: INSN_WRITE: PM\n");
+                printk(KERN_INFO "S526: INSN_WRITE: PM\n");
                 outw(0xFFFF & ((*data) >> 16), ADDR_CHAN_REG(REG_C0H,
                                                              subdev_channel));
                 outw(0xFFFF & (*data), ADDR_CHAN_REG(REG_C0L, subdev_channel));
                 break;
 
         case SinglePulseGeneration:
-                printk("S526: INSN_WRITE: SPG\n");
+                printk(KERN_INFO "S526: INSN_WRITE: SPG\n");
                 outw(0xFFFF & ((*data) >> 16), ADDR_CHAN_REG(REG_C0H,
                                                              subdev_channel));
                 outw(0xFFFF & (*data), ADDR_CHAN_REG(REG_C0L, subdev_channel));
@@ -777,14 +798,14 @@ static int s526_gpct_winsn(struct comedi_device *dev,
                    The above periods must be expressed as a multiple of the
                    pulse frequency on the selected source
                  */
-                printk("S526: INSN_WRITE: PTG\n");
+                printk(KERN_INFO "S526: INSN_WRITE: PTG\n");
                 if ((insn->data[1] > insn->data[0]) && (insn->data[0] > 0)) {
                         (devpriv->s526_gpct_config[subdev_channel]).data[0] =
                             insn->data[0];
                         (devpriv->s526_gpct_config[subdev_channel]).data[1] =
                             insn->data[1];
                 } else {
-                        printk("s526: INSN_WRITE: PTG: Problem with Pulse params -> %d %d\n",
+                        printk(KERN_ERR "s526: INSN_WRITE: PTG: Problem with Pulse params -> %d %d\n",
                                 insn->data[0], insn->data[1]);
                         return -EINVAL;
                 }
@@ -873,7 +894,7 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                 if (i == TIMEOUT) {
                         /* printk() should be used instead of printk()
                          * whenever the code can be called from real-time. */
-                        printk("s526: ADC(0x%04x) timeout\n",
+                        printk(KERN_ERR "s526: ADC(0x%04x) timeout\n",
                                inw(ADDR_REG(REG_ISR)));
                         return -ETIMEDOUT;
                 }
@@ -906,11 +927,14 @@ static int s526_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
          * very useful, but that's how the interface is defined. */
         for (i = 0; i < insn->n; i++) {
                 /* a typical programming sequence */
-/* outw(data[i], dev->iobase + REG_ADD);    write the data to preload register */
-                outw(data[i], ADDR_REG(REG_ADD));       /*  write the data to preload register */
+                /* write the data to preload register
+                 * outw(data[i], dev->iobase + REG_ADD);
+                 */
+                /* write the data to preload register */
+                outw(data[i], ADDR_REG(REG_ADD));
                 devpriv->ao_readback[chan] = data[i];
 /* outw(val + 1, dev->iobase + REG_DAC);  starts the D/A conversion. */
-                outw(val + 1, ADDR_REG(REG_DAC));       /*  starts the D/A conversion. */
+                outw(val + 1, ADDR_REG(REG_DAC)); /*starts the D/A conversion.*/
         }
 
         /* return the number of samples read/written */
@@ -954,7 +978,7 @@ static int s526_dio_insn_bits(struct comedi_device *dev,
 
         /* on return, data[1] contains the value of the digital
          * input and output lines. */
-        data[1] = inw(ADDR_REG(REG_DIO)) & 0xFF;        /*  low 8 bits are the data */
+        data[1] = inw(ADDR_REG(REG_DIO)) & 0xFF; /* low 8 bits are the data */
         /* or we could just return the software copy of the output values if
          * it was a purely digital output subdevice */
         /* data[1]=s->state & 0xFF; */
@@ -969,7 +993,7 @@ static int s526_dio_insn_config(struct comedi_device *dev,
         int chan = CR_CHAN(insn->chanspec);
         int group, mask;
 
-        printk("S526 DIO insn_config\n");
+        printk(KERN_INFO "S526 DIO insn_config\n");
 
         /* The input or output configuration of each digital line is
          * configured by a special insn_config instruction.  chanspec
@@ -980,11 +1004,12 @@ static int s526_dio_insn_config(struct comedi_device *dev,
         mask = 0xF << (group << 2);
         switch (data[0]) {
         case INSN_CONFIG_DIO_OUTPUT:
-                s->state |= 1 << (group + 10);  // bit 10/11 set the group 1/2's mode
+                /* bit 10/11 set the group 1/2's mode */
+                s->state |= 1 << (group + 10);
                 s->io_bits |= mask;
                 break;
         case INSN_CONFIG_DIO_INPUT:
-                s->state &= ~(1 << (group + 10));// 1 is output, 0 is input.
+                s->state &= ~(1 << (group + 10)); /* 1 is output, 0 is input. */
                 s->io_bits &= ~mask;
                 break;
         case INSN_CONFIG_DIO_QUERY:
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index de784ff08caa..696ee045e25f 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2398,7 +2398,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
         usbduxsub[index].dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
         if (!usbduxsub[index].dux_commands) {
                 dev_err(dev, "comedi_: usbdux: "
-                        "error alloc space for dac commands\n");
+                        "error alloc space for dux commands\n");
                 tidy_up(&(usbduxsub[index]));
                 up(&start_stop_sem);
                 return -ENOMEM;
diff --git a/drivers/staging/cptm1217/Kconfig b/drivers/staging/cptm1217/Kconfig
new file mode 100644
index 000000000000..43b1cc0a50a5
--- /dev/null
+++ b/drivers/staging/cptm1217/Kconfig
@@ -0,0 +1,12 @@
+config TOUCHSCREEN_CLEARPAD_TM1217
+        tristate "Synaptics Clearpad TM1217"
+        depends on I2C
+        depends on GPIOLIB
+        depends on INPUT
+        help
+          Say Y here if you have a Synaptics Clearpad TM1217 Controller
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called clearpad_tm1217.
diff --git a/drivers/staging/cptm1217/Makefile b/drivers/staging/cptm1217/Makefile
new file mode 100644
index 000000000000..8961fafa80e7
--- /dev/null
+++ b/drivers/staging/cptm1217/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)       += clearpad_tm1217.o
+
diff --git a/drivers/staging/cptm1217/TODO b/drivers/staging/cptm1217/TODO
new file mode 100644
index 000000000000..303922465e4d
--- /dev/null
+++ b/drivers/staging/cptm1217/TODO
@@ -0,0 +1,5 @@
+- Wait for the official upstream general clearpad drivers as promised over
+  the past few months
+- Merge any device support needed from this driver into it
+- Delete this driver
+
diff --git a/drivers/staging/cptm1217/clearpad_tm1217.c b/drivers/staging/cptm1217/clearpad_tm1217.c
new file mode 100644
index 000000000000..76e4b782d2fb
--- /dev/null
+++ b/drivers/staging/cptm1217/clearpad_tm1217.c
@@ -0,0 +1,675 @@
+/*
+ * clearpad_tm1217.c - Touch Screen driver for Synaptics Clearpad
+ * TM1217 controller
+ *
+ * Copyright (C) 2008 Intel Corp
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * 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; version 2 of the License.
+ *
+ * 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; ifnot, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Questions/Comments/Bug fixes to Ramesh Agarwal (ramesh.agarwal@intel.com)
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/i2c.h>
+#include <linux/timer.h>
+#include <linux/gpio.h>
+#include <linux/hrtimer.h>
+#include <linux/kthread.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include "cp_tm1217.h"
+
+#define CPTM1217_DEVICE_NAME            "cptm1217"
+#define CPTM1217_DRIVER_NAME            CPTM1217_DEVICE_NAME
+
+#define MAX_TOUCH_SUPPORTED             2
+#define TOUCH_SUPPORTED                 1
+#define SAMPLING_FREQ                   80      /* Frequency in HZ */
+#define DELAY_BTWIN_SAMPLE              (1000 / SAMPLING_FREQ)
+#define WAIT_FOR_RESPONSE               5       /* 5msec just works */
+#define MAX_RETRIES                     5       /* As above */
+#define INCREMENTAL_DELAY               5       /* As above */
+
+/* Regster Definitions */
+#define TMA1217_DEV_STATUS              0x13    /* Device Status */
+#define TMA1217_INT_STATUS              0x14    /* Interrupt Status */
+
+/* Controller can detect upto 2 possible finger touches.
+ * Each finger touch provides  12 bit X Y co-ordinates, the values are split
+ * across 2 registers, and an 8 bit  Z value */
+#define TMA1217_FINGER_STATE            0x18 /* Finger State */
+#define TMA1217_FINGER1_X_HIGHER8       0x19 /* Higher 8 bit of X coordinate */
+#define TMA1217_FINGER1_Y_HIGHER8       0x1A /* Higher 8 bit of Y coordinate */
+#define TMA1217_FINGER1_XY_LOWER4       0x1B /* Lower 4 bits of X and Y */
+#define TMA1217_FINGER1_Z_VALUE         0x1D /* 8 bit Z value for finger 1 */
+#define TMA1217_FINGER2_X_HIGHER8       0x1E /* Higher 8 bit of X coordinate */
+#define TMA1217_FINGER2_Y_HIGHER8       0x1F /* Higher 8 bit of Y coordinate */
+#define TMA1217_FINGER2_XY_LOWER4       0x20 /* Lower 4 bits of X and Y */
+#define TMA1217_FINGER2_Z_VALUE         0x22 /* 8 bit Z value for finger 2 */
+#define TMA1217_DEVICE_CTRL             0x23 /* Device Control */
+#define TMA1217_INTERRUPT_ENABLE        0x24 /* Interrupt Enable */
+#define TMA1217_REPORT_MODE             0x2B /* Reporting Mode */
+#define TMA1217_MAX_X_LOWER8            0x31 /* Bit 0-7 for Max X */
+#define TMA1217_MAX_X_HIGHER4           0x32 /* Bit 8-11 for Max X */
+#define TMA1217_MAX_Y_LOWER8            0x33 /* Bit 0-7 for Max Y */
+#define TMA1217_MAX_Y_HIGHER4           0x34 /* Bit 8-11 for Max Y */
+#define TMA1217_DEVICE_CMD_RESET        0x67 /* Device CMD reg for reset */
+#define TMA1217_DEVICE_CMD_REZERO       0x69 /* Device CMD reg for rezero */
+
+#define TMA1217_MANUFACTURER_ID         0x73 /* Manufacturer Id */
+#define TMA1217_PRODUCT_FAMILY          0x75 /* Product Family */
+#define TMA1217_FIRMWARE_REVISION       0x76 /* Firmware Revision */
+#define TMA1217_SERIAL_NO_HIGH          0x7C /* Bit 8-15 of device serial no. */
+#define TMA1217_SERIAL_NO_LOW           0x7D /* Bit 0-7 of device serial no. */
+#define TMA1217_PRODUCT_ID_START        0x7E /* Start address for 10 byte ID */
+#define TMA1217_DEVICE_CAPABILITY       0x8B /* Reporting capability */
+
+
+/*
+ * The touch position structure.
+ */
+struct touch_state {
+        int     x;
+        int     y;
+        bool button;
+};
+
+/* Device Specific info given by the controller */
+struct cp_dev_info {
+        u16     maxX;
+        u16     maxY;
+};
+
+/* Vendor related info given by the controller */
+struct cp_vendor_info {
+        u8      vendor_id;
+        u8      product_family;
+        u8      firmware_rev;
+        u16     serial_no;
+};
+
+/*
+ * Private structure to store the device details
+ */
+struct cp_tm1217_device {
+        struct i2c_client       *client;
+        struct device           *dev;
+        struct cp_vendor_info   vinfo;
+        struct cp_dev_info      dinfo;
+        struct input_dev_info {
+                char                    phys[32];
+                char                    name[128];
+                struct input_dev        *input;
+                struct touch_state      touch;
+        } cp_input_info[MAX_TOUCH_SUPPORTED];
+
+        int     thread_running;
+        struct mutex    thread_mutex;
+
+        int gpio;
+};
+
+
+/* The following functions are used to read/write registers on the device
+ * as per the RMI prorocol. Technically, a page select should be written
+ * before doing read/write but since the register offsets are below 0xFF
+ * we can use the default value of page which is 0x00
+ */
+static int cp_tm1217_read(struct cp_tm1217_device *ts,
+                                u8 *req, int size)
+{
+        int i, retval;
+
+        /* Send the address */
+        retval = i2c_master_send(ts->client, &req[0], 1);
+        if (retval != 1) {
+                dev_err(ts->dev, "cp_tm1217: I2C send failed\n");
+                return retval;
+        }
+        msleep(WAIT_FOR_RESPONSE);
+        for (i = 0; i < MAX_RETRIES; i++) {
+                retval = i2c_master_recv(ts->client, &req[1], size);
+                if (retval == size) {
+                        break;
+                } else {
+                        msleep(INCREMENTAL_DELAY);
+                        dev_dbg(ts->dev, "cp_tm1217: Retry count is %d\n", i);
+                }
+        }
+        if (retval != size)
+                dev_err(ts->dev, "cp_tm1217: Read from device failed\n");
+
+        return retval;
+}
+
+static int cp_tm1217_write(struct cp_tm1217_device *ts,
+                                u8 *req, int size)
+{
+        int retval;
+
+        /* Send the address and the data to be written */
+        retval = i2c_master_send(ts->client, &req[0], size + 1);
+        if (retval != size + 1) {
+                dev_err(ts->dev, "cp_tm1217: I2C write  failed: %d\n", retval);
+                return retval;
+        }
+        /* Wait for the write to complete. TBD why this is required */
+        msleep(WAIT_FOR_RESPONSE);
+
+        return size;
+}
+
+static int cp_tm1217_mask_interrupt(struct cp_tm1217_device *ts)
+{
+        u8 req[2];
+        int retval;
+
+        req[0] = TMA1217_INTERRUPT_ENABLE;
+        req[1] = 0x0;
+        retval = cp_tm1217_write(ts, req, 1);
+        if (retval != 1)
+                return -EIO;
+
+        return 0;
+}
+
+static int cp_tm1217_unmask_interrupt(struct cp_tm1217_device *ts)
+{
+        u8 req[2];
+        int retval;
+
+        req[0] = TMA1217_INTERRUPT_ENABLE;
+        req[1] = 0xa;
+        retval = cp_tm1217_write(ts, req, 1);
+        if (retval != 1)
+                return -EIO;
+
+        return 0;
+}
+
+static void process_touch(struct cp_tm1217_device *ts, int index)
+{
+        int retval;
+        struct input_dev_info *input_info =
+                (struct input_dev_info *)&ts->cp_input_info[index];
+        u8 xy_data[6];
+
+        if (index == 0)
+                xy_data[0] = TMA1217_FINGER1_X_HIGHER8;
+        else
+                xy_data[0] = TMA1217_FINGER2_X_HIGHER8;
+
+        retval = cp_tm1217_read(ts, xy_data, 5);
+        if (retval < 5) {
+                dev_err(ts->dev, "cp_tm1217: XY read from device failed\n");
+                return;
+        }
+
+        /* Note: Currently not using the Z values but may be requried in
+           the future. */
+        input_info->touch.x = (xy_data[1] << 4)
+                                        | (xy_data[3] & 0x0F);
+        input_info->touch.y = (xy_data[2] << 4)
+                                        | ((xy_data[3] & 0xF0) >> 4);
+        input_report_abs(input_info->input, ABS_X, input_info->touch.x);
+        input_report_abs(input_info->input, ABS_Y, input_info->touch.y);
+        input_sync(input_info->input);
+}
+
+static void cp_tm1217_get_data(struct cp_tm1217_device *ts)
+{
+        u8 req[2];
+        int retval, i, finger_touched = 0;
+
+        do {
+                req[0] = TMA1217_FINGER_STATE;
+                retval = cp_tm1217_read(ts, req, 1);
+                if (retval != 1) {
+                        dev_err(ts->dev,
+                                "cp_tm1217: Read from device failed\n");
+                        continue;
+                }
+                finger_touched = 0;
+                /* Start sampling until the pressure is below
+                  threshold */
+                for (i = 0; i < TOUCH_SUPPORTED; i++) {
+                        if (req[1] & 0x3) {
+                                finger_touched++;
+                                if (ts->cp_input_info[i].touch.button == 0) {
+                                        /* send the button touch event */
+                                        input_report_key(
+                                                ts->cp_input_info[i].input,
+                                                BTN_TOUCH, 1);
+                                        ts->cp_input_info[i].touch.button = 1;
+                                }
+                                process_touch(ts, i);
+                        } else {
+                                if (ts->cp_input_info[i].touch.button == 1) {
+                                        /* send the button release event */
+                                        input_report_key(
+                                                ts->cp_input_info[i].input,
+                                                BTN_TOUCH, 0);
+                                        input_sync(ts->cp_input_info[i].input);
+                                        ts->cp_input_info[i].touch.button = 0;
+                                }
+                        }
+                        req[1] = req[1] >> 2;
+                }
+                msleep(DELAY_BTWIN_SAMPLE);
+        } while (finger_touched > 0);
+}
+
+static irqreturn_t cp_tm1217_sample_thread(int irq, void *handle)
+{
+        struct cp_tm1217_device *ts = (struct cp_tm1217_device *) handle;
+        u8 req[2];
+        int retval;
+
+        /* Chedk if another thread is already running */
+        mutex_lock(&ts->thread_mutex);
+        if (ts->thread_running == 1) {
+                mutex_unlock(&ts->thread_mutex);
+                return IRQ_HANDLED;
+        } else {
+                ts->thread_running = 1;
+                mutex_unlock(&ts->thread_mutex);
+        }
+
+        /* Mask the interrupts */
+        retval = cp_tm1217_mask_interrupt(ts);
+
+        /* Read the Interrupt Status register to find the cause of the
+           Interrupt */
+        req[0] = TMA1217_INT_STATUS;
+        retval = cp_tm1217_read(ts, req, 1);
+        if (retval != 1)
+                goto exit_thread;
+
+        if (!(req[1] & 0x8))
+                goto exit_thread;
+
+        cp_tm1217_get_data(ts);
+
+exit_thread:
+        /* Unmask the interrupts before going to sleep */
+        retval = cp_tm1217_unmask_interrupt(ts);
+
+        mutex_lock(&ts->thread_mutex);
+        ts->thread_running = 0;
+        mutex_unlock(&ts->thread_mutex);
+
+        return IRQ_HANDLED;
+}
+
+static int cp_tm1217_init_data(struct cp_tm1217_device *ts)
+{
+        int retval;
+        u8      req[2];
+
+        /* Read the vendor id/ fw revision etc. Ignoring return check as this
+           is non critical info  */
+        req[0] = TMA1217_MANUFACTURER_ID;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->vinfo.vendor_id = req[1];
+
+        req[0] = TMA1217_PRODUCT_FAMILY;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->vinfo.product_family = req[1];
+
+        req[0] = TMA1217_FIRMWARE_REVISION;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->vinfo.firmware_rev = req[1];
+
+        req[0] = TMA1217_SERIAL_NO_HIGH;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->vinfo.serial_no = (req[1] << 8);
+
+        req[0] = TMA1217_SERIAL_NO_LOW;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->vinfo.serial_no = ts->vinfo.serial_no | req[1];
+
+        req[0] = TMA1217_MAX_X_HIGHER4;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->dinfo.maxX = (req[1] & 0xF) << 8;
+
+        req[0] = TMA1217_MAX_X_LOWER8;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->dinfo.maxX = ts->dinfo.maxX | req[1];
+
+        req[0] = TMA1217_MAX_Y_HIGHER4;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->dinfo.maxY = (req[1] & 0xF) << 8;
+
+        req[0] = TMA1217_MAX_Y_LOWER8;
+        retval = cp_tm1217_read(ts, req, 1);
+        ts->dinfo.maxY = ts->dinfo.maxY | req[1];
+
+        return 0;
+
+}
+
+/*
+ *      Set up a GPIO for use as the interrupt. We can't simply do this at
+ *      boot time because the GPIO drivers themselves may not be around at
+ *      boot/firmware set up time to do the work. Instead defer it to driver
+ *      detection.
+ */
+
+static int cp_tm1217_setup_gpio_irq(struct cp_tm1217_device *ts)
+{
+        int retval;
+
+        /* Hook up the irq handler */
+        retval = gpio_request(ts->gpio, "cp_tm1217_touch");
+        if (retval < 0) {
+                dev_err(ts->dev, "cp_tm1217: GPIO request failed error %d\n",
+                                                                retval);
+                return retval;
+        }
+
+        retval = gpio_direction_input(ts->gpio);
+        if (retval < 0) {
+                dev_err(ts->dev,
+                "cp_tm1217: GPIO direction configuration failed, error %d\n",
+                                                                retval);
+                gpio_free(ts->gpio);
+                return retval;
+        }
+
+        retval = gpio_to_irq(ts->gpio);
+        if (retval < 0) {
+                dev_err(ts->dev, "cp_tm1217: GPIO to IRQ failedi,"
+                " error %d\n", retval);
+                gpio_free(ts->gpio);
+        }
+        dev_dbg(ts->dev,
+                "cp_tm1217: Got IRQ number is %d for GPIO %d\n",
+                retval, ts->gpio);
+        return retval;
+}
+
+static int cp_tm1217_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct cp_tm1217_device *ts;
+        struct input_dev *input_dev;
+        struct input_dev_info   *input_info;
+        struct cp_tm1217_platform_data *pdata;
+        u8 req[2];
+        int i, retval;
+
+        /* No pdata is fine - we then use "normal" IRQ mode */
+
+        pdata = client->dev.platform_data;
+
+        ts = kzalloc(sizeof(struct cp_tm1217_device), GFP_KERNEL);
+        if (!ts) {
+                dev_err(&client->dev,
+                        "cp_tm1217: Private Device Struct alloc failed\n");
+                return -ENOMEM;
+        }
+
+        ts->client = client;
+        ts->dev = &client->dev;
+        i2c_set_clientdata(client, ts);
+
+        ts->thread_running = 0;
+        mutex_init(&ts->thread_mutex);
+
+        /* Reset the Controller */
+        req[0] = TMA1217_DEVICE_CMD_RESET;
+        req[1] = 0x1;
+        retval = cp_tm1217_write(ts, req, 1);
+        if (retval != 1) {
+                dev_err(ts->dev, "cp_tm1217: Controller reset failed\n");
+                kfree(ts);
+                return -EIO;
+        }
+
+        /* Clear up the interrupt status from reset. */
+        req[0] = TMA1217_INT_STATUS;
+        retval = cp_tm1217_read(ts, req, 1);
+
+        /* Mask all the interrupts */
+        retval = cp_tm1217_mask_interrupt(ts);
+
+        /* Read the controller information */
+        cp_tm1217_init_data(ts);
+
+        /* The following code will register multiple event devices when
+           multi-pointer is enabled, the code has not been tested
+           with MPX */
+        for (i = 0; i < TOUCH_SUPPORTED; i++) {
+                input_dev = input_allocate_device();
+                if (input_dev == NULL) {
+                        dev_err(ts->dev,
+                                "cp_tm1217:Input Device Struct alloc failed\n");
+                        kfree(ts);
+                        return -ENOMEM;
+                }
+                input_info = &ts->cp_input_info[i];
+                snprintf(input_info->name, sizeof(input_info->name),
+                        "cp_tm1217_touchscreen_%d", i);
+                input_dev->name = input_info->name;
+                snprintf(input_info->phys, sizeof(input_info->phys),
+                        "%s/input%d", dev_name(&client->dev), i);
+
+                input_dev->phys = input_info->phys;
+                input_dev->id.bustype = BUS_I2C;
+
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+                input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+                input_set_abs_params(input_dev, ABS_X, 0, ts->dinfo.maxX, 0, 0);
+                input_set_abs_params(input_dev, ABS_Y, 0, ts->dinfo.maxY, 0, 0);
+
+                retval = input_register_device(input_dev);
+                if (retval) {
+                        dev_err(ts->dev,
+                                "Input dev registration failed for %s\n",
+                                        input_dev->name);
+                        goto fail;
+                }
+                input_info->input = input_dev;
+        }
+
+        /* Setup the reporting mode to send an interrupt only when
+           finger arrives or departs. */
+        req[0] = TMA1217_REPORT_MODE;
+        req[1] = 0x02;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        /* Setup the device to no sleep mode for now and make it configured */
+        req[0] = TMA1217_DEVICE_CTRL;
+        req[1] = 0x84;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        /* Check for the status of the device */
+        req[0] = TMA1217_DEV_STATUS;
+        retval = cp_tm1217_read(ts, req, 1);
+        if (req[1] != 0) {
+                dev_err(ts->dev,
+                        "cp_tm1217: Device Status 0x%x != 0: config failed\n",
+                        req[1]);
+
+                retval = -EIO;
+                goto fail;
+        }
+
+        if (pdata && pdata->gpio) {
+                ts->gpio = pdata->gpio;
+                retval = cp_tm1217_setup_gpio_irq(ts);
+        } else
+                retval = client->irq;
+
+        if (retval < 0) {
+                dev_err(ts->dev, "cp_tm1217: GPIO request failed error %d\n",
+                                                                retval);
+                goto fail;
+        }
+
+        client->irq = retval;
+
+
+        retval = request_threaded_irq(client->irq,
+                NULL, cp_tm1217_sample_thread,
+                IRQF_TRIGGER_FALLING, "cp_tm1217_touch", ts);
+        if (retval < 0) {
+                dev_err(ts->dev, "cp_tm1217: Request IRQ error %d\n", retval);
+                goto fail_gpio;
+        }
+
+        /* Unmask the interrupts */
+        retval = cp_tm1217_unmask_interrupt(ts);
+        if (retval == 0)
+                return 0;
+
+        free_irq(client->irq, ts);
+fail_gpio:
+        if (ts->gpio)
+                gpio_free(ts->gpio);
+fail:
+        /* Clean up before returning failure */
+        for (i = 0; i < TOUCH_SUPPORTED; i++) {
+                if (ts->cp_input_info[i].input) {
+                        input_unregister_device(ts->cp_input_info[i].input);
+                        input_free_device(ts->cp_input_info[i].input);
+                }
+        }
+        kfree(ts);
+        return retval;
+
+}
+
+/*
+ * cp_tm1217 suspend
+ *
+ */
+static int cp_tm1217_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct cp_tm1217_device *ts = i2c_get_clientdata(client);
+        u8 req[2];
+        int retval;
+
+        /* Put the controller to sleep */
+        req[0] = TMA1217_DEVICE_CTRL;
+        retval = cp_tm1217_read(ts, req, 1);
+        req[1] = (req[1] & 0xF8) | 0x1;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+
+        return 0;
+}
+
+/*
+ * cp_tm1217_resume
+ *
+ */
+static int cp_tm1217_resume(struct i2c_client *client)
+{
+        struct cp_tm1217_device *ts = i2c_get_clientdata(client);
+        u8 req[2];
+        int retval;
+
+        /* Take the controller out of sleep */
+        req[0] = TMA1217_DEVICE_CTRL;
+        retval = cp_tm1217_read(ts, req, 1);
+        req[1] = (req[1] & 0xF8) | 0x4;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        /* Restore the register settings sinc the power to the
+           could have been cut off */
+
+        /* Setup the reporting mode to send an interrupt only when
+           finger arrives or departs. */
+        req[0] = TMA1217_REPORT_MODE;
+        req[1] = 0x02;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        /* Setup the device to no sleep mode for now and make it configured */
+        req[0] = TMA1217_DEVICE_CTRL;
+        req[1] = 0x84;
+        retval = cp_tm1217_write(ts, req, 1);
+
+        /* Setup the interrupt mask */
+        retval = cp_tm1217_unmask_interrupt(ts);
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+
+        return 0;
+}
+
+/*
+ * cp_tm1217_remove
+ *
+ */
+static int cp_tm1217_remove(struct i2c_client *client)
+{
+        struct cp_tm1217_device *ts = i2c_get_clientdata(client);
+        int i;
+
+        free_irq(client->irq, ts);
+        if (ts->gpio)
+                gpio_free(ts->gpio);
+        for (i = 0; i < TOUCH_SUPPORTED; i++)
+                input_unregister_device(ts->cp_input_info[i].input);
+        kfree(ts);
+        return 0;
+}
+
+static struct i2c_device_id cp_tm1217_idtable[] = {
+        { CPTM1217_DEVICE_NAME, 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, cp_tm1217_idtable);
+
+static struct i2c_driver cp_tm1217_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = CPTM1217_DRIVER_NAME,
+        },
+        .id_table       = cp_tm1217_idtable,
+        .probe          = cp_tm1217_probe,
+        .remove         = cp_tm1217_remove,
+        .suspend    = cp_tm1217_suspend,
+        .resume     = cp_tm1217_resume,
+};
+
+static int __init clearpad_tm1217_init(void)
+{
+        return i2c_add_driver(&cp_tm1217_driver);
+}
+
+static void __exit clearpad_tm1217_exit(void)
+{
+        i2c_del_driver(&cp_tm1217_driver);
+}
+
+module_init(clearpad_tm1217_init);
+module_exit(clearpad_tm1217_exit);
+
+MODULE_AUTHOR("Ramesh Agarwal <ramesh.agarwal@intel.com>");
+MODULE_DESCRIPTION("Synaptics TM1217 TouchScreen Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/cptm1217/cp_tm1217.h b/drivers/staging/cptm1217/cp_tm1217.h
new file mode 100644
index 000000000000..a0ce31db53f8
--- /dev/null
+++ b/drivers/staging/cptm1217/cp_tm1217.h
@@ -0,0 +1,9 @@
+#ifndef __LINUX_I2C_CP_TM1217_H
+#define __LINUX_I2C_CP_TM1217_H
+
+struct cp_tm1217_platform_data
+{
+        int gpio;               /* If not set uses the IRQ resource 0 */
+};
+
+#endif
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index f63185790c48..153ddbf4247d 100644
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -1711,7 +1711,7 @@ enum BC_STATUS crystalhd_download_fw(struct crystalhd_adp *adp, void *buffer, ui
         }
 
         BCMLOG(BCMLOG_INFO, "Firmware Downloaded Successfully\n");
-        return BC_STS_SUCCESS;;
+        return BC_STS_SUCCESS;
 }
 
 enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw,
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 28c6b8ced424..719e70bc871e 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -516,7 +516,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev)
 
         BCMLOG_ENTER;
 
-        pinfo = (struct crystalhd_adp *) pci_get_drvdata(pdev);
+        pinfo = pci_get_drvdata(pdev);
         if (!pinfo) {
                 BCMLOG_ERR("could not get adp\n");
                 return;
@@ -626,7 +626,7 @@ int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct crystalhd_ioctl_data *temp;
         enum BC_STATUS sts = BC_STS_SUCCESS;
 
-        adp = (struct crystalhd_adp *)pci_get_drvdata(pdev);
+        adp = pci_get_drvdata(pdev);
         if (!adp) {
                 BCMLOG_ERR("could not get adp\n");
                 return -ENODEV;
@@ -660,7 +660,7 @@ int chd_dec_pci_resume(struct pci_dev *pdev)
         enum BC_STATUS sts = BC_STS_SUCCESS;
         int rc;
 
-        adp = (struct crystalhd_adp *)pci_get_drvdata(pdev);
+        adp = pci_get_drvdata(pdev);
         if (!adp) {
                 BCMLOG_ERR("could not get adp\n");
                 return -ENODEV;
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index 9a205a342c55..160f6693aa33 100644
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -630,7 +630,7 @@ static int snd_cx25821_pcm(struct cx25821_audio_dev *chip, int device,
  * Only boards with eeprom and byte 1 at eeprom=1 have it
  */
 
-static const struct pci_device_id cx25821_audio_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(cx25821_audio_pci_tbl) = {
         {0x14f1, 0x0920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {0,}
 };
diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c
index dcbe6b628455..52224cdc967d 100644
--- a/drivers/staging/cxt1e1/comet.c
+++ b/drivers/staging/cxt1e1/comet.c
@@ -29,7 +29,7 @@
 #endif
 
 
-extern int  log_level;
+extern int  cxt1e1_log_level;
 
 #define COMET_NUM_SAMPLES   24  /* Number of entries in the waveform table */
 #define COMET_NUM_UNITS     5   /* Number of points per entry in table */
@@ -292,12 +292,12 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster,
                                                                  * i.e.FPMODE=0 (@0x20) */
         if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)
         {
-            if (log_level >= LOG_SBEBUG12)
+            if (cxt1e1_log_level >= LOG_SBEBUG12)
                 pr_info(">> %s: clockmaster internal clock\n", __func__);
             pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d); /* internal oscillator */
         } else                      /* external clock source */
         {
-            if (log_level >= LOG_SBEBUG12)
+            if (cxt1e1_log_level >= LOG_SBEBUG12)
                 pr_info(">> %s: clockmaster external clock\n", __func__);
             pci_write_32 ((u_int32_t *) &comet->tx_time, 0x09); /* loop timing
                                                                  * (external) */
@@ -312,7 +312,7 @@ init_comet (void *ci, comet_t * comet, u_int32_t port_mode, int clockmaster,
             pci_write_32 ((u_int32_t *) &comet->brif_cfg, 0x21);        /* Slave Mode (CMODE=1) */
         pci_write_32 ((u_int32_t *) &comet->brif_fpcfg, 0x20);  /* Slave Mode i.e.
                                                                  * FPMODE=1 (@0x20) */
-        if (log_level >= LOG_SBEBUG12)
+        if (cxt1e1_log_level >= LOG_SBEBUG12)
             pr_info(">> %s: clockslave internal clock\n", __func__);
         pci_write_32 ((u_int32_t *) &comet->tx_time, 0x0d);     /* oscillator timing */
     }
diff --git a/drivers/staging/cxt1e1/functions.c b/drivers/staging/cxt1e1/functions.c
index ab399c2f7488..d9a9aa3571d9 100644
--- a/drivers/staging/cxt1e1/functions.c
+++ b/drivers/staging/cxt1e1/functions.c
@@ -54,7 +54,7 @@ static int  dummy = 0;
 
 #endif
 
-extern int  log_level;
+extern int  cxt1e1_log_level;
 extern int  drvr_state;
 
 
@@ -67,7 +67,7 @@ pci_read_32 (u_int32_t *p)
 
     FLUSH_PCI_READ ();
     v = le32_to_cpu (*p);
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("pci_read : %x = %x\n", (u_int32_t) p, v);
     return v;
 #else
@@ -80,7 +80,7 @@ void
 pci_write_32 (u_int32_t *p, u_int32_t v)
 {
 #ifdef FLOW_DEBUG
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("pci_write: %x = %x\n", (u_int32_t) p, v);
 #endif
     *p = cpu_to_le32 (v);
@@ -118,7 +118,7 @@ watchdog_func (unsigned long arg)
 
     if (drvr_state != SBE_DRVR_AVAILABLE)
     {
-        if (log_level >= LOG_MONITOR)
+        if (cxt1e1_log_level >= LOG_MONITOR)
             pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state);
         return;
     }
diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index 89200e7af26c..c517cc22f391 100644
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
@@ -37,7 +37,7 @@
 #define STATIC  static
 #endif
 
-extern int  log_level;
+extern int  cxt1e1_log_level;
 extern int  error_flag;
 extern int  drvr_state;
 
@@ -143,7 +143,7 @@ hdw_sn_get (hdw_info_t * hi, int brdno)
     if ((hi->promfmt = pmc_verify_cksum (&hi->mfg_info.data)) == PROM_FORMAT_Unk)
     {
         /* bad crc, data is suspect */
-        if (log_level >= LOG_WARN)
+        if (cxt1e1_log_level >= LOG_WARN)
             pr_info("%s: EEPROM cksum error\n", hi->devname);
         hi->mfg_info_sts = EEPROM_CRCERR;
     } else
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index c7930287e3db..0f78f8962751 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -108,9 +108,9 @@ extern int  unregister_hdlc_device_v7 (hdlc_device *);
 #endif
 
 int         error_flag;         /* module load error reporting */
-int         log_level = LOG_ERROR;
+int         cxt1e1_log_level = LOG_ERROR;
 int         log_level_default = LOG_ERROR;
-module_param(log_level, int, 0444);
+module_param(cxt1e1_log_level, int, 0444);
 
 int         cxt1e1_max_mru = MUSYCC_MRU;
 int         max_mru_default = MUSYCC_MRU;
@@ -497,7 +497,7 @@ create_chan (struct net_device * ndev, ci_t * ci,
     rtnl_lock ();                   /* needed due to Ioctl calling sequence */
     if (ret)
     {
-        if (log_level >= LOG_WARN)
+        if (cxt1e1_log_level >= LOG_WARN)
             pr_info("%s: create_chan[%d] registration error = %d.\n",
                     ci->devname, cp->channum, ret);
         free_netdev (dev);          /* cleanup */
@@ -722,11 +722,11 @@ do_get_chan_stats (struct net_device * ndev, void *data)
 STATIC      status_t
 do_set_loglevel (struct net_device * ndev, void *data)
 {
-    unsigned int log_level;
+    unsigned int cxt1e1_log_level;
 
-    if (copy_from_user (&log_level, data, sizeof (int)))
+    if (copy_from_user (&cxt1e1_log_level, data, sizeof (int)))
         return -EFAULT;
-    sbecom_set_loglevel (log_level);
+    sbecom_set_loglevel (cxt1e1_log_level);
     return 0;
 }
 
@@ -1115,9 +1115,9 @@ c4_mod_init (void)
         return -rtn;                /* installation failure - see system log */
 
     /* housekeeping notifications */
-    if (log_level != log_level_default)
-        pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n",
-                log_level_default, log_level);
+    if (cxt1e1_log_level != log_level_default)
+        pr_info("NOTE: driver parameter <cxt1e1_log_level> changed from default %d to %d.\n",
+                log_level_default, cxt1e1_log_level);
        if (cxt1e1_max_mru != max_mru_default)
                pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n",
                                max_mru_default, cxt1e1_max_mru);
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index fc15610f6974..f274c77fb3fc 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -97,7 +97,7 @@ char        SBEid_pmcc4_musyccc[] =
 /* global driver variables */
 extern ci_t *c4_list;
 extern int  drvr_state;
-extern int  log_level;
+extern int  cxt1e1_log_level;
 
 extern int  cxt1e1_max_mru;
 extern int  cxt1e1_max_mtu;
@@ -627,7 +627,7 @@ rewrite:
 
     if ((r != req) && (req != SR_CHIP_RESET) && (++rcnt <= MUSYCC_SR_RETRY_CNT))
     {
-        if (log_level >= LOG_MONITOR)
+        if (cxt1e1_log_level >= LOG_MONITOR)
             pr_info("%s: %d - reissue srv req/last %x/%x (hdw reads %x), Chan %d.\n",
                     pi->up->devname, rcnt, req, pi->sr_last, r,
                     (pi->portnum * MUSYCC_NCHANS) + (req & 0x1f));
@@ -951,7 +951,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
     ch = pi->chan[gchan];
     if (ch == 0 || ch->state != UP)
     {
-        if (log_level >= LOG_ERROR)
+        if (cxt1e1_log_level >= LOG_ERROR)
             pr_info("%s: intr: xmit EOM on uninitialized channel %d\n",
                     pi->up->devname, gchan);
     }
@@ -1002,7 +1002,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
             }
             if (status & MUSYCC_TX_OWNED)
             {
-                if (log_level >= LOG_MONITOR)
+                if (cxt1e1_log_level >= LOG_MONITOR)
                 {
                     pr_info("%s: Port %d Chan %2d - unexpected TX msg ownership intr (md %p sts %x)\n",
                             pi->up->devname, pi->portnum, ch->channum,
@@ -1016,7 +1016,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
                 break;              /* Not our mdesc, done */
             } else
             {
-                if (log_level >= LOG_MONITOR)
+                if (cxt1e1_log_level >= LOG_MONITOR)
                     pr_info("%s: Port %d Chan %2d - recovered TX msg ownership [%d] (md %p sts %x)\n",
                             pi->up->devname, pi->portnum, ch->channum, readCount, md, status);
             }
@@ -1054,7 +1054,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
         }
         md->status = 0;
 #ifdef RLD_TXFULL_DEBUG
-        if (log_level >= LOG_MONITOR2)
+        if (cxt1e1_log_level >= LOG_MONITOR2)
             pr_info("~~ tx_eom: tx_full %x  txd_free %d -> %d\n",
                     ch->tx_full, ch->txd_free, ch->txd_free + 1);
 #endif
@@ -1063,7 +1063,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
 
         if ((ch->p.chan_mode != CFG_CH_PROTO_TRANS) && (status & EOBIRQ_ENABLE))
         {
-            if (log_level >= LOG_MONITOR)
+            if (cxt1e1_log_level >= LOG_MONITOR)
                 pr_info("%s: Mode (%x) incorrect EOB status (%x)\n",
                         pi->up->devname, ch->p.chan_mode, status);
             if ((status & EOMIRQ_ENABLE) == 0)
@@ -1094,7 +1094,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
         {
 
 #ifdef RLD_TXFULL_DEBUG
-            if (log_level >= LOG_MONITOR2)
+            if (cxt1e1_log_level >= LOG_MONITOR2)
                 pr_info("tx_eom[%d]: enable xmit tx_full no more, txd_free %d txd_num/2 %d\n",
                         ch->channum,
                         ch->txd_free, ch->txd_num / 2);
@@ -1108,7 +1108,7 @@ musycc_bh_tx_eom (mpi_t * pi, int gchan)
 #ifdef RLD_TXFULL_DEBUG
     else if (ch->tx_full)
     {
-        if (log_level >= LOG_MONITOR2)
+        if (cxt1e1_log_level >= LOG_MONITOR2)
             pr_info("tx_eom[%d]: bypass TX enable though room available? (txd_free %d txd_num/2 %d)\n",
                     ch->channum,
                     ch->txd_free, ch->txd_num / 2);
@@ -1138,7 +1138,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan)
     ch = pi->chan[gchan];
     if (ch == 0 || ch->state != UP)
     {
-        if (log_level > LOG_ERROR)
+        if (cxt1e1_log_level > LOG_ERROR)
             pr_info("%s: intr: receive EOM on uninitialized channel %d\n",
                     pi->up->devname, gchan);
         return;
@@ -1269,7 +1269,7 @@ musycc_intr_th_handler (void *devp)
 
     if (nextInt != INTRPTS_NEXTINT (ci->intlog.this_status_new))
     {
-        if (log_level >= LOG_MONITOR)
+        if (cxt1e1_log_level >= LOG_MONITOR)
         {
             pr_info("%s: note - updated ISD from %08x to %08x\n",
                     ci->devname, status,
@@ -1337,11 +1337,11 @@ musycc_intr_th_handler (void *devp)
     ci->intlog.last_status_new = ci->intlog.this_status_new;
     ci->intlog.this_status_new = currInt;
 
-    if ((log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M))
+    if ((cxt1e1_log_level >= LOG_WARN) && (status & INTRPTS_INTFULL_M))
     {
         pr_info("%s: Interrupt queue full condition occurred\n", ci->devname);
     }
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("%s: interrupts pending, isd @ 0x%p: %x curr %d cnt %d NEXT %d\n",
                 ci->devname, &ci->reg->isd,
         status, nextInt, intCnt, (intCnt + nextInt) & (INT_QUEUE_SIZE - 1));
@@ -1448,7 +1448,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
         if ((currInt == badInt) || (currInt == badInt2))        /* catch failure of Bug
                                                                  * Fix checking */
         {
-            if (log_level >= LOG_WARN)
+            if (cxt1e1_log_level >= LOG_WARN)
                 pr_info("%s: Illegal Interrupt Detected @ 0x%p, mod %d.)\n",
                         ci->devname, &ci->iqd_p[headx], headx);
 
@@ -1483,7 +1483,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
         ci->iqd_p[headx] = __constant_cpu_to_le32 (INT_EMPTY_ENTRY);
         FLUSH_MEM_WRITE ();
 
-        if (log_level >= LOG_DEBUG)
+        if (cxt1e1_log_level >= LOG_DEBUG)
         {
             if (err != 0)
                 pr_info(" %08x -> err: %2d,", currInt, err);
@@ -1497,7 +1497,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
         switch (event)
         {
         case EVE_SACK:              /* Service Request Acknowledge */
-            if (log_level >= LOG_DEBUG)
+            if (cxt1e1_log_level >= LOG_DEBUG)
             {
                 volatile u_int32_t r;
 
@@ -1534,7 +1534,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
             }
             break;
         default:
-            if (log_level >= LOG_WARN)
+            if (cxt1e1_log_level >= LOG_WARN)
                 pr_info("%s: unexpected interrupt event: %d, iqd[%d]: %08x, port: %d\n", ci->devname,
                         event, headx, currInt, group);
             break;
@@ -1573,9 +1573,9 @@ musycc_intr_bh_tasklet (ci_t * ci)
 
                 {
 #ifdef RLD_TRANS_DEBUG
-                    if (1 || log_level >= LOG_MONITOR)
+                    if (1 || cxt1e1_log_level >= LOG_MONITOR)
 #else
-                    if (log_level >= LOG_MONITOR)
+                    if (cxt1e1_log_level >= LOG_MONITOR)
 #endif
                     {
                         pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
@@ -1605,7 +1605,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
                 ch->s.rx_over_errors++;
                 ch->ch_start_rx = CH_START_RX_ONR;
 
-                if (log_level >= LOG_WARN)
+                if (cxt1e1_log_level >= LOG_WARN)
                 {
                     pr_info("%s: RX buffer overflow [ONR] on channel %d, mode %x\n",
                             ci->devname, ch->channum, ch->p.chan_mode);
@@ -1623,7 +1623,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
                  * Per MUSYCC manual, Section  6.4.8.3 [Transmit Errors],
                  * this BUFF error requires Transmit channel reactivation.
                  */
-                if (log_level >= LOG_MONITOR)
+                if (cxt1e1_log_level >= LOG_MONITOR)
                     pr_info("%s: TX buffer underrun [BUFF] on channel %d, mode %x\n",
                             ci->devname, ch->channum, ch->p.chan_mode);
             } else                  /* RX buffer overrun */
@@ -1636,7 +1636,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
                  * space for this channel.  Receive channel reactivation is
                  * not required, but data has been lost.
                  */
-                if (log_level >= LOG_WARN)
+                if (cxt1e1_log_level >= LOG_WARN)
                     pr_info("%s: RX buffer overrun [BUFF] on channel %d, mode %x\n",
                             ci->devname, ch->channum, ch->p.chan_mode);
                 /*
@@ -1658,7 +1658,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
         }                           /* switch on err */
 
         /* Check for interrupt lost condition */
-        if ((currInt & INTRPT_ILOST_M) && (log_level >= LOG_ERROR))
+        if ((currInt & INTRPT_ILOST_M) && (cxt1e1_log_level >= LOG_ERROR))
         {
             pr_info("%s: Interrupt queue overflow - ILOST asserted\n",
                     ci->devname);
@@ -1667,7 +1667,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
         FLUSH_MEM_WRITE ();
         FLUSH_MEM_READ ();
     }                               /* while */
-    if ((log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx))
+    if ((cxt1e1_log_level >= LOG_MONITOR2) && (ci->iqp_headx != ci->iqp_tailx))
     {
         int         bh;
 
@@ -1821,9 +1821,9 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
         return EROFS;               /* how else to flag unwritable state ? */
 
 #ifdef RLD_TRANS_DEBUGx
-    if (1 || log_level >= LOG_MONITOR2)
+    if (1 || cxt1e1_log_level >= LOG_MONITOR2)
 #else
-    if (log_level >= LOG_MONITOR2)
+    if (cxt1e1_log_level >= LOG_MONITOR2)
 #endif
     {
         pr_info("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n",
@@ -1846,7 +1846,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
 
     if (txd_need_cnt == 0)
     {
-        if (log_level >= LOG_MONITOR2)
+        if (cxt1e1_log_level >= LOG_MONITOR2)
             pr_info("%s channel %d: no TX data in User buffer\n", ci->devname, channum);
         OS_mem_token_free (mem_token);
         return 0;                   /* no data to send */
@@ -1857,7 +1857,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
     if (txd_need_cnt > ch->txd_num) /* never enough descriptors for this
                                      * large a buffer */
     {
-        if (log_level >= LOG_DEBUG)
+        if (cxt1e1_log_level >= LOG_DEBUG)
         {
             pr_info("start_xmit: discarding buffer, insufficient descriptor cnt %d, need %d.\n",
                     ch->txd_num, txd_need_cnt + 1);
@@ -1874,7 +1874,7 @@ musycc_start_xmit (ci_t * ci, int channum, void *mem_token)
     /************************************************************/
     if (txd_need_cnt > ch->txd_free)
     {
-        if (log_level >= LOG_MONITOR2)
+        if (cxt1e1_log_level >= LOG_MONITOR2)
         {
             pr_info("start_xmit[%d]: EBUSY - need more descriptors, have %d of %d need %d\n",
                     channum, ch->txd_free, ch->txd_num, txd_need_cnt);
diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c
index 5c8a3eb0cfc3..341e7a92f099 100644
--- a/drivers/staging/cxt1e1/pmcc4_drv.c
+++ b/drivers/staging/cxt1e1/pmcc4_drv.c
@@ -135,7 +135,7 @@ void        musycc_serv_req (mpi_t *, u_int32_t);
 void        musycc_update_timeslots (mpi_t *);
 
 extern void musycc_update_tx_thp (mch_t *);
-extern int  log_level;
+extern int  cxt1e1_log_level;
 extern int  cxt1e1_max_mru;
 extern int  cxt1e1_max_mtu;
 extern int  max_rxdesc_used, max_rxdesc_default;
@@ -168,12 +168,12 @@ sbecom_set_loglevel (int d)
                                                          * for card 0 only */
     } else
     {
-        if (log_level != d)
+        if (cxt1e1_log_level != d)
         {
-            pr_info("log level changed from %d to %d\n", log_level, d);
-            log_level = d;          /* set new */
+            pr_info("log level changed from %d to %d\n", cxt1e1_log_level, d);
+            cxt1e1_log_level = d;          /* set new */
         } else
-            pr_info("log level is %d\n", log_level);
+            pr_info("log level is %d\n", cxt1e1_log_level);
     }
 }
 
@@ -513,7 +513,7 @@ checkPorts (ci_t * ci)
             if ((value == 0x1c) || (value == 0x19) || (value == 0x12))
                 c4_loop_port (ci, portnum, COMET_MDIAG_LBOFF);  /* take port out of any
                                                                  * loopbk mode */
-            if (log_level >= LOG_DEBUG)
+            if (cxt1e1_log_level >= LOG_DEBUG)
                 if (value != 0x3f)
                     pr_warning("%s: BOC value = %x on Port %d\n",
                                ci->devname, value, portnum);
@@ -533,7 +533,7 @@ c4_watchdog (ci_t * ci)
 {
     if (drvr_state != SBE_DRVR_AVAILABLE)
     {
-        if (log_level >= LOG_MONITOR)
+        if (cxt1e1_log_level >= LOG_MONITOR)
             pr_info("drvr not available (%x)\n", drvr_state);
         return;
     }
@@ -794,19 +794,19 @@ c4_loop_port (ci_t * ci, int portnum, u_int8_t cmd)
         }
 
         pci_write_32 ((u_int32_t *) &comet->mdiag, cmd);
-        if (log_level >= LOG_WARN)
+        if (cxt1e1_log_level >= LOG_WARN)
             pr_info("%s: loopback mode changed to %2x from %2x on Port %d\n",
                     ci->devname, cmd, loopValue, portnum);
         loopValue = pci_read_32 ((u_int32_t *) &comet->mdiag) & COMET_MDIAG_LBMASK;
         if (loopValue != cmd)
         {
-            if (log_level >= LOG_ERROR)
+            if (cxt1e1_log_level >= LOG_ERROR)
                 pr_info("%s: write to loop register failed, unknown state for Port %d\n",
                         ci->devname, portnum);
         }
     } else
     {
-        if (log_level >= LOG_WARN)
+        if (cxt1e1_log_level >= LOG_WARN)
             pr_info("%s: loopback already in that mode (%2x)\n",
                     ci->devname, loopValue);
     }
@@ -997,7 +997,7 @@ c4_set_port (ci_t * ci, int portnum)
     pi = &ci->port[portnum];
     pp = &ci->port[portnum].p;
     e1mode = IS_FRAME_ANY_E1 (pp->port_mode);
-    if (log_level >= LOG_MONITOR2)
+    if (cxt1e1_log_level >= LOG_MONITOR2)
     {
         pr_info("%s: c4_set_port[%d]:  entered, e1mode = %x, openchans %d.\n",
                 ci->devname,
@@ -1278,12 +1278,12 @@ c4_fifo_alloc (mpi_t * pi, int chan, int *len)
     }
     if (max != *len)
     {
-        if (log_level >= LOG_WARN)
+        if (cxt1e1_log_level >= LOG_WARN)
             pr_info("%s: wanted to allocate %d fifo space, but got only %d\n",
                     pi->up->devname, *len, max);
         *len = max;
     }
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("%s: allocated %d fifo at %d for channel %d/%d\n",
                 pi->up->devname, max, start, chan, pi->p.portnum);
     for (i = maxstart; i < (maxstart + max); i++)
@@ -1296,7 +1296,7 @@ c4_fifo_free (mpi_t * pi, int chan)
 {
     int         i;
 
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("%s: deallocated fifo for channel %d/%d\n",
                 pi->up->devname, chan, pi->p.portnum);
     for (i = 0; i < 32; i++)
@@ -1321,7 +1321,7 @@ c4_chan_up (ci_t * ci, int channum)
         return ENOENT;
     if (ch->state == UP)
     {
-        if (log_level >= LOG_MONITOR)
+        if (cxt1e1_log_level >= LOG_MONITOR)
             pr_info("%s: channel already UP, graceful early exit\n",
                     ci->devname);
         return 0;
@@ -1334,7 +1334,7 @@ c4_chan_up (ci_t * ci, int channum)
     {
         if (ch->p.bitmask[i] & pi->tsm[i])
         {
-            if (1 || log_level >= LOG_WARN)
+            if (1 || cxt1e1_log_level >= LOG_WARN)
             {
                 pr_info("%s: c4_chan_up[%d] EINVAL (attempt to cfg in-use or unavailable TimeSlot[%d])\n",
                         ci->devname, channum, i);
@@ -1351,7 +1351,7 @@ c4_chan_up (ci_t * ci, int channum)
     nbuf = nts / 8 ? nts / 8 : 1;
     if (!nbuf)
     {
-        /* if( log_level >= LOG_WARN)  */
+        /* if( cxt1e1_log_level >= LOG_WARN)  */
         pr_info("%s: c4_chan_up[%d] ENOBUFS (no TimeSlots assigned)\n",
                 ci->devname, channum);
         return ENOBUFS;             /* this should not happen */
@@ -1420,7 +1420,7 @@ c4_chan_up (ci_t * ci, int channum)
 
 #if 0
     /* DEBUG INFO */
-    if (log_level >= LOG_MONITOR)
+    if (cxt1e1_log_level >= LOG_MONITOR)
         pr_info("%s: mode %x rxnum %d (rxused %d def %d) txnum %d (txused %d def %d)\n",
                 ci->devname, ch->p.chan_mode,
                 rxnum, max_rxdesc_used, max_rxdesc_default,
@@ -1451,7 +1451,7 @@ c4_chan_up (ci_t * ci, int channum)
 
                if (!(m = OS_mem_token_alloc (cxt1e1_max_mru)))
         {
-            if (log_level >= LOG_MONITOR)
+            if (cxt1e1_log_level >= LOG_MONITOR)
                 pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n",
                                                ci->devname, channum, cxt1e1_max_mru);
             goto errfree;
diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h
index 5a72cb5cff42..501a331ded5b 100644
--- a/drivers/staging/cxt1e1/sbecom_inline_linux.h
+++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h
@@ -86,7 +86,7 @@ pci_read_32 (u_int32_t *p)
 
     FLUSH_PCI_READ ();
     v = le32_to_cpu (*p);
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("pci_read : %x = %x\n", (u_int32_t) p, v);
     return v;
 #else
@@ -99,7 +99,7 @@ static inline void
 pci_write_32 (u_int32_t *p, u_int32_t v)
 {
 #ifdef FLOW_DEBUG
-    if (log_level >= LOG_DEBUG)
+    if (cxt1e1_log_level >= LOG_DEBUG)
         pr_info("pci_write: %x = %x\n", (u_int32_t) p, v);
 #endif
     *p = cpu_to_le32 (v);
diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/easycap/Kconfig
index 9d5fe4ddc30a..bd96f39f2735 100644
--- a/drivers/staging/easycap/Kconfig
+++ b/drivers/staging/easycap/Kconfig
@@ -1,7 +1,6 @@
 config EASYCAP
         tristate "EasyCAP USB ID 05e1:0408 support"
         depends on USB && VIDEO_DEV
-        depends on BKL # please fix
 
         ---help---
           This is an integrated audio/video driver for EasyCAP cards with
diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile
index 8a3d911aee5d..f1f2fbebf8f6 100644
--- a/drivers/staging/easycap/Makefile
+++ b/drivers/staging/easycap/Makefile
@@ -10,4 +10,5 @@ ccflags-y := -Wall
 ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT
 ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H
 ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS
+ccflags-y += -DEASYCAP_NEEDS_UNLOCKED_IOCTL
 
diff --git a/drivers/staging/easycap/README b/drivers/staging/easycap/README
index 3775481f05e8..6b5ac0d34bd9 100644
--- a/drivers/staging/easycap/README
+++ b/drivers/staging/easycap/README
@@ -24,6 +24,9 @@ Two kinds of EasyCAP have this USB ID, namely:
 BUILD OPTIONS AND DEPENDENCIES
 ------------------------------
 
+Unless EASYCAP_DEBUG is defined during compilation it will not be possible
+to select a debug level at the time of module installation.
+
 If the parameter EASYCAP_IS_VIDEODEV_CLIENT is undefined during compilation
 the built module is entirely independent of the videodev module, and when
 the EasyCAP is physically plugged into a USB port the special files
@@ -33,41 +36,54 @@ respectively.
 If the parameter EASYCAP_IS_VIDEODEV_CLIENT is defined during compilation
 the built easycap module is configured to register with the videodev module,
 in which case the special files created when the EasyCAP is plugged in are
-/dev/video0 and /dev/easysnd0.  Use of the easycap module as a client of
-the videodev module has received very little testing as of June 2010.
+/dev/video0 and /dev/easysnd0.
+
+During in-tree builds the following should should be defined whenever the
+parameter EASYCAP_IS_VIDEODEV_CLIENT is defined:
+
+EASYCAP_NEEDS_V4L2_DEVICE_H
+EASYCAP_NEEDS_V4L2_FOPS
+EASYCAP_NEEDS_UNLOCKED_IOCTL
+
+If the build is performed out-of-tree against older kernels the parameters
+to be defined depend on the kernel version in a way which will not be
+discussed here.
 
 
-KNOWN BUILD PROBLEMS
+KNOWN RUNTIME ISSUES
 --------------------
 
-(1) Recent gcc versions may generate the message:
+(1) Intentionally, this driver will not stream material which is unambiguously
+identified by the hardware as copy-protected.  Normal video output will be
+present for about a minute but will then freeze when this situation arises.
 
-     warning: the frame size of .... bytes is larger than 1024 bytes
+(2) The controls for luminance, contrast, saturation, hue and volume may not
+always work properly.
 
-This warning can be suppressed by specifying in the Makefile:
+(3) Reduced-resolution S-Video seems to suffer from moire artefacts.
 
-     EXTRA_CFLAGS += -Wframe-larger-than=8192
 
-but it would be preferable to remove the cause of the warning.
+INPUT NUMBERING
+---------------
 
+For the EasyCAP with S-VIDEO input cable the driver regards a request for
+inputs numbered 0 or 1 as referring to CVBS and a request for input
+numbered 5 as referring to S-VIDEO.
 
-KNOWN RUNTIME ISSUES
---------------------
+For the EasyCAP with four CVBS inputs the driver expects to be asked for
+any one of inputs numbered 1,2,3,4.  If input 0 is asked for, it is
+interpreted as input 1.
 
-(1) Randomly (maybe 5 to 10% of occasions) the driver fails to produce any
-output at start-up.  Closing mplayer (or whatever the user program is) and
-restarting it restores normal performance without any other remedial action
-being necessary.  The reason for this is not known.
 
-(2) Intentionally, this driver will not stream material which is unambiguously
-identified by the hardware as copy-protected.  The video output will freeze
-within about a minute when this situation arises.
+MODULE PARAMETERS
+-----------------
 
-(3) The controls for luminance, contrast, saturation, hue and volume may not
-always work properly.
+Three module parameters are defined:
 
-(4) Reduced-resolution S-Video seems to suffer from moire artefacts.  No
-attempt has yet been made to rememdy this.
+debug      the easycap module is configured at diagnostic level n (0 to 9)
+gain       audio gain level n (0 to 31, default is 16)
+bars       0 =>  testcard bars when incoming video signal is lost
+           1 =>  testcard bars when incoming video signal is lost (default)
 
 
 SUPPORTED TV STANDARDS AND RESOLUTIONS
@@ -82,18 +98,29 @@ usable as (for example) the "norm=" parameter in the mplayer command:
     PAL_60,       NTSC_443,
     PAL_M.
 
+In addition, the driver offers "custom" pseudo-standards with a framerate
+which is 20% of the usual framerate.  These pseudo-standards are named:
+
+    PAL_BGHIN_SLOW,    NTSC_N_443_SLOW,
+    PAL_Nc_SLOW,       NTSC_N_SLOW,
+    SECAM_SLOW,        NTSC_M_SLOW,        NTSC_M_JP_SLOW,
+    PAL_60_SLOW,       NTSC_443_SLOW,
+    PAL_M_SLOW.
+
+
 The available picture sizes are:
 
      at 25 frames per second:   720x576, 704x576, 640x480, 360x288, 320x240;
-     at 30 frames per second:   720x480, 640x480, 360x240, 320x240;
+     at 30 frames per second:   720x480, 640x480, 360x240, 320x240.
 
 
 WHAT'S TESTED AND WHAT'S NOT
 ----------------------------
 
-This driver is known to work with mplayer, mencoder, tvtime and sufficiently
-recent versions of vlc.  An interface to ffmpeg is implemented, but serious
-audio-video synchronization problems remain.
+This driver is known to work with mplayer, mencoder, tvtime, zoneminder,
+xawtv, gstreamer and sufficiently recent versions of vlc.  An interface
+to ffmpeg is implemented, but serious audio-video synchronization problems
+remain.
 
 The driver is designed to support all the TV standards accepted by the
 hardware, but as yet it has actually been tested on only a few of these.
@@ -101,10 +128,7 @@ hardware, but as yet it has actually been tested on only a few of these.
 I have been unable to test and calibrate the S-video input myself because I
 do not possess any equipment with S-video output.
 
-This driver does not understand the V4L1 IOCTL commands, so programs such
-as camorama are not compatible.  There are reports that the driver does
-work with sufficiently recent (V4L2) versions of zoneminder, but I have not
-attempted to confirm this myself.
+This driver does not understand the V4L1 IOCTL commands.
 
 
 UDEV RULES
@@ -120,6 +144,17 @@ ATTRS{idVendor}=="05e1", ATTRS{idProduct}=="0408", \
 LABEL="easycap_rules_end"
 
 
+MODPROBE CONFIGURATION
+----------------------
+
+The easycap module is in competition with the module snd-usb-audio for the
+EasyCAP's audio channel, and its installation can be aided by providing a
+file in directory /etc/modprobe.d with content:
+
+options easycap  gain=16 bars=1
+install easycap /sbin/rmmod snd-usb-audio; /sbin/modprobe --ignore-install easycap
+
+
 ACKNOWLEGEMENTS AND REFERENCES
 ------------------------------
 This driver makes use of information contained in the Syntek Semicon DC-1125
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index 884263b2775d..8ebf96f8a242 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
@@ -33,6 +33,7 @@
  *                EASYCAP_NEEDS_USBVIDEO_H
  *                EASYCAP_NEEDS_V4L2_DEVICE_H
  *                EASYCAP_NEEDS_V4L2_FOPS
+ *                EASYCAP_NEEDS_UNLOCKED_IOCTL
  *
  *  IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER
  *  OPTIONS.
@@ -42,35 +43,24 @@
 #if (!defined(EASYCAP_H))
 #define EASYCAP_H
 
-#if defined(EASYCAP_DEBUG)
-#if (9 < EASYCAP_DEBUG)
-#error Debug levels 0 to 9 are okay.\
-  To achieve higher levels, remove this trap manually from easycap.h
-#endif
-#endif /*EASYCAP_DEBUG*/
+/*---------------------------------------------------------------------------*/
+/*
+ *  THESE ARE NORMALLY DEFINED
+ */
+/*---------------------------------------------------------------------------*/
+#define  PATIENCE  500
+#undef   PREFER_NTSC
+#define  PERSEVERE
 /*---------------------------------------------------------------------------*/
 /*
  *  THESE ARE FOR MAINTENANCE ONLY - NORMALLY UNDEFINED:
  */
 /*---------------------------------------------------------------------------*/
-#undef  PREFER_NTSC
 #undef  EASYCAP_TESTCARD
 #undef  EASYCAP_TESTTONE
-#undef  LOCKFRAME
 #undef  NOREADBACK
 #undef  AUDIOTIME
 /*---------------------------------------------------------------------------*/
-/*
- *
- *  DEFINE   BRIDGER   TO ACTIVATE THE ROUTINE FOR BRIDGING VIDEOTAPE DROPOUTS.
- *
- *             *** UNDER DEVELOPMENT/TESTING - NOT READY YET!***
- *
- */
-/*---------------------------------------------------------------------------*/
-#undef  BRIDGER
-/*---------------------------------------------------------------------------*/
-
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -92,25 +82,14 @@
 
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #if defined(EASYCAP_IS_VIDEODEV_CLIENT)
-#if (!defined(__OLD_VIDIOC_))
-#define __OLD_VIDIOC_
-#endif /* !defined(__OLD_VIDIOC_) */
-
 #include <media/v4l2-dev.h>
-
 #if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
 #include <media/v4l2-device.h>
 #endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
 /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
-
-#if (!defined(__OLD_VIDIOC_))
-#define __OLD_VIDIOC_
-#endif /* !defined(__OLD_VIDIOC_) */
 #include <linux/videodev2.h>
-
 #include <linux/soundcard.h>
-
 #if defined(EASYCAP_NEEDS_USBVIDEO_H)
 #include <config/video/usbvideo.h>
 #endif /*EASYCAP_NEEDS_USBVIDEO_H*/
@@ -121,7 +100,6 @@
 
 #define STRINGIZE_AGAIN(x) #x
 #define STRINGIZE(x) STRINGIZE_AGAIN(x)
-
 /*---------------------------------------------------------------------------*/
 /*  VENDOR, PRODUCT:  Syntek Semiconductor Co., Ltd
  *
@@ -135,12 +113,12 @@
 #define USB_EASYCAP_VENDOR_ID   0x05e1
 #define USB_EASYCAP_PRODUCT_ID  0x0408
 
-#define EASYCAP_DRIVER_VERSION "0.8.21"
+#define EASYCAP_DRIVER_VERSION "0.8.41"
 #define EASYCAP_DRIVER_DESCRIPTION "easycapdc60"
 
 #define USB_SKEL_MINOR_BASE     192
-#define VIDEO_DEVICE_MANY 8
-
+#define DONGLE_MANY 8
+#define INPUT_MANY 6
 /*---------------------------------------------------------------------------*/
 /*
  *  DEFAULT LUMINANCE, CONTRAST, SATURATION AND HUE
@@ -164,6 +142,8 @@
 #if (USB_2_0_MAXPACKETSIZE > PAGE_SIZE)
 #error video_isoc_buffer[.] will not be big enough
 #endif
+#define VIDEO_JUNK_TOLERATE VIDEO_ISOC_BUFFER_MANY
+#define VIDEO_LOST_TOLERATE 50
 /*---------------------------------------------------------------------------*/
 /*
  *  VIDEO BUFFERS
@@ -210,7 +190,17 @@
 #define  NTSC_M_JP      5
 #define  PAL_60         7
 #define  PAL_M          9
-#define  STANDARD_MANY 10
+#define  PAL_BGHIN_SLOW    10
+#define  PAL_Nc_SLOW       12
+#define  SECAM_SLOW        14
+#define  NTSC_N_SLOW       16
+#define  NTSC_N_443_SLOW   18
+#define  NTSC_M_SLOW       11
+#define  NTSC_443_SLOW     13
+#define  NTSC_M_JP_SLOW    15
+#define  PAL_60_SLOW       17
+#define  PAL_M_SLOW        19
+#define  STANDARD_MANY 20
 /*---------------------------------------------------------------------------*/
 /*
  *  ENUMS
@@ -238,7 +228,6 @@ PIXELFORMAT_MANY
 enum {
 FIELD_NONE,
 FIELD_INTERLACED,
-FIELD_ALTERNATE,
 INTERLACE_MANY
 };
 #define SETTINGS_MANY   (STANDARD_MANY * \
@@ -251,11 +240,18 @@ INTERLACE_MANY
  *  STRUCTURE DEFINITIONS
  */
 /*---------------------------------------------------------------------------*/
+struct easycap_dongle {
+struct easycap *peasycap;
+struct mutex mutex_video;
+struct mutex mutex_audio;
+};
+/*---------------------------------------------------------------------------*/
 struct data_buffer {
 struct list_head list_head;
 void *pgo;
 void *pto;
 __u16 kount;
+__u16 input;
 };
 /*---------------------------------------------------------------------------*/
 struct data_urb {
@@ -274,6 +270,22 @@ __u16 mask;
 char name[128];
 struct v4l2_format v4l2_format;
 };
+struct inputset {
+int input;
+int input_ok;
+int standard_offset;
+int standard_offset_ok;
+int format_offset;
+int format_offset_ok;
+int brightness;
+int brightness_ok;
+int contrast;
+int contrast_ok;
+int saturation;
+int saturation_ok;
+int hue;
+int hue_ok;
+};
 /*---------------------------------------------------------------------------*/
 /*
  *   easycap.ilk == 0   =>  CVBS+S-VIDEO HARDWARE, AUDIO wMaxPacketSize=256
@@ -282,6 +294,19 @@ struct v4l2_format v4l2_format;
  */
 /*---------------------------------------------------------------------------*/
 struct easycap {
+#define TELLTALE "expectedstring"
+char telltale[16];
+int isdongle;
+
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if defined(EASYCAP_IS_VIDEODEV_CLIENT)
+struct video_device video_device;
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+struct v4l2_device v4l2_device;
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+int status;
 unsigned int audio_pages_per_fragment;
 unsigned int audio_bytes_per_fragment;
 unsigned int audio_buffer_page_many;
@@ -291,26 +316,14 @@ unsigned int audio_buffer_page_many;
 __s16 oldaudio;
 #endif /*UPSAMPLE*/
 
-struct easycap_format easycap_format[1 + SETTINGS_MANY];
-
 int ilk;
 bool microphone;
 
-/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
-#if defined(EASYCAP_IS_VIDEODEV_CLIENT)
-struct video_device *pvideo_device;
-#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
-
 struct usb_device *pusb_device;
 struct usb_interface *pusb_interface;
 
 struct kref kref;
 
-struct mutex mutex_mmap_video[FRAME_BUFFER_MANY];
-struct mutex mutex_timeval0;
-struct mutex mutex_timeval1;
-
 int queued[FRAME_BUFFER_MANY];
 int done[FRAME_BUFFER_MANY];
 
@@ -321,16 +334,24 @@ int input;
 int polled;
 int standard_offset;
 int format_offset;
+struct inputset inputset[INPUT_MANY];
 
+bool ntsc;
 int fps;
 int usec;
 int tolerate;
+int skip;
+int skipped;
+int lost[INPUT_MANY];
 int merit[180];
 
 struct timeval timeval0;
 struct timeval timeval1;
 struct timeval timeval2;
+struct timeval timeval3;
+struct timeval timeval6;
 struct timeval timeval7;
+struct timeval timeval8;
 long long int dnbydt;
 
 int    video_interface;
@@ -347,8 +368,6 @@ int    video_idle;
 int    video_eof;
 int    video_junk;
 
-int    fudge;
-
 struct data_buffer video_isoc_buffer[VIDEO_ISOC_BUFFER_MANY];
 struct data_buffer \
              field_buffer[FIELD_BUFFER_MANY][(FIELD_BUFFER_SIZE/PAGE_SIZE)];
@@ -358,6 +377,13 @@ struct data_buffer \
 struct list_head urb_video_head;
 struct list_head *purb_video_head;
 
+__u8 cache[8];
+__u8 *pcache;
+int video_mt;
+int audio_mt;
+long long audio_bytes;
+__u32 isequence;
+
 int vma_many;
 
 /*---------------------------------------------------------------------------*/
@@ -383,7 +409,6 @@ int frame_lock;		/* Flag set to 1 by DQBUF and cleared by QBUF        */
  */
 /*---------------------------------------------------------------------------*/
 __u32                   pixelformat;
-__u32                   field;
 int                     width;
 int                     height;
 int                     bytesperpixel;
@@ -463,8 +488,10 @@ struct data_buffer audio_buffer[];
 void             easycap_complete(struct urb *);
 int              easycap_open(struct inode *, struct file *);
 int              easycap_release(struct inode *, struct file *);
-long             easycap_ioctl(struct file *, unsigned int,  unsigned long);
-
+long             easycap_ioctl_noinode(struct file *, unsigned int, \
+                                                                unsigned long);
+int              easycap_ioctl(struct inode *, struct file *, unsigned int, \
+                                                                unsigned long);
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #if defined(EASYCAP_IS_VIDEODEV_CLIENT)
 int              easycap_open_noinode(struct file *);
@@ -489,12 +516,10 @@ int              kill_video_urbs(struct easycap *);
 int              field2frame(struct easycap *);
 int              redaub(struct easycap *, void *, void *, \
                                                 int, int, __u8, __u8, bool);
-void             debrief(struct easycap *);
-void             sayreadonly(struct easycap *);
 void             easycap_testcard(struct easycap *, int);
-int              explain_ioctl(__u32);
-int              explain_cid(__u32);
 int              fillin_formats(void);
+int              reset(struct easycap *);
+int              newinput(struct easycap *, int);
 int              adjust_standard(struct easycap *, v4l2_std_id);
 int              adjust_format(struct easycap *, __u32, __u32, __u32, \
                                                                 int, bool);
@@ -512,7 +537,10 @@ void             easysnd_complete(struct urb *);
 ssize_t          easysnd_read(struct file *, char __user *, size_t, loff_t *);
 int              easysnd_open(struct inode *, struct file *);
 int              easysnd_release(struct inode *, struct file *);
-long             easysnd_ioctl(struct file *, unsigned int,  unsigned long);
+long             easysnd_ioctl_noinode(struct file *, unsigned int, \
+                                                                unsigned long);
+int              easysnd_ioctl(struct inode *, struct file *, unsigned int, \
+                                                                unsigned long);
 unsigned int     easysnd_poll(struct file *, poll_table *);
 void             easysnd_delete(struct kref *);
 int              submit_audio_urbs(struct easycap *);
@@ -532,11 +560,11 @@ int              wakeup_device(struct usb_device *);
 int              confirm_resolution(struct usb_device *);
 int              confirm_stream(struct usb_device *);
 
-int              setup_stk(struct usb_device *);
-int              setup_saa(struct usb_device *);
+int              setup_stk(struct usb_device *, bool);
+int              setup_saa(struct usb_device *, bool);
 int              setup_vt(struct usb_device *);
-int              check_stk(struct usb_device *);
-int              check_saa(struct usb_device *);
+int              check_stk(struct usb_device *, bool);
+int              check_saa(struct usb_device *, bool);
 int              ready_saa(struct usb_device *);
 int              merit_saa(struct usb_device *);
 int              check_vt(struct usb_device *);
@@ -554,12 +582,9 @@ int              stop_100(struct usb_device *);
 int              write_300(struct usb_device *);
 int              read_vt(struct usb_device *, __u16);
 int              write_vt(struct usb_device *, __u16, __u16);
-
-int              set2to78(struct usb_device *);
-int              set2to93(struct usb_device *);
-
 int              regset(struct usb_device *, __u16, __u16);
 int              regget(struct usb_device *, __u16, void *);
+int             isdongle(struct easycap *);
 /*---------------------------------------------------------------------------*/
 struct signed_div_result {
 long long int quotient;
@@ -587,24 +612,41 @@ unsigned long long int remainder;
         } \
 } while (0)
 /*---------------------------------------------------------------------------*/
-
+/*
+ *  MACROS SAM(...) AND JOM(...) ALLOW DIAGNOSTIC OUTPUT TO BE TAGGED WITH
+ *  THE IDENTITY OF THE DONGLE TO WHICH IT APPLIES, BUT IF INVOKED WHEN THE
+ *  POINTER peasycap IS INVALID AN Oops IS LIKELY, AND ITS CAUSE MAY NOT BE
+ *  IMMEDIATELY OBVIOUS FROM A CASUAL READING OF THE SOURCE CODE.  BEWARE.
+*/
+/*---------------------------------------------------------------------------*/
 #define SAY(format, args...) do { \
-        printk(KERN_DEBUG "easycap: %s: " format, __func__, ##args); \
+        printk(KERN_DEBUG "easycap:: %s: " \
+                        format, __func__, ##args); \
+} while (0)
+#define SAM(format, args...) do { \
+        printk(KERN_DEBUG "easycap::%i%s: " \
+                        format, peasycap->isdongle, __func__, ##args);\
 } while (0)
-
 
 #if defined(EASYCAP_DEBUG)
 #define JOT(n, format, args...) do { \
         if (n <= easycap_debug) { \
-                printk(KERN_DEBUG "easycap: %s: " format, __func__, ##args); \
+                printk(KERN_DEBUG "easycap:: %s: " \
+                        format, __func__, ##args);\
         } \
 } while (0)
+#define JOM(n, format, args...) do { \
+        if (n <= easycap_debug) { \
+                printk(KERN_DEBUG "easycap::%i%s: " \
+                        format, peasycap->isdongle, __func__, ##args);\
+        } \
+} while (0)
+
 #else
 #define JOT(n, format, args...) do {} while (0)
+#define JOM(n, format, args...) do {} while (0)
 #endif /*EASYCAP_DEBUG*/
 
-#define POUT JOT(8, ":-(in file %s line %4i\n", __FILE__, __LINE__)
-
 #define MICROSECONDS(X, Y) \
                         ((1000000*((long long int)(X.tv_sec - Y.tv_sec))) + \
                                         (long long int)(X.tv_usec - Y.tv_usec))
diff --git a/drivers/staging/easycap/easycap_debug.h b/drivers/staging/easycap/easycap_debug.h
index 1d10d7ea7d68..b6b571843125 100644
--- a/drivers/staging/easycap/easycap_debug.h
+++ b/drivers/staging/easycap/easycap_debug.h
@@ -25,3 +25,5 @@
 */
 /*****************************************************************************/
 extern int easycap_debug;
+extern int easycap_gain;
+extern struct easycap_dongle easycap_dongle[];
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c
index 9a42ae02cd5d..447953a4e80c 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@ -36,53 +36,101 @@
  *  UNLESS THERE IS A PREMATURE ERROR RETURN THIS ROUTINE UPDATES THE
  *  FOLLOWING:
  *          peasycap->standard_offset
+ *          peasycap->inputset[peasycap->input].standard_offset
  *          peasycap->fps
  *          peasycap->usec
  *          peasycap->tolerate
+ *          peasycap->skip
  */
 /*---------------------------------------------------------------------------*/
 int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id)
 {
 struct easycap_standard const *peasycap_standard;
 __u16 reg, set;
-int ir, rc, need;
+int ir, rc, need, k;
 unsigned int itwas, isnow;
+bool resubmit;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 peasycap_standard = &easycap_standard[0];
 while (0xFFFF != peasycap_standard->mask) {
-        if (std_id & peasycap_standard->v4l2_standard.id)
+        if (std_id == peasycap_standard->v4l2_standard.id)
                 break;
         peasycap_standard++;
 }
 if (0xFFFF == peasycap_standard->mask) {
-        SAY("ERROR: 0x%08X=std_id: standard not found\n", \
+        peasycap_standard = &easycap_standard[0];
+        while (0xFFFF != peasycap_standard->mask) {
+                if (std_id & peasycap_standard->v4l2_standard.id)
+                        break;
+                peasycap_standard++;
+        }
+}
+if (0xFFFF == peasycap_standard->mask) {
+        SAM("ERROR: 0x%08X=std_id: standard not found\n", \
                                                         (unsigned int)std_id);
         return -EINVAL;
 }
-SAY("user requests standard: %s\n", \
+SAM("selected standard: %s\n", \
                         &(peasycap_standard->v4l2_standard.name[0]));
 if (peasycap->standard_offset == \
                         (int)(peasycap_standard - &easycap_standard[0])) {
-        SAY("requested standard already in effect\n");
+        SAM("requested standard already in effect\n");
         return 0;
 }
 peasycap->standard_offset = (int)(peasycap_standard - &easycap_standard[0]);
+for (k = 0; k < INPUT_MANY;  k++) {
+        if (!peasycap->inputset[k].standard_offset_ok) {
+                        peasycap->inputset[k].standard_offset = \
+                                                peasycap->standard_offset;
+        }
+}
+if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+        peasycap->inputset[peasycap->input].standard_offset = \
+                                                peasycap->standard_offset;
+        peasycap->inputset[peasycap->input].standard_offset_ok = 1;
+} else
+        JOM(8, "%i=peasycap->input\n", peasycap->input);
 peasycap->fps = peasycap_standard->v4l2_standard.frameperiod.denominator / \
                 peasycap_standard->v4l2_standard.frameperiod.numerator;
-if (!peasycap->fps) {
-        SAY("MISTAKE: frames-per-second is zero\n");
-        return -EFAULT;
+switch (peasycap->fps) {
+case 6:
+case 30: {
+        peasycap->ntsc = true;
+        break;
 }
-JOT(8, "%i frames-per-second\n", peasycap->fps);
-peasycap->usec = 1000000 / (2 * peasycap->fps);
-peasycap->tolerate = 1000 * (25 / peasycap->fps);
-
-kill_video_urbs(peasycap);
-
+case 5:
+case 25: {
+        peasycap->ntsc = false;
+        break;
+}
+default: {
+        SAM("MISTAKE: %i=frames-per-second\n", peasycap->fps);
+        return -ENOENT;
+}
+}
+JOM(8, "%i frames-per-second\n", peasycap->fps);
+if (0x8000 & peasycap_standard->mask) {
+        peasycap->skip = 5;
+        peasycap->usec = 1000000 / (2 * (5 * peasycap->fps));
+        peasycap->tolerate = 1000 * (25 / (5 * peasycap->fps));
+} else {
+        peasycap->skip = 0;
+        peasycap->usec = 1000000 / (2 * peasycap->fps);
+        peasycap->tolerate = 1000 * (25 / peasycap->fps);
+}
+if (peasycap->video_isoc_streaming) {
+        resubmit = true;
+        kill_video_urbs(peasycap);
+} else
+        resubmit = false;
 /*--------------------------------------------------------------------------*/
 /*
  *  SAA7113H DATASHEET PAGE 44, TABLE 42
@@ -94,55 +142,41 @@ case NTSC_M_JP: {
         reg = 0x0A;  set = 0x95;
         ir = read_saa(peasycap->pusb_device, reg);
         if (0 > ir)
-                SAY("ERROR: cannot read SAA register 0x%02X\n", reg);
+                SAM("ERROR: cannot read SAA register 0x%02X\n", reg);
         else
                 itwas = (unsigned int)ir;
-
-
-        set2to78(peasycap->pusb_device);
-
-
         rc = write_saa(peasycap->pusb_device, reg, set);
         if (0 != rc)
-                SAY("ERROR: failed to set SAA register " \
+                SAM("ERROR: failed to set SAA register " \
                         "0x%02X to 0x%02X for JP standard\n", reg, set);
         else {
                 isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
                 if (0 > ir)
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "to 0x%02X\n", reg, isnow);
                 else
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
-
-                set2to78(peasycap->pusb_device);
-
         }
 
         reg = 0x0B;  set = 0x48;
         ir = read_saa(peasycap->pusb_device, reg);
         if (0 > ir)
-                SAY("ERROR: cannot read SAA register 0x%02X\n", reg);
+                SAM("ERROR: cannot read SAA register 0x%02X\n", reg);
         else
                 itwas = (unsigned int)ir;
-
-        set2to78(peasycap->pusb_device);
-
         rc = write_saa(peasycap->pusb_device, reg, set);
         if (0 != rc)
-                SAY("ERROR: failed to set SAA register 0x%02X to 0x%02X " \
+                SAM("ERROR: failed to set SAA register 0x%02X to 0x%02X " \
                                                 "for JP standard\n", reg, set);
         else {
                 isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
                 if (0 > ir)
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "to 0x%02X\n", reg, isnow);
                 else
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
-
-                set2to78(peasycap->pusb_device);
-
         }
 /*--------------------------------------------------------------------------*/
 /*
@@ -176,23 +210,20 @@ default:
 if (need) {
         ir = read_saa(peasycap->pusb_device, reg);
         if (0 > ir)
-                SAY("ERROR: failed to read SAA register 0x%02X\n", reg);
+                SAM("ERROR: failed to read SAA register 0x%02X\n", reg);
         else
                 itwas = (unsigned int)ir;
-
-        set2to78(peasycap->pusb_device);
-
         rc = write_saa(peasycap->pusb_device, reg, set);
         if (0 != write_saa(peasycap->pusb_device, reg, set)) {
-                SAY("ERROR: failed to set SAA register " \
+                SAM("ERROR: failed to set SAA register " \
                         "0x%02X to 0x%02X for table 42\n", reg, set);
         } else {
                 isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
                 if (0 > ir)
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "to 0x%02X\n", reg, isnow);
                 else
-                        JOT(8, "SAA register 0x%02X changed " \
+                        JOM(8, "SAA register 0x%02X changed " \
                                 "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
         }
 }
@@ -204,7 +235,7 @@ if (need) {
 reg = 0x08;
 ir = read_saa(peasycap->pusb_device, reg);
 if (0 > ir)
-        SAY("ERROR: failed to read SAA register 0x%02X " \
+        SAM("ERROR: failed to read SAA register 0x%02X " \
                                                 "so cannot reset\n", reg);
 else {
         itwas = (unsigned int)ir;
@@ -212,19 +243,18 @@ else {
                 set = itwas | 0x40 ;
         else
                 set = itwas & ~0x40 ;
-
-set2to78(peasycap->pusb_device);
-
-rc  = write_saa(peasycap->pusb_device, reg, set);
-if (0 != rc)
-        SAY("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", reg, set);
-else {
-        isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
-        if (0 > ir)
-                JOT(8, "SAA register 0x%02X changed to 0x%02X\n", reg, isnow);
-        else
-                JOT(8, "SAA register 0x%02X changed " \
-                        "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
+        rc  = write_saa(peasycap->pusb_device, reg, set);
+        if (0 != rc)
+                SAM("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", \
+                                                                reg, set);
+        else {
+                isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
+                if (0 > ir)
+                        JOM(8, "SAA register 0x%02X changed to 0x%02X\n", \
+                                                                reg, isnow);
+                else
+                        JOM(8, "SAA register 0x%02X changed " \
+                                "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
         }
 }
 /*--------------------------------------------------------------------------*/
@@ -235,7 +265,7 @@ else {
 reg = 0x40;
 ir = read_saa(peasycap->pusb_device, reg);
 if (0 > ir)
-        SAY("ERROR: failed to read SAA register 0x%02X " \
+        SAM("ERROR: failed to read SAA register 0x%02X " \
                                                 "so cannot reset\n", reg);
 else {
         itwas = (unsigned int)ir;
@@ -243,19 +273,18 @@ else {
                 set = itwas | 0x80 ;
         else
                 set = itwas & ~0x80 ;
-
-set2to78(peasycap->pusb_device);
-
-rc = write_saa(peasycap->pusb_device, reg, set);
-if (0 != rc)
-        SAY("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", reg, set);
-else {
-        isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
-        if (0 > ir)
-                JOT(8, "SAA register 0x%02X changed to 0x%02X\n", reg, isnow);
-        else
-                JOT(8, "SAA register 0x%02X changed " \
-                        "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
+        rc = write_saa(peasycap->pusb_device, reg, set);
+        if (0 != rc)
+                SAM("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", \
+                                                                reg, set);
+        else {
+                isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
+                if (0 > ir)
+                        JOM(8, "SAA register 0x%02X changed to 0x%02X\n", \
+                                                                reg, isnow);
+                else
+                        JOM(8, "SAA register 0x%02X changed " \
+                                "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
         }
 }
 /*--------------------------------------------------------------------------*/
@@ -266,41 +295,39 @@ else {
 reg = 0x5A;
 ir = read_saa(peasycap->pusb_device, reg);
 if (0 > ir)
-        SAY("ERROR: failed to read SAA register 0x%02X but continuing\n", reg);
+        SAM("ERROR: failed to read SAA register 0x%02X but continuing\n", reg);
         itwas = (unsigned int)ir;
         if (peasycap_standard->mask & 0x0001)
                 set = 0x0A ;
         else
                 set = 0x07 ;
-
-        set2to78(peasycap->pusb_device);
-
         if (0 != write_saa(peasycap->pusb_device, reg, set))
-                SAY("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", \
+                SAM("ERROR: failed to set SAA register 0x%02X to 0x%02X\n", \
                                                                 reg, set);
         else {
                 isnow = (unsigned int)read_saa(peasycap->pusb_device, reg);
                 if (0 > ir)
-                        JOT(8, "SAA register 0x%02X changed "
+                        JOM(8, "SAA register 0x%02X changed "
                                 "to 0x%02X\n", reg, isnow);
                 else
-                        JOT(8, "SAA register 0x%02X changed "
+                        JOM(8, "SAA register 0x%02X changed "
                                 "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
         }
-        if (0 != check_saa(peasycap->pusb_device))
-                SAY("ERROR: check_saa() failed\n");
+if (true == resubmit)
+        submit_video_urbs(peasycap);
 return 0;
 }
 /*****************************************************************************/
 /*--------------------------------------------------------------------------*/
 /*
- *  THE ALGORITHM FOR RESPONDING TO THE VIDIO_S_FMT IOCTL DEPENDS ON THE
- *  CURRENT VALUE OF peasycap->standard_offset.
+ *  THE ALGORITHM FOR RESPONDING TO THE VIDIO_S_FMT IOCTL REQUIRES
+ *  A VALID VALUE OF peasycap->standard_offset, OTHERWISE -EBUSY IS RETURNED.
+ *
  *  PROVIDED THE ARGUMENT try IS false AND THERE IS NO PREMATURE ERROR RETURN
  *  THIS ROUTINE UPDATES THE FOLLOWING:
  *          peasycap->format_offset
+ *          peasycap->inputset[peasycap->input].format_offset
  *          peasycap->pixelformat
- *          peasycap->field
  *          peasycap->height
  *          peasycap->width
  *          peasycap->bytesperpixel
@@ -321,39 +348,93 @@ int adjust_format(struct easycap *peasycap, \
 struct easycap_format *peasycap_format, *peasycap_best_format;
 __u16 mask;
 struct usb_device *p;
-int miss, multiplier, best;
-char bf[5], *pc;
+int miss, multiplier, best, k;
+char bf[5], fo[32], *pc;
 __u32 uc;
+bool resubmit;
 
-if ((struct easycap *)NULL == peasycap) {
+if (NULL == peasycap) {
         SAY("ERROR: peasycap is NULL\n");
         return -EFAULT;
 }
+if (0 > peasycap->standard_offset) {
+        JOM(8, "%i=peasycap->standard_offset\n", peasycap->standard_offset);
+        return -EBUSY;
+}
 p = peasycap->pusb_device;
 if ((struct usb_device *)NULL == p) {
-        SAY("ERROR: peaycap->pusb_device is NULL\n");
+        SAM("ERROR: peaycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 pc = &bf[0];
-uc = pixelformat;  memcpy((void *)pc, (void *)(&uc), 4);  bf[4] = 0;
-mask = easycap_standard[peasycap->standard_offset].mask;
-SAY("sought:    %ix%i,%s(0x%08X),%i=field,0x%02X=std mask\n", \
+uc = pixelformat;
+memcpy((void *)pc, (void *)(&uc), 4);
+bf[4] = 0;
+mask = 0xFF & easycap_standard[peasycap->standard_offset].mask;
+SAM("sought:    %ix%i,%s(0x%08X),%i=field,0x%02X=std mask\n", \
                                 width, height, pc, pixelformat, field, mask);
+switch (field) {
+case V4L2_FIELD_ANY: {
+        strcpy(&fo[0], "V4L2_FIELD_ANY ");
+        break;
+}
+case V4L2_FIELD_NONE: {
+        strcpy(&fo[0], "V4L2_FIELD_NONE");
+        break;
+}
+case V4L2_FIELD_TOP: {
+        strcpy(&fo[0], "V4L2_FIELD_TOP");
+        break;
+}
+case V4L2_FIELD_BOTTOM: {
+        strcpy(&fo[0], "V4L2_FIELD_BOTTOM");
+        break;
+}
+case V4L2_FIELD_INTERLACED: {
+        strcpy(&fo[0], "V4L2_FIELD_INTERLACED");
+        break;
+}
+case V4L2_FIELD_SEQ_TB: {
+        strcpy(&fo[0], "V4L2_FIELD_SEQ_TB");
+        break;
+}
+case V4L2_FIELD_SEQ_BT: {
+        strcpy(&fo[0], "V4L2_FIELD_SEQ_BT");
+        break;
+}
+case V4L2_FIELD_ALTERNATE: {
+        strcpy(&fo[0], "V4L2_FIELD_ALTERNATE");
+        break;
+}
+case V4L2_FIELD_INTERLACED_TB: {
+        strcpy(&fo[0], "V4L2_FIELD_INTERLACED_TB");
+        break;
+}
+case V4L2_FIELD_INTERLACED_BT: {
+        strcpy(&fo[0], "V4L2_FIELD_INTERLACED_BT");
+        break;
+}
+default: {
+        strcpy(&fo[0], "V4L2_FIELD_... UNKNOWN  ");
+        break;
+}
+}
+SAM("sought:    %s\n", &fo[0]);
 if (V4L2_FIELD_ANY == field) {
-        field = V4L2_FIELD_INTERLACED;
-        SAY("prefer:    V4L2_FIELD_INTERLACED=field, was V4L2_FIELD_ANY\n");
+        field = V4L2_FIELD_NONE;
+        SAM("prefer:    V4L2_FIELD_NONE=field, was V4L2_FIELD_ANY\n");
 }
 peasycap_best_format = (struct easycap_format *)NULL;
 peasycap_format = &easycap_format[0];
 while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
-        JOT(16, ".> %i %i 0x%08X %ix%i\n", \
+        JOM(16, ".> %i %i 0x%08X %ix%i\n", \
                 peasycap_format->mask & 0x01,
                 peasycap_format->v4l2_format.fmt.pix.field,
                 peasycap_format->v4l2_format.fmt.pix.pixelformat,
                 peasycap_format->v4l2_format.fmt.pix.width,
                 peasycap_format->v4l2_format.fmt.pix.height);
 
-        if (((peasycap_format->mask & 0x0F) == (mask & 0x0F)) && \
+        if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) && \
                 (peasycap_format->v4l2_format.fmt.pix.field == field) && \
                 (peasycap_format->v4l2_format.fmt.pix.pixelformat == \
                                                         pixelformat) && \
@@ -365,11 +446,11 @@ while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
         peasycap_format++;
 }
 if (0 == peasycap_format->v4l2_format.fmt.pix.width) {
-        SAY("cannot do: %ix%i with standard mask 0x%02X\n", \
+        SAM("cannot do: %ix%i with standard mask 0x%02X\n", \
                                                         width, height, mask);
         peasycap_format = &easycap_format[0];  best = -1;
         while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
-                if (((peasycap_format->mask & 0x0F) == (mask & 0x0F)) && \
+                if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) && \
                                  (peasycap_format->v4l2_format.fmt.pix\
                                                 .field == field) && \
                                  (peasycap_format->v4l2_format.fmt.pix\
@@ -386,16 +467,16 @@ if (0 == peasycap_format->v4l2_format.fmt.pix.width) {
                 peasycap_format++;
         }
         if (-1 == best) {
-                SAY("cannot do %ix... with standard mask 0x%02X\n", \
+                SAM("cannot do %ix... with standard mask 0x%02X\n", \
                                                                 width, mask);
-                SAY("cannot do ...x%i with standard mask 0x%02X\n", \
+                SAM("cannot do ...x%i with standard mask 0x%02X\n", \
                                                                 height, mask);
-                SAY("           %ix%i unmatched\n", width, height);
+                SAM("           %ix%i unmatched\n", width, height);
                 return peasycap->format_offset;
         }
 }
 if ((struct easycap_format *)NULL == peasycap_best_format) {
-        SAY("MISTAKE: peasycap_best_format is NULL");
+        SAM("MISTAKE: peasycap_best_format is NULL");
         return -EINVAL;
 }
 peasycap_format = peasycap_best_format;
@@ -406,23 +487,43 @@ if (true == try)
 /*...........................................................................*/
 
 if (false != try) {
-        SAY("MISTAKE: true==try where is should be false\n");
+        SAM("MISTAKE: true==try where is should be false\n");
         return -EINVAL;
 }
-SAY("actioning: %ix%i %s\n", \
+SAM("actioning: %ix%i %s\n", \
                         peasycap_format->v4l2_format.fmt.pix.width, \
                         peasycap_format->v4l2_format.fmt.pix.height,
                         &peasycap_format->name[0]);
 peasycap->height        = peasycap_format->v4l2_format.fmt.pix.height;
 peasycap->width         = peasycap_format->v4l2_format.fmt.pix.width;
 peasycap->pixelformat   = peasycap_format->v4l2_format.fmt.pix.pixelformat;
-peasycap->field         = peasycap_format->v4l2_format.fmt.pix.field;
 peasycap->format_offset = (int)(peasycap_format - &easycap_format[0]);
-peasycap->bytesperpixel = (0x00F0 & peasycap_format->mask) >> 4 ;
+
+
+for (k = 0; k < INPUT_MANY; k++) {
+        if (!peasycap->inputset[k].format_offset_ok) {
+                peasycap->inputset[k].format_offset = \
+                                                peasycap->format_offset;
+        }
+}
+if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+        peasycap->inputset[peasycap->input].format_offset = \
+                                                peasycap->format_offset;
+        peasycap->inputset[peasycap->input].format_offset_ok = 1;
+} else
+        JOM(8, "%i=peasycap->input\n", peasycap->input);
+
+
+
+peasycap->bytesperpixel = (0x00E0 & peasycap_format->mask) >> 5 ;
 if (0x0100 & peasycap_format->mask)
         peasycap->byteswaporder = true;
 else
         peasycap->byteswaporder = false;
+if (0x0200 & peasycap_format->mask)
+        peasycap->skip = 5;
+else
+        peasycap->skip = 0;
 if (0x0800 & peasycap_format->mask)
         peasycap->decimatepixel = true;
 else
@@ -439,27 +540,11 @@ peasycap->videofieldamount = multiplier * peasycap->width * \
                                         multiplier * peasycap->height;
 peasycap->frame_buffer_used = peasycap->bytesperpixel * \
                                         peasycap->width * peasycap->height;
-
-if (true == peasycap->offerfields) {
-        SAY("WARNING: %i=peasycap->field is untested: " \
-                                "please report problems\n", peasycap->field);
-
-
-/*
- *    FIXME ---- THIS IS UNTESTED, MAY BE (AND PROBABLY IS) INCORRECT:
- *
- *    peasycap->frame_buffer_used = peasycap->frame_buffer_used / 2;
- *
- *    SO DO NOT RISK IT YET.
- *
- */
-
-
-
-}
-
-kill_video_urbs(peasycap);
-
+if (peasycap->video_isoc_streaming) {
+        resubmit = true;
+        kill_video_urbs(peasycap);
+} else
+        resubmit = false;
 /*---------------------------------------------------------------------------*/
 /*
  *  PAL
@@ -474,13 +559,13 @@ if (0 == (0x01 & peasycap_format->mask)) {
                         (288 == \
                         peasycap_format->v4l2_format.fmt.pix.height))) {
                 if (0 != set_resolution(p, 0x0000, 0x0001, 0x05A0, 0x0121)) {
-                        SAY("ERROR: set_resolution() failed\n");
+                        SAM("ERROR: set_resolution() failed\n");
                         return -EINVAL;
                 }
         } else if ((704 == peasycap_format->v4l2_format.fmt.pix.width) && \
                         (576 == peasycap_format->v4l2_format.fmt.pix.height)) {
                 if (0 != set_resolution(p, 0x0004, 0x0001, 0x0584, 0x0121)) {
-                        SAY("ERROR: set_resolution() failed\n");
+                        SAM("ERROR: set_resolution() failed\n");
                         return -EINVAL;
                 }
         } else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) && \
@@ -491,11 +576,11 @@ if (0 == (0x01 & peasycap_format->mask)) {
                         (240 == \
                         peasycap_format->v4l2_format.fmt.pix.height))) {
                 if (0 != set_resolution(p, 0x0014, 0x0020, 0x0514, 0x0110)) {
-                        SAY("ERROR: set_resolution() failed\n");
+                        SAM("ERROR: set_resolution() failed\n");
                         return -EINVAL;
                 }
         } else {
-                SAY("MISTAKE: bad format, cannot set resolution\n");
+                SAM("MISTAKE: bad format, cannot set resolution\n");
                 return -EINVAL;
         }
 /*---------------------------------------------------------------------------*/
@@ -512,7 +597,7 @@ if (0 == (0x01 & peasycap_format->mask)) {
                         (240 == \
                         peasycap_format->v4l2_format.fmt.pix.height))) {
                 if (0 != set_resolution(p, 0x0000, 0x0003, 0x05A0, 0x00F3)) {
-                        SAY("ERROR: set_resolution() failed\n");
+                        SAM("ERROR: set_resolution() failed\n");
                         return -EINVAL;
                 }
         } else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) && \
@@ -523,28 +608,31 @@ if (0 == (0x01 & peasycap_format->mask)) {
                         (240 == \
                         peasycap_format->v4l2_format.fmt.pix.height))) {
                 if (0 != set_resolution(p, 0x0014, 0x0003, 0x0514, 0x00F3)) {
-                        SAY("ERROR: set_resolution() failed\n");
+                        SAM("ERROR: set_resolution() failed\n");
                         return -EINVAL;
                 }
         } else {
-                SAY("MISTAKE: bad format, cannot set resolution\n");
+                SAM("MISTAKE: bad format, cannot set resolution\n");
                 return -EINVAL;
         }
 }
 /*---------------------------------------------------------------------------*/
-
-check_stk(peasycap->pusb_device);
-
+if (true == resubmit)
+        submit_video_urbs(peasycap);
 return (int)(peasycap_best_format - &easycap_format[0]);
 }
 /*****************************************************************************/
 int adjust_brightness(struct easycap *peasycap, int value)
 {
 unsigned int mood;
-int i1;
+int i1, k;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
@@ -553,37 +641,56 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
                 if ((easycap_control[i1].minimum > value) || \
                                         (easycap_control[i1].maximum < value))
                         value = easycap_control[i1].default_value;
+
+                if ((easycap_control[i1].minimum <= peasycap->brightness) && \
+                                        (easycap_control[i1].maximum >= \
+                                                peasycap->brightness)) {
+                        if (peasycap->brightness == value) {
+                                SAM("unchanged brightness at  0x%02X\n", \
+                                                                value);
+                                return 0;
+                        }
+                }
                 peasycap->brightness = value;
+                for (k = 0; k < INPUT_MANY; k++) {
+                        if (!peasycap->inputset[k].brightness_ok)
+                                peasycap->inputset[k].brightness = \
+                                                        peasycap->brightness;
+                }
+                if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+                        peasycap->inputset[peasycap->input].brightness = \
+                                                        peasycap->brightness;
+                        peasycap->inputset[peasycap->input].brightness_ok = 1;
+                } else
+                        JOM(8, "%i=peasycap->input\n", peasycap->input);
                 mood = 0x00FF & (unsigned int)peasycap->brightness;
-
-                set2to78(peasycap->pusb_device);
-
                 if (!write_saa(peasycap->pusb_device, 0x0A, mood)) {
-                        SAY("adjusting brightness to  0x%02X\n", mood);
+                        SAM("adjusting brightness to  0x%02X\n", mood);
                         return 0;
                 } else {
-                        SAY("WARNING: failed to adjust brightness " \
+                        SAM("WARNING: failed to adjust brightness " \
                                                         "to 0x%02X\n", mood);
                         return -ENOENT;
                 }
-
-                set2to78(peasycap->pusb_device);
-
                 break;
         }
         i1++;
 }
-SAY("WARNING: failed to adjust brightness: control not found\n");
+SAM("WARNING: failed to adjust brightness: control not found\n");
 return -ENOENT;
 }
 /*****************************************************************************/
 int adjust_contrast(struct easycap *peasycap, int value)
 {
 unsigned int mood;
-int i1;
+int i1, k;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
@@ -592,37 +699,58 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
                 if ((easycap_control[i1].minimum > value) || \
                                         (easycap_control[i1].maximum < value))
                         value = easycap_control[i1].default_value;
-                peasycap->contrast = value;
-                mood = 0x00FF & (unsigned int) (peasycap->contrast - 128);
 
-                set2to78(peasycap->pusb_device);
 
+
+                if ((easycap_control[i1].minimum <= peasycap->contrast) && \
+                                (easycap_control[i1].maximum >= \
+                                                        peasycap->contrast)) {
+                        if (peasycap->contrast == value) {
+                                SAM("unchanged contrast at  0x%02X\n", value);
+                                return 0;
+                        }
+                }
+                peasycap->contrast = value;
+                for (k = 0; k < INPUT_MANY; k++) {
+                        if (!peasycap->inputset[k].contrast_ok) {
+                                peasycap->inputset[k].contrast = \
+                                                        peasycap->contrast;
+                        }
+                }
+                if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+                        peasycap->inputset[peasycap->input].contrast = \
+                                                        peasycap->contrast;
+                        peasycap->inputset[peasycap->input].contrast_ok = 1;
+                } else
+                        JOM(8, "%i=peasycap->input\n", peasycap->input);
+                mood = 0x00FF & (unsigned int) (peasycap->contrast - 128);
                 if (!write_saa(peasycap->pusb_device, 0x0B, mood)) {
-                        SAY("adjusting contrast to  0x%02X\n", mood);
+                        SAM("adjusting contrast to  0x%02X\n", mood);
                         return 0;
                 } else {
-                        SAY("WARNING: failed to adjust contrast to " \
+                        SAM("WARNING: failed to adjust contrast to " \
                                                         "0x%02X\n", mood);
                         return -ENOENT;
                 }
-
-                set2to78(peasycap->pusb_device);
-
                 break;
         }
         i1++;
 }
-SAY("WARNING: failed to adjust contrast: control not found\n");
+SAM("WARNING: failed to adjust contrast: control not found\n");
 return -ENOENT;
 }
 /*****************************************************************************/
 int adjust_saturation(struct easycap *peasycap, int value)
 {
 unsigned int mood;
-int i1;
+int i1, k;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
@@ -631,37 +759,58 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
                 if ((easycap_control[i1].minimum > value) || \
                                         (easycap_control[i1].maximum < value))
                         value = easycap_control[i1].default_value;
-                peasycap->saturation = value;
-                mood = 0x00FF & (unsigned int) (peasycap->saturation - 128);
 
-                set2to78(peasycap->pusb_device);
 
+                if ((easycap_control[i1].minimum <= peasycap->saturation) && \
+                                        (easycap_control[i1].maximum >= \
+                                                peasycap->saturation)) {
+                        if (peasycap->saturation == value) {
+                                SAM("unchanged saturation at  0x%02X\n", \
+                                                                value);
+                                return 0;
+                        }
+                }
+                peasycap->saturation = value;
+                for (k = 0; k < INPUT_MANY; k++) {
+                        if (!peasycap->inputset[k].saturation_ok) {
+                                peasycap->inputset[k].saturation = \
+                                                        peasycap->saturation;
+                        }
+                }
+                if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+                        peasycap->inputset[peasycap->input].saturation = \
+                                                        peasycap->saturation;
+                        peasycap->inputset[peasycap->input].saturation_ok = 1;
+                } else
+                        JOM(8, "%i=peasycap->input\n", peasycap->input);
+                mood = 0x00FF & (unsigned int) (peasycap->saturation - 128);
                 if (!write_saa(peasycap->pusb_device, 0x0C, mood)) {
-                        SAY("adjusting saturation to  0x%02X\n", mood);
+                        SAM("adjusting saturation to  0x%02X\n", mood);
                         return 0;
                 } else {
-                        SAY("WARNING: failed to adjust saturation to " \
+                        SAM("WARNING: failed to adjust saturation to " \
                                                         "0x%02X\n", mood);
                         return -ENOENT;
                 }
                 break;
-
-                set2to78(peasycap->pusb_device);
-
         }
         i1++;
 }
-SAY("WARNING: failed to adjust saturation: control not found\n");
+SAM("WARNING: failed to adjust saturation: control not found\n");
 return -ENOENT;
 }
 /*****************************************************************************/
 int adjust_hue(struct easycap *peasycap, int value)
 {
 unsigned int mood;
-int i1, i2;
+int i1, i2, k;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
@@ -670,27 +819,40 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
                 if ((easycap_control[i1].minimum > value) || \
                                         (easycap_control[i1].maximum < value))
                         value = easycap_control[i1].default_value;
+
+                if ((easycap_control[i1].minimum <= peasycap->hue) && \
+                                        (easycap_control[i1].maximum >= \
+                                                        peasycap->hue)) {
+                        if (peasycap->hue == value) {
+                                SAM("unchanged hue at  0x%02X\n", value);
+                                return 0;
+                        }
+                }
                 peasycap->hue = value;
+                for (k = 0; k < INPUT_MANY; k++) {
+                        if (!peasycap->inputset[k].hue_ok)
+                                peasycap->inputset[k].hue = peasycap->hue;
+                }
+                if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
+                        peasycap->inputset[peasycap->input].hue = \
+                                                        peasycap->hue;
+                        peasycap->inputset[peasycap->input].hue_ok = 1;
+                } else
+                        JOM(8, "%i=peasycap->input\n", peasycap->input);
                 i2 = peasycap->hue - 128;
                 mood = 0x00FF & ((int) i2);
-
-                set2to78(peasycap->pusb_device);
-
                 if (!write_saa(peasycap->pusb_device, 0x0D, mood)) {
-                        SAY("adjusting hue to  0x%02X\n", mood);
+                        SAM("adjusting hue to  0x%02X\n", mood);
                         return 0;
                 } else {
-                        SAY("WARNING: failed to adjust hue to 0x%02X\n", mood);
+                        SAM("WARNING: failed to adjust hue to 0x%02X\n", mood);
                         return -ENOENT;
                 }
-
-                set2to78(peasycap->pusb_device);
-
                 break;
         }
         i1++;
 }
-SAY("WARNING: failed to adjust hue: control not found\n");
+SAM("WARNING: failed to adjust hue: control not found\n");
 return -ENOENT;
 }
 /*****************************************************************************/
@@ -699,33 +861,45 @@ int adjust_volume(struct easycap *peasycap, int value)
 __s8 mood;
 int i1;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
 while (0xFFFFFFFF != easycap_control[i1].id) {
         if (V4L2_CID_AUDIO_VOLUME == easycap_control[i1].id) {
                 if ((easycap_control[i1].minimum > value) || \
-                        (easycap_control[i1].maximum < value))
+                                (easycap_control[i1].maximum < value))
                         value = easycap_control[i1].default_value;
+                if ((easycap_control[i1].minimum <= peasycap->volume) && \
+                                        (easycap_control[i1].maximum >= \
+                                                        peasycap->volume)) {
+                        if (peasycap->volume == value) {
+                                SAM("unchanged volume at  0x%02X\n", value);
+                                return 0;
+                        }
+                }
                 peasycap->volume = value;
                 mood = (16 > peasycap->volume) ? 16 : \
                         ((31 < peasycap->volume) ? 31 : \
                         (__s8) peasycap->volume);
                 if (!audio_gainset(peasycap->pusb_device, mood)) {
-                        SAY("adjusting volume to 0x%01X\n", mood);
+                        SAM("adjusting volume to 0x%02X\n", mood);
                         return 0;
                 } else {
-                        SAY("WARNING: failed to adjust volume to " \
-                                                        "0x%1X\n", mood);
+                        SAM("WARNING: failed to adjust volume to " \
+                                                        "0x%2X\n", mood);
                         return -ENOENT;
                 }
                 break;
         }
 i1++;
 }
-SAY("WARNING: failed to adjust volume: control not found\n");
+SAM("WARNING: failed to adjust volume: control not found\n");
 return -ENOENT;
 }
 /*****************************************************************************/
@@ -744,8 +918,12 @@ int adjust_mute(struct easycap *peasycap, int value)
 {
 int i1;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 i1 = 0;
@@ -756,13 +934,13 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
                 case 1: {
                         peasycap->audio_idle = 1;
                         peasycap->timeval0.tv_sec = 0;
-                        SAY("adjusting mute: %i=peasycap->audio_idle\n", \
+                        SAM("adjusting mute: %i=peasycap->audio_idle\n", \
                                                         peasycap->audio_idle);
                         return 0;
                 }
                 default: {
                         peasycap->audio_idle = 0;
-                        SAY("adjusting mute: %i=peasycap->audio_idle\n", \
+                        SAM("adjusting mute: %i=peasycap->audio_idle\n", \
                                                         peasycap->audio_idle);
                         return 0;
                 }
@@ -771,47 +949,107 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
         }
         i1++;
 }
-SAY("WARNING: failed to adjust mute: control not found\n");
+SAM("WARNING: failed to adjust mute: control not found\n");
 return -ENOENT;
 }
-
-/*--------------------------------------------------------------------------*/
-static int easycap_ioctl_bkl(struct inode *inode, struct file *file,
-                             unsigned int cmd, unsigned long arg)
+/*****************************************************************************/
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if ((defined(EASYCAP_IS_VIDEODEV_CLIENT)) || \
+        (defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)))
+long
+easycap_ioctl_noinode(struct file *file, unsigned int cmd, unsigned long arg) {
+        return (long)easycap_ioctl((struct inode *)NULL, file, cmd, arg);
+}
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT||EASYCAP_NEEDS_UNLOCKED_IOCTL*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+/*---------------------------------------------------------------------------*/
+int
+easycap_ioctl(struct inode *inode, struct file *file,
+                                        unsigned int cmd, unsigned long arg)
 {
-static struct easycap *peasycap;
-static struct usb_device *p;
-static __u32 isequence;
+struct easycap *peasycap;
+struct usb_device *p;
+int kd;
 
+if (NULL == file) {
+        SAY("ERROR:  file is NULL\n");
+        return -ERESTARTSYS;
+}
 peasycap = file->private_data;
 if (NULL == peasycap) {
         SAY("ERROR:  peasycap is NULL\n");
         return -1;
 }
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap\n");
+        return -EFAULT;
+}
 p = peasycap->pusb_device;
-if ((struct usb_device *)NULL == p) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+if (NULL == p) {
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
+kd = isdongle(peasycap);
+if (0 <= kd && DONGLE_MANY > kd) {
+        if (mutex_lock_interruptible(&easycap_dongle[kd].mutex_video)) {
+                SAY("ERROR: cannot lock easycap_dongle[%i].mutex_video\n", kd);
+                return -ERESTARTSYS;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_video\n", kd);
 /*---------------------------------------------------------------------------*/
 /*
- *  MOST OF THE VARIABLES DECLARED static IN THE case{} BLOCKS BELOW ARE SO
- *  DECLARED SIMPLY TO AVOID A COMPILER WARNING OF THE KIND:
- *  easycap_ioctl.c: warning:
- *                       the frame size of ... bytes is larger than 1024 bytes
- */
+ *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,
+ *  IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
+ *  IF NECESSARY, BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        if (kd != isdongle(peasycap))
+                return -ERESTARTSYS;
+        if (NULL == file) {
+                SAY("ERROR:  file is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+        peasycap = file->private_data;
+        if (NULL == peasycap) {
+                SAY("ERROR:  peasycap is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+        if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+                SAY("ERROR: bad peasycap\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
+        p = peasycap->pusb_device;
+        if (NULL == peasycap->pusb_device) {
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+} else {
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE
+ *  ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED.  BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        return -ERESTARTSYS;
+}
 /*---------------------------------------------------------------------------*/
 switch (cmd) {
 case VIDIOC_QUERYCAP: {
-        static struct v4l2_capability v4l2_capability;
-        static char version[16], *p1, *p2;
-        static int i, rc, k[3];
-        static long lng;
+        struct v4l2_capability v4l2_capability;
+        char version[16], *p1, *p2;
+        int i, rc, k[3];
+        long lng;
 
-        JOT(8, "VIDIOC_QUERYCAP\n");
+        JOM(8, "VIDIOC_QUERYCAP\n");
 
         if (16 <= strlen(EASYCAP_DRIVER_VERSION)) {
-                SAY("ERROR: bad driver version string\n"); return -EINVAL;
+                SAM("ERROR: bad driver version string\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EINVAL;
         }
         strcpy(&version[0], EASYCAP_DRIVER_VERSION);
         for (i = 0; i < 3; i++)
@@ -826,8 +1064,9 @@ case VIDIOC_QUERYCAP: {
                 if (3 > i) {
                         rc = (int) strict_strtol(p1, 10, &lng);
                         if (0 != rc) {
-                                SAY("ERROR: %i=strict_strtol(%s,.,,)\n", \
+                                SAM("ERROR: %i=strict_strtol(%s,.,,)\n", \
                                                                 rc, p1);
+                                mutex_unlock(&easycap_dongle[kd].mutex_video);
                                 return -EINVAL;
                         }
                         k[i] = (int)lng;
@@ -844,7 +1083,7 @@ case VIDIOC_QUERYCAP: {
                                 V4L2_CAP_AUDIO         | V4L2_CAP_READWRITE;
 
         v4l2_capability.version = KERNEL_VERSION(k[0], k[1], k[2]);
-        JOT(8, "v4l2_capability.version=(%i,%i,%i)\n", k[0], k[1], k[2]);
+        JOM(8, "v4l2_capability.version=(%i,%i,%i)\n", k[0], k[1], k[2]);
 
         strlcpy(&v4l2_capability.card[0], "EasyCAP DC60", \
                 sizeof(v4l2_capability.card));
@@ -853,26 +1092,26 @@ case VIDIOC_QUERYCAP: {
                                 sizeof(v4l2_capability.bus_info)) < 0) {
                 strlcpy(&v4l2_capability.bus_info[0], "EasyCAP bus_info", \
                                         sizeof(v4l2_capability.bus_info));
-                JOT(8, "%s=v4l2_capability.bus_info\n", \
+                JOM(8, "%s=v4l2_capability.bus_info\n", \
                                         &v4l2_capability.bus_info[0]);
         }
         if (0 != copy_to_user((void __user *)arg, &v4l2_capability, \
                                         sizeof(struct v4l2_capability))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUMINPUT: {
-        static struct v4l2_input v4l2_input;
-        static __u32 index;
+        struct v4l2_input v4l2_input;
+        __u32 index;
 
-        JOT(8, "VIDIOC_ENUMINPUT\n");
+        JOM(8, "VIDIOC_ENUMINPUT\n");
 
         if (0 != copy_from_user(&v4l2_input, (void __user *)arg, \
                                         sizeof(struct v4l2_input))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
@@ -889,7 +1128,7 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         case 1: {
@@ -901,7 +1140,7 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         case 2: {
@@ -913,7 +1152,7 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         case 3: {
@@ -925,7 +1164,7 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         case 4: {
@@ -937,7 +1176,7 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         case 5: {
@@ -949,31 +1188,32 @@ case VIDIOC_ENUMINPUT: {
                 v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | \
                                 V4L2_STD_NTSC ;
                 v4l2_input.status = 0;
-                JOT(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
                 break;
         }
         default: {
-                JOT(8, "%i=index: exhausts inputs\n", index);
+                JOM(8, "%i=index: exhausts inputs\n", index);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
         }
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_input, \
                                                 sizeof(struct v4l2_input))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_INPUT: {
-        static __u32 index;
+        __u32 index;
 
-        JOT(8, "VIDIOC_G_INPUT\n");
+        JOM(8, "VIDIOC_G_INPUT\n");
         index = (__u32)peasycap->input;
-        JOT(8, "user is told: %i\n", index);
+        JOM(8, "user is told: %i\n", index);
         if (0 != copy_to_user((void __user *)arg, &index, sizeof(__u32))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
@@ -981,79 +1221,89 @@ case VIDIOC_G_INPUT: {
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_INPUT:
         {
-        static __u32 index;
+        __u32 index;
+        int rc;
 
-        JOT(8, "VIDIOC_S_INPUT\n");
+        JOM(8, "VIDIOC_S_INPUT\n");
 
         if (0 != copy_from_user(&index, (void __user *)arg, sizeof(__u32))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        JOT(8, "user requests input %i\n", index);
+        JOM(8, "user requests input %i\n", index);
 
         if ((int)index == peasycap->input) {
-                SAY("requested input already in effect\n");
+                SAM("requested input already in effect\n");
                 break;
         }
 
-        if ((0 > index) || (5 < index)) {
-                JOT(8, "ERROR:  bad requested input: %i\n", index);
+        if ((0 > index) || (INPUT_MANY <= index)) {
+                JOM(8, "ERROR:  bad requested input: %i\n", index);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
-        peasycap->input = (int)index;
-
-        select_input(peasycap->pusb_device, peasycap->input, 9);
 
+        rc = newinput(peasycap, (int)index);
+        if (0 == rc) {
+                JOM(8, "newinput(.,%i) OK\n", (int)index);
+        } else {
+                SAM("ERROR: newinput(.,%i) returned %i\n", (int)index, rc);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUMAUDIO: {
-        JOT(8, "VIDIOC_ENUMAUDIO\n");
+        JOM(8, "VIDIOC_ENUMAUDIO\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUMAUDOUT: {
-        static struct v4l2_audioout v4l2_audioout;
+        struct v4l2_audioout v4l2_audioout;
 
-        JOT(8, "VIDIOC_ENUMAUDOUT\n");
+        JOM(8, "VIDIOC_ENUMAUDOUT\n");
 
         if (0 != copy_from_user(&v4l2_audioout, (void __user *)arg, \
                                         sizeof(struct v4l2_audioout))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (0 != v4l2_audioout.index)
+        if (0 != v4l2_audioout.index) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
         memset(&v4l2_audioout, 0, sizeof(struct v4l2_audioout));
         v4l2_audioout.index = 0;
         strcpy(&v4l2_audioout.name[0], "Soundtrack");
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_audioout, \
                                         sizeof(struct v4l2_audioout))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_QUERYCTRL: {
-        static int i1;
-        static struct v4l2_queryctrl v4l2_queryctrl;
+        int i1;
+        struct v4l2_queryctrl v4l2_queryctrl;
 
-        JOT(8, "VIDIOC_QUERYCTRL\n");
+        JOM(8, "VIDIOC_QUERYCTRL\n");
 
         if (0 != copy_from_user(&v4l2_queryctrl, (void __user *)arg, \
                                         sizeof(struct v4l2_queryctrl))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
         i1 = 0;
         while (0xFFFFFFFF != easycap_control[i1].id) {
                 if (easycap_control[i1].id == v4l2_queryctrl.id) {
-                        JOT(8, "VIDIOC_QUERYCTRL  %s=easycap_control[%i]" \
+                        JOM(8, "VIDIOC_QUERYCTRL  %s=easycap_control[%i]" \
                                 ".name\n", &easycap_control[i1].name[0], i1);
                         memcpy(&v4l2_queryctrl, &easycap_control[i1], \
                                                 sizeof(struct v4l2_queryctrl));
@@ -1062,127 +1312,137 @@ case VIDIOC_QUERYCTRL: {
                 i1++;
         }
         if (0xFFFFFFFF == easycap_control[i1].id) {
-                JOT(8, "%i=index: exhausts controls\n", i1);
+                JOM(8, "%i=index: exhausts controls\n", i1);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
         if (0 != copy_to_user((void __user *)arg, &v4l2_queryctrl, \
                                         sizeof(struct v4l2_queryctrl))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_QUERYMENU: {
-        JOT(8, "VIDIOC_QUERYMENU unsupported\n");
+        JOM(8, "VIDIOC_QUERYMENU unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
-        break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_CTRL: {
-        static struct v4l2_control v4l2_control;
+        struct v4l2_control *pv4l2_control;
 
-        JOT(8, "VIDIOC_G_CTRL\n");
-
-        if (0 != copy_from_user(&v4l2_control, (void __user *)arg, \
+        JOM(8, "VIDIOC_G_CTRL\n");
+        pv4l2_control = kzalloc(sizeof(struct v4l2_control), GFP_KERNEL);
+        if (!pv4l2_control) {
+                SAM("ERROR: out of memory\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ENOMEM;
+        }
+        if (0 != copy_from_user(pv4l2_control, (void __user *)arg, \
                                         sizeof(struct v4l2_control))) {
-                POUT;
+                kfree(pv4l2_control);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        switch (v4l2_control.id) {
+        switch (pv4l2_control->id) {
         case V4L2_CID_BRIGHTNESS: {
-                v4l2_control.value = peasycap->brightness;
-                JOT(8, "user enquires brightness: %i\n", v4l2_control.value);
+                pv4l2_control->value = peasycap->brightness;
+                JOM(8, "user enquires brightness: %i\n", pv4l2_control->value);
                 break;
         }
         case V4L2_CID_CONTRAST: {
-                v4l2_control.value = peasycap->contrast;
-                JOT(8, "user enquires contrast: %i\n", v4l2_control.value);
+                pv4l2_control->value = peasycap->contrast;
+                JOM(8, "user enquires contrast: %i\n", pv4l2_control->value);
                 break;
         }
         case V4L2_CID_SATURATION: {
-                v4l2_control.value = peasycap->saturation;
-                JOT(8, "user enquires saturation: %i\n", v4l2_control.value);
+                pv4l2_control->value = peasycap->saturation;
+                JOM(8, "user enquires saturation: %i\n", pv4l2_control->value);
                 break;
         }
         case V4L2_CID_HUE: {
-                v4l2_control.value = peasycap->hue;
-                JOT(8, "user enquires hue: %i\n", v4l2_control.value);
+                pv4l2_control->value = peasycap->hue;
+                JOM(8, "user enquires hue: %i\n", pv4l2_control->value);
                 break;
         }
         case V4L2_CID_AUDIO_VOLUME: {
-                v4l2_control.value = peasycap->volume;
-                JOT(8, "user enquires volume: %i\n", v4l2_control.value);
+                pv4l2_control->value = peasycap->volume;
+                JOM(8, "user enquires volume: %i\n", pv4l2_control->value);
                 break;
         }
         case V4L2_CID_AUDIO_MUTE: {
                 if (1 == peasycap->mute)
-                        v4l2_control.value = true;
+                        pv4l2_control->value = true;
                 else
-                        v4l2_control.value = false;
-                JOT(8, "user enquires mute: %i\n", v4l2_control.value);
+                        pv4l2_control->value = false;
+                JOM(8, "user enquires mute: %i\n", pv4l2_control->value);
                 break;
         }
         default: {
-                SAY("ERROR: unknown V4L2 control: 0x%08X=id\n", \
-                                                        v4l2_control.id);
-                explain_cid(v4l2_control.id);
+                SAM("ERROR: unknown V4L2 control: 0x%08X=id\n", \
+                                                        pv4l2_control->id);
+                kfree(pv4l2_control);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
         }
-        if (0 != copy_to_user((void __user *)arg, &v4l2_control, \
+        if (0 != copy_to_user((void __user *)arg, pv4l2_control, \
                                         sizeof(struct v4l2_control))) {
-                POUT;
+                kfree(pv4l2_control);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
+        kfree(pv4l2_control);
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #if defined(VIDIOC_S_CTRL_OLD)
 case VIDIOC_S_CTRL_OLD: {
-        JOT(8, "VIDIOC_S_CTRL_OLD required at least for xawtv\n");
+        JOM(8, "VIDIOC_S_CTRL_OLD required at least for xawtv\n");
 }
 #endif /*VIDIOC_S_CTRL_OLD*/
 case VIDIOC_S_CTRL:
         {
-        static struct v4l2_control v4l2_control;
+        struct v4l2_control v4l2_control;
 
-        JOT(8, "VIDIOC_S_CTRL\n");
+        JOM(8, "VIDIOC_S_CTRL\n");
 
         if (0 != copy_from_user(&v4l2_control, (void __user *)arg, \
                                         sizeof(struct v4l2_control))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
         switch (v4l2_control.id) {
         case V4L2_CID_BRIGHTNESS: {
-                JOT(8, "user requests brightness %i\n", v4l2_control.value);
+                JOM(8, "user requests brightness %i\n", v4l2_control.value);
                 if (0 != adjust_brightness(peasycap, v4l2_control.value))
                         ;
                 break;
         }
         case V4L2_CID_CONTRAST: {
-                JOT(8, "user requests contrast %i\n", v4l2_control.value);
+                JOM(8, "user requests contrast %i\n", v4l2_control.value);
                 if (0 != adjust_contrast(peasycap, v4l2_control.value))
                         ;
                 break;
         }
         case V4L2_CID_SATURATION: {
-                JOT(8, "user requests saturation %i\n", v4l2_control.value);
+                JOM(8, "user requests saturation %i\n", v4l2_control.value);
                 if (0 != adjust_saturation(peasycap, v4l2_control.value))
                         ;
                 break;
         }
         case V4L2_CID_HUE: {
-                JOT(8, "user requests hue %i\n", v4l2_control.value);
+                JOM(8, "user requests hue %i\n", v4l2_control.value);
                 if (0 != adjust_hue(peasycap, v4l2_control.value))
                         ;
                 break;
         }
         case V4L2_CID_AUDIO_VOLUME: {
-                JOT(8, "user requests volume %i\n", v4l2_control.value);
+                JOM(8, "user requests volume %i\n", v4l2_control.value);
                 if (0 != adjust_volume(peasycap, v4l2_control.value))
                         ;
                 break;
@@ -1190,40 +1450,41 @@ case VIDIOC_S_CTRL:
         case V4L2_CID_AUDIO_MUTE: {
                 int mute;
 
-                JOT(8, "user requests mute %i\n", v4l2_control.value);
+                JOM(8, "user requests mute %i\n", v4l2_control.value);
                 if (true == v4l2_control.value)
                         mute = 1;
                 else
                         mute = 0;
 
                 if (0 != adjust_mute(peasycap, mute))
-                        SAY("WARNING: failed to adjust mute to %i\n", mute);
+                        SAM("WARNING: failed to adjust mute to %i\n", mute);
                 break;
         }
         default: {
-                SAY("ERROR: unknown V4L2 control: 0x%08X=id\n", \
+                SAM("ERROR: unknown V4L2 control: 0x%08X=id\n", \
                                                         v4l2_control.id);
-                explain_cid(v4l2_control.id);
-        return -EINVAL;
-                        }
-                }
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EINVAL;
+        }
+        }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_EXT_CTRLS: {
-        JOT(8, "VIDIOC_S_EXT_CTRLS unsupported\n");
+        JOM(8, "VIDIOC_S_EXT_CTRLS unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUM_FMT: {
-        static __u32 index;
-        static struct v4l2_fmtdesc v4l2_fmtdesc;
+        __u32 index;
+        struct v4l2_fmtdesc v4l2_fmtdesc;
 
-        JOT(8, "VIDIOC_ENUM_FMT\n");
+        JOM(8, "VIDIOC_ENUM_FMT\n");
 
         if (0 != copy_from_user(&v4l2_fmtdesc, (void __user *)arg, \
                                         sizeof(struct v4l2_fmtdesc))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
@@ -1238,117 +1499,327 @@ case VIDIOC_ENUM_FMT: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "uyvy");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_UYVY;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         case 1: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "yuy2");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_YUYV;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         case 2: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "rgb24");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_RGB24;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         case 3: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "rgb32");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_RGB32;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         case 4: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "bgr24");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_BGR24;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         case 5: {
                 v4l2_fmtdesc.flags = 0;
                 strcpy(&v4l2_fmtdesc.description[0], "bgr32");
                 v4l2_fmtdesc.pixelformat = V4L2_PIX_FMT_BGR32;
-                JOT(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
+                JOM(8, "%i=index: %s\n", index, &v4l2_fmtdesc.description[0]);
                 break;
         }
         default: {
-                JOT(8, "%i=index: exhausts formats\n", index);
+                JOM(8, "%i=index: exhausts formats\n", index);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
         }
         if (0 != copy_to_user((void __user *)arg, &v4l2_fmtdesc, \
                                         sizeof(struct v4l2_fmtdesc))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/*
+ *  THE RESPONSE TO VIDIOC_ENUM_FRAMESIZES MUST BE CONDITIONED ON THE
+ *  THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS.  BEWARE.
+*/
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUM_FRAMESIZES: {
-        JOT(8, "VIDIOC_ENUM_FRAMESIZES unsupported\n");
-        return -EINVAL;
+        __u32 index;
+        struct v4l2_frmsizeenum v4l2_frmsizeenum;
+
+        JOM(8, "VIDIOC_ENUM_FRAMESIZES\n");
+
+        if (0 != copy_from_user(&v4l2_frmsizeenum, (void __user *)arg, \
+                                        sizeof(struct v4l2_frmsizeenum))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
+
+        index = v4l2_frmsizeenum.index;
+
+        v4l2_frmsizeenum.type = (__u32) V4L2_FRMSIZE_TYPE_DISCRETE;
+
+        if (true == peasycap->ntsc) {
+                switch (index) {
+                case 0: {
+                        v4l2_frmsizeenum.discrete.width = 640;
+                        v4l2_frmsizeenum.discrete.height = 480;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                 discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 1: {
+                        v4l2_frmsizeenum.discrete.width = 320;
+                        v4l2_frmsizeenum.discrete.height = 240;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 2: {
+                        v4l2_frmsizeenum.discrete.width = 720;
+                        v4l2_frmsizeenum.discrete.height = 480;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 3: {
+                        v4l2_frmsizeenum.discrete.width = 360;
+                        v4l2_frmsizeenum.discrete.height = 240;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                default: {
+                        JOM(8, "%i=index: exhausts framesizes\n", index);
+                        mutex_unlock(&easycap_dongle[kd].mutex_video);
+                        return -EINVAL;
+                }
+                }
+        } else {
+                switch (index) {
+                case 0: {
+                        v4l2_frmsizeenum.discrete.width = 640;
+                        v4l2_frmsizeenum.discrete.height = 480;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 1: {
+                        v4l2_frmsizeenum.discrete.width = 320;
+                        v4l2_frmsizeenum.discrete.height = 240;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 2: {
+                        v4l2_frmsizeenum.discrete.width = 704;
+                        v4l2_frmsizeenum.discrete.height = 576;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 3: {
+                        v4l2_frmsizeenum.discrete.width = 720;
+                        v4l2_frmsizeenum.discrete.height = 576;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                case 4: {
+                        v4l2_frmsizeenum.discrete.width = 360;
+                        v4l2_frmsizeenum.discrete.height = 288;
+                        JOM(8, "%i=index: %ix%i\n", index, \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.width), \
+                                        (int)(v4l2_frmsizeenum.\
+                                                discrete.height));
+                        break;
+                }
+                default: {
+                        JOM(8, "%i=index: exhausts framesizes\n", index);
+                        mutex_unlock(&easycap_dongle[kd].mutex_video);
+                        return -EINVAL;
+                }
+                }
+        }
+        if (0 != copy_to_user((void __user *)arg, &v4l2_frmsizeenum, \
+                                        sizeof(struct v4l2_frmsizeenum))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
+        break;
 }
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/*
+ *  THE RESPONSE TO VIDIOC_ENUM_FRAMEINTERVALS MUST BE CONDITIONED ON THE
+ *  THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS.  BEWARE.
+*/
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_ENUM_FRAMEINTERVALS: {
-        JOT(8, "VIDIOC_ENUM_FRAME_INTERVALS unsupported\n");
-        return -EINVAL;
+        __u32 index;
+        int denominator;
+        struct v4l2_frmivalenum v4l2_frmivalenum;
+
+        JOM(8, "VIDIOC_ENUM_FRAMEINTERVALS\n");
+
+        if (peasycap->fps)
+                denominator = peasycap->fps;
+        else {
+                if (true == peasycap->ntsc)
+                        denominator = 30;
+                else
+                        denominator = 25;
+        }
+
+        if (0 != copy_from_user(&v4l2_frmivalenum, (void __user *)arg, \
+                                        sizeof(struct v4l2_frmivalenum))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
+
+        index = v4l2_frmivalenum.index;
+
+        v4l2_frmivalenum.type = (__u32) V4L2_FRMIVAL_TYPE_DISCRETE;
+
+        switch (index) {
+        case 0: {
+                v4l2_frmivalenum.discrete.numerator = 1;
+                v4l2_frmivalenum.discrete.denominator = denominator;
+                JOM(8, "%i=index: %i/%i\n", index, \
+                        (int)(v4l2_frmivalenum.discrete.numerator), \
+                        (int)(v4l2_frmivalenum.discrete.denominator));
+                break;
+        }
+        case 1: {
+                v4l2_frmivalenum.discrete.numerator = 1;
+                v4l2_frmivalenum.discrete.denominator = denominator/5;
+                JOM(8, "%i=index: %i/%i\n", index, \
+                        (int)(v4l2_frmivalenum.discrete.numerator), \
+                        (int)(v4l2_frmivalenum.discrete.denominator));
+                break;
+        }
+        default: {
+                JOM(8, "%i=index: exhausts frameintervals\n", index);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EINVAL;
+        }
+        }
+        if (0 != copy_to_user((void __user *)arg, &v4l2_frmivalenum, \
+                                        sizeof(struct v4l2_frmivalenum))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EFAULT;
+        }
+        break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_FMT: {
-        static struct v4l2_format v4l2_format;
-        static struct v4l2_pix_format v4l2_pix_format;
-
-        JOT(8, "VIDIOC_G_FMT\n");
-
-        if (0 != copy_from_user(&v4l2_format, (void __user *)arg, \
+        struct v4l2_format *pv4l2_format;
+        struct v4l2_pix_format *pv4l2_pix_format;
+
+        JOM(8, "VIDIOC_G_FMT\n");
+        pv4l2_format = kzalloc(sizeof(struct v4l2_format), GFP_KERNEL);
+        if (!pv4l2_format) {
+                SAM("ERROR: out of memory\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ENOMEM;
+        }
+        pv4l2_pix_format = kzalloc(sizeof(struct v4l2_pix_format), GFP_KERNEL);
+        if (!pv4l2_pix_format) {
+                SAM("ERROR: out of memory\n");
+                kfree(pv4l2_format);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ENOMEM;
+        }
+        if (0 != copy_from_user(pv4l2_format, (void __user *)arg, \
                                         sizeof(struct v4l2_format))) {
-                POUT;
+                kfree(pv4l2_format);
+                kfree(pv4l2_pix_format);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-                POUT;
+        if (pv4l2_format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                kfree(pv4l2_format);
+                kfree(pv4l2_pix_format);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
 
-        memset(&v4l2_pix_format, 0, sizeof(struct v4l2_pix_format));
-        v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        memcpy(&(v4l2_format.fmt.pix), \
-                         &(easycap_format[peasycap->format_offset]\
-                        .v4l2_format.fmt.pix), sizeof(v4l2_pix_format));
-        JOT(8, "user is told: %s\n", \
+        memset(pv4l2_pix_format, 0, sizeof(struct v4l2_pix_format));
+        pv4l2_format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        memcpy(&pv4l2_format->fmt.pix, \
+                         &easycap_format[peasycap->format_offset]\
+                        .v4l2_format.fmt.pix, sizeof(struct v4l2_pix_format));
+        JOM(8, "user is told: %s\n", \
                         &easycap_format[peasycap->format_offset].name[0]);
 
-        if (0 != copy_to_user((void __user *)arg, &v4l2_format, \
+        if (0 != copy_to_user((void __user *)arg, pv4l2_format, \
                                         sizeof(struct v4l2_format))) {
-                POUT;
+                kfree(pv4l2_format);
+                kfree(pv4l2_pix_format);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
+        kfree(pv4l2_format);
+        kfree(pv4l2_pix_format);
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_TRY_FMT:
 case VIDIOC_S_FMT: {
-        static struct v4l2_format v4l2_format;
-        static struct v4l2_pix_format v4l2_pix_format;
-        static bool try;
-        static int best_format;
+        struct v4l2_format v4l2_format;
+        struct v4l2_pix_format v4l2_pix_format;
+        bool try;
+        int best_format;
 
         if (VIDIOC_TRY_FMT == cmd) {
-                JOT(8, "VIDIOC_TRY_FMT\n");
+                JOM(8, "VIDIOC_TRY_FMT\n");
                 try = true;
         } else {
-                JOT(8, "VIDIOC_S_FMT\n");
+                JOM(8, "VIDIOC_S_FMT\n");
                 try = false;
         }
 
         if (0 != copy_from_user(&v4l2_format, (void __user *)arg, \
                                         sizeof(struct v4l2_format))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
@@ -1359,7 +1830,12 @@ case VIDIOC_S_FMT: {
                                         v4l2_format.fmt.pix.field, \
                                         try);
         if (0 > best_format) {
-                JOT(8, "WARNING: adjust_format() returned %i\n", best_format);
+                if (-EBUSY == best_format) {
+                        mutex_unlock(&easycap_dongle[kd].mutex_video);
+                        return -EBUSY;
+                }
+                JOM(8, "WARNING: adjust_format() returned %i\n", best_format);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -ENOENT;
         }
 /*...........................................................................*/
@@ -1368,29 +1844,29 @@ case VIDIOC_S_FMT: {
 
         memcpy(&(v4l2_format.fmt.pix), &(easycap_format[best_format]\
                         .v4l2_format.fmt.pix), sizeof(v4l2_pix_format));
-        JOT(8, "user is told: %s\n", &easycap_format[best_format].name[0]);
+        JOM(8, "user is told: %s\n", &easycap_format[best_format].name[0]);
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_format, \
                                         sizeof(struct v4l2_format))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_CROPCAP: {
-        static struct v4l2_cropcap v4l2_cropcap;
+        struct v4l2_cropcap v4l2_cropcap;
 
-        JOT(8, "VIDIOC_CROPCAP\n");
+        JOM(8, "VIDIOC_CROPCAP\n");
 
         if (0 != copy_from_user(&v4l2_cropcap, (void __user *)arg, \
                                         sizeof(struct v4l2_cropcap))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
         if (v4l2_cropcap.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                JOT(8, "v4l2_cropcap.type != V4L2_BUF_TYPE_VIDEO_CAPTURE\n");
+                JOM(8, "v4l2_cropcap.type != V4L2_BUF_TYPE_VIDEO_CAPTURE\n");
 
         memset(&v4l2_cropcap, 0, sizeof(struct v4l2_cropcap));
         v4l2_cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1405,11 +1881,11 @@ case VIDIOC_CROPCAP: {
         v4l2_cropcap.pixelaspect.numerator = 1;
         v4l2_cropcap.pixelaspect.denominator = 1;
 
-        JOT(8, "user is told: %ix%i\n", peasycap->width, peasycap->height);
+        JOM(8, "user is told: %ix%i\n", peasycap->width, peasycap->height);
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_cropcap, \
                                         sizeof(struct v4l2_cropcap))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
@@ -1417,13 +1893,15 @@ case VIDIOC_CROPCAP: {
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_CROP:
 case VIDIOC_S_CROP: {
-        JOT(8, "VIDIOC_G_CROP|VIDIOC_S_CROP  unsupported\n");
+        JOM(8, "VIDIOC_G_CROP|VIDIOC_S_CROP  unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_QUERYSTD: {
-        JOT(8, "VIDIOC_QUERYSTD: " \
+        JOM(8, "VIDIOC_QUERYSTD: " \
                         "EasyCAP is incapable of detecting standard\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
         break;
 }
@@ -1436,16 +1914,16 @@ case VIDIOC_QUERYSTD: {
  */
 /*---------------------------------------------------------------------------*/
 case VIDIOC_ENUMSTD: {
-        static int last0 = -1, last1 = -1, last2 = -1, last3 = -1;
-        static struct v4l2_standard v4l2_standard;
-        static __u32 index;
-        static struct easycap_standard const *peasycap_standard;
+        int last0 = -1, last1 = -1, last2 = -1, last3 = -1;
+        struct v4l2_standard v4l2_standard;
+        __u32 index;
+        struct easycap_standard const *peasycap_standard;
 
-        JOT(8, "VIDIOC_ENUMSTD\n");
+        JOM(8, "VIDIOC_ENUMSTD\n");
 
         if (0 != copy_from_user(&v4l2_standard, (void __user *)arg, \
                                         sizeof(struct v4l2_standard))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         index = v4l2_standard.index;
@@ -1466,10 +1944,11 @@ case VIDIOC_ENUMSTD: {
                 peasycap_standard++;
         }
         if (0xFFFF == peasycap_standard->mask) {
-                JOT(8, "%i=index: exhausts standards\n", index);
+                JOM(8, "%i=index: exhausts standards\n", index);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
-        JOT(8, "%i=index: %s\n", index, \
+        JOM(8, "%i=index: %s\n", index, \
                                 &(peasycap_standard->v4l2_standard.name[0]));
         memcpy(&v4l2_standard, &(peasycap_standard->v4l2_standard), \
                                         sizeof(struct v4l2_standard));
@@ -1478,87 +1957,101 @@ case VIDIOC_ENUMSTD: {
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_standard, \
                                         sizeof(struct v4l2_standard))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_STD: {
-        static v4l2_std_id std_id;
-        static struct easycap_standard const *peasycap_standard;
+        v4l2_std_id std_id;
+        struct easycap_standard const *peasycap_standard;
+
+        JOM(8, "VIDIOC_G_STD\n");
 
-        JOT(8, "VIDIOC_G_STD\n");
+        if (0 > peasycap->standard_offset) {
+                JOM(8, "%i=peasycap->standard_offset\n", \
+                                        peasycap->standard_offset);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EBUSY;
+        }
 
         if (0 != copy_from_user(&std_id, (void __user *)arg, \
                                                 sizeof(v4l2_std_id))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
         peasycap_standard = &easycap_standard[peasycap->standard_offset];
         std_id = peasycap_standard->v4l2_standard.id;
 
-        JOT(8, "user is told: %s\n", \
+        JOM(8, "user is told: %s\n", \
                                 &peasycap_standard->v4l2_standard.name[0]);
 
         if (0 != copy_to_user((void __user *)arg, &std_id, \
                                                 sizeof(v4l2_std_id))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_STD: {
-        static v4l2_std_id std_id;
-        static int rc;
+        v4l2_std_id std_id;
+        int rc;
 
-        JOT(8, "VIDIOC_S_STD\n");
+        JOM(8, "VIDIOC_S_STD\n");
 
         if (0 != copy_from_user(&std_id, (void __user *)arg, \
                                                 sizeof(v4l2_std_id))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
+        JOM(8, "User requests standard: 0x%08X%08X\n", \
+                (int)((std_id & (((v4l2_std_id)0xFFFFFFFF) << 32)) >> 32), \
+                (int)(std_id & ((v4l2_std_id)0xFFFFFFFF)));
+
         rc = adjust_standard(peasycap, std_id);
         if (0 > rc) {
-                JOT(8, "WARNING: adjust_standard() returned %i\n", rc);
+                JOM(8, "WARNING: adjust_standard() returned %i\n", rc);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -ENOENT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_REQBUFS: {
-        static int nbuffers;
-        static struct v4l2_requestbuffers v4l2_requestbuffers;
+        int nbuffers;
+        struct v4l2_requestbuffers v4l2_requestbuffers;
 
-        JOT(8, "VIDIOC_REQBUFS\n");
+        JOM(8, "VIDIOC_REQBUFS\n");
 
         if (0 != copy_from_user(&v4l2_requestbuffers, (void __user *)arg, \
                                 sizeof(struct v4l2_requestbuffers))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_requestbuffers.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (v4l2_requestbuffers.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
         if (v4l2_requestbuffers.memory != V4L2_MEMORY_MMAP) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
         nbuffers = v4l2_requestbuffers.count;
-        JOT(8, "                   User requests %i buffers ...\n", nbuffers);
+        JOM(8, "                   User requests %i buffers ...\n", nbuffers);
         if (nbuffers < 2)
                 nbuffers = 2;
         if (nbuffers > FRAME_BUFFER_MANY)
                 nbuffers = FRAME_BUFFER_MANY;
         if (v4l2_requestbuffers.count == nbuffers) {
-                JOT(8, "                   ... agree to  %i buffers\n", \
+                JOM(8, "                   ... agree to  %i buffers\n", \
                                                                 nbuffers);
         } else {
-                JOT(8, "                  ... insist on  %i buffers\n", \
+                JOM(8, "                  ... insist on  %i buffers\n", \
                                                                 nbuffers);
                 v4l2_requestbuffers.count = nbuffers;
         }
@@ -1566,32 +2059,35 @@ case VIDIOC_REQBUFS: {
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_requestbuffers, \
                                 sizeof(struct v4l2_requestbuffers))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_QUERYBUF: {
-        static __u32 index;
-        static struct v4l2_buffer v4l2_buffer;
+        __u32 index;
+        struct v4l2_buffer v4l2_buffer;
 
-        JOT(8, "VIDIOC_QUERYBUF\n");
+        JOM(8, "VIDIOC_QUERYBUF\n");
 
         if (peasycap->video_eof) {
-                JOT(8, "returning -1 because  %i=video_eof\n", \
+                JOM(8, "returning -EIO because  %i=video_eof\n", \
                                                         peasycap->video_eof);
-                return -1;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -EIO;
         }
 
         if (0 != copy_from_user(&v4l2_buffer, (void __user *)arg, \
                                         sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
         index = v4l2_buffer.index;
         if (index < 0 || index >= peasycap->frame_buffer_many)
                 return -EINVAL;
@@ -1602,49 +2098,55 @@ case VIDIOC_QUERYBUF: {
         v4l2_buffer.flags = V4L2_BUF_FLAG_MAPPED | \
                                                 peasycap->done[index] | \
                                                 peasycap->queued[index];
-        v4l2_buffer.field = peasycap->field;
+        v4l2_buffer.field = V4L2_FIELD_NONE;
         v4l2_buffer.memory = V4L2_MEMORY_MMAP;
         v4l2_buffer.m.offset = index * FRAME_BUFFER_SIZE;
         v4l2_buffer.length = FRAME_BUFFER_SIZE;
 
-        JOT(16, "  %10i=index\n", v4l2_buffer.index);
-        JOT(16, "  0x%08X=type\n", v4l2_buffer.type);
-        JOT(16, "  %10i=bytesused\n", v4l2_buffer.bytesused);
-        JOT(16, "  0x%08X=flags\n", v4l2_buffer.flags);
-        JOT(16, "  %10i=field\n", v4l2_buffer.field);
-        JOT(16, "  %10li=timestamp.tv_usec\n", \
+        JOM(16, "  %10i=index\n", v4l2_buffer.index);
+        JOM(16, "  0x%08X=type\n", v4l2_buffer.type);
+        JOM(16, "  %10i=bytesused\n", v4l2_buffer.bytesused);
+        JOM(16, "  0x%08X=flags\n", v4l2_buffer.flags);
+        JOM(16, "  %10i=field\n", v4l2_buffer.field);
+        JOM(16, "  %10li=timestamp.tv_usec\n", \
                                          (long)v4l2_buffer.timestamp.tv_usec);
-        JOT(16, "  %10i=sequence\n", v4l2_buffer.sequence);
-        JOT(16, "  0x%08X=memory\n", v4l2_buffer.memory);
-        JOT(16, "  %10i=m.offset\n", v4l2_buffer.m.offset);
-        JOT(16, "  %10i=length\n", v4l2_buffer.length);
+        JOM(16, "  %10i=sequence\n", v4l2_buffer.sequence);
+        JOM(16, "  0x%08X=memory\n", v4l2_buffer.memory);
+        JOM(16, "  %10i=m.offset\n", v4l2_buffer.m.offset);
+        JOM(16, "  %10i=length\n", v4l2_buffer.length);
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, \
                                         sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_QBUF: {
-        static struct v4l2_buffer v4l2_buffer;
+        struct v4l2_buffer v4l2_buffer;
 
-        JOT(8, "VIDIOC_QBUF\n");
+        JOM(8, "VIDIOC_QBUF\n");
 
         if (0 != copy_from_user(&v4l2_buffer, (void __user *)arg, \
                                         sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
-        if (v4l2_buffer.memory != V4L2_MEMORY_MMAP)
+        }
+        if (v4l2_buffer.memory != V4L2_MEMORY_MMAP) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
         if (v4l2_buffer.index < 0 || \
-                 (v4l2_buffer.index >= peasycap->frame_buffer_many))
+                 (v4l2_buffer.index >= peasycap->frame_buffer_many)) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
         v4l2_buffer.flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED;
 
         peasycap->done[v4l2_buffer.index]   = 0;
@@ -1652,11 +2154,11 @@ case VIDIOC_QBUF: {
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, \
                                         sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        JOT(8, ".....   user queueing frame buffer %i\n", \
+        JOM(8, ".....   user queueing frame buffer %i\n", \
                                                 (int)v4l2_buffer.index);
 
         peasycap->frame_lock = 0;
@@ -1667,36 +2169,60 @@ case VIDIOC_QBUF: {
 case VIDIOC_DQBUF:
         {
 #if defined(AUDIOTIME)
-        static struct signed_div_result sdr;
-        static long long int above, below, dnbydt, fudge, sll;
-        static unsigned long long int ull;
-        static struct timeval timeval0;
+        struct signed_div_result sdr;
+        long long int above, below, dnbydt, fudge, sll;
+        unsigned long long int ull;
+        struct timeval timeval8;
         struct timeval timeval1;
 #endif /*AUDIOTIME*/
-        static struct timeval timeval, timeval2;
-        static int i, j;
-        static struct v4l2_buffer v4l2_buffer;
+        struct timeval timeval, timeval2;
+        int i, j;
+        struct v4l2_buffer v4l2_buffer;
+        int rcdq;
+        __u16 input;
 
-        JOT(8, "VIDIOC_DQBUF\n");
+        JOM(8, "VIDIOC_DQBUF\n");
 
         if ((peasycap->video_idle) || (peasycap->video_eof)) {
-                JOT(8, "returning -EIO because  " \
+                JOM(8, "returning -EIO because  " \
                                 "%i=video_idle  %i=video_eof\n", \
                                 peasycap->video_idle, peasycap->video_eof);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EIO;
         }
 
         if (0 != copy_from_user(&v4l2_buffer, (void __user *)arg, \
                                         sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (v4l2_buffer.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
+        }
+
+        if (true == peasycap->offerfields) {
+                /*-----------------------------------------------------------*/
+                /*
+                 *  IN ITS 50 "fps" MODE tvtime SEEMS ALWAYS TO REQUEST
+                 *  V4L2_FIELD_BOTTOM
+                */
+                /*-----------------------------------------------------------*/
+                if (V4L2_FIELD_TOP == v4l2_buffer.field)
+                        JOM(8, "user wants V4L2_FIELD_TOP\n");
+                else if (V4L2_FIELD_BOTTOM == v4l2_buffer.field)
+                        JOM(8, "user wants V4L2_FIELD_BOTTOM\n");
+                else if (V4L2_FIELD_ANY == v4l2_buffer.field)
+                        JOM(8, "user wants V4L2_FIELD_ANY\n");
+                else
+                        JOM(8, "user wants V4L2_FIELD_...UNKNOWN: %i\n", \
+                                                        v4l2_buffer.field);
+        }
 
         if (!peasycap->video_isoc_streaming) {
-                JOT(16, "returning -EIO because video urbs not streaming\n");
+                JOM(16, "returning -EIO because video urbs not streaming\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EIO;
         }
 /*---------------------------------------------------------------------------*/
@@ -1708,19 +2234,28 @@ case VIDIOC_DQBUF:
 /*---------------------------------------------------------------------------*/
 
         if (!peasycap->polled) {
-                if (-EIO == easycap_dqbuf(peasycap, 0))
-                        return -EIO;
+                do {
+                        rcdq = easycap_dqbuf(peasycap, 0);
+                        if (-EIO == rcdq) {
+                                JOM(8, "returning -EIO because " \
+                                                "dqbuf() returned -EIO\n");
+                                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                                return -EIO;
+                        }
+                } while (0 != rcdq);
         } else {
-                if (peasycap->video_eof)
+                if (peasycap->video_eof) {
+                        mutex_unlock(&easycap_dongle[kd].mutex_video);
                         return -EIO;
+                }
         }
         if (V4L2_BUF_FLAG_DONE != peasycap->done[peasycap->frame_read]) {
-                SAY("ERROR: V4L2_BUF_FLAG_DONE != 0x%08X\n", \
+                SAM("ERROR: V4L2_BUF_FLAG_DONE != 0x%08X\n", \
                                         peasycap->done[peasycap->frame_read]);
         }
         peasycap->polled = 0;
 
-        if (!(isequence % 10)) {
+        if (!(peasycap->isequence % 10)) {
                 for (i = 0; i < 179; i++)
                         peasycap->merit[i] = peasycap->merit[i+1];
                 peasycap->merit[179] = merit_saa(peasycap->pusb_device);
@@ -1728,7 +2263,7 @@ case VIDIOC_DQBUF:
                 for (i = 0; i < 180; i++)
                         j += peasycap->merit[i];
                 if (90 < j) {
-                        SAY("easycap driver shutting down " \
+                        SAM("easycap driver shutting down " \
                                                         "on condition blue\n");
                         peasycap->video_eof = 1; peasycap->audio_eof = 1;
                 }
@@ -1738,31 +2273,23 @@ case VIDIOC_DQBUF:
         v4l2_buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         v4l2_buffer.bytesused = peasycap->frame_buffer_used;
         v4l2_buffer.flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE;
-        v4l2_buffer.field =  peasycap->field;
-        if (V4L2_FIELD_ALTERNATE == v4l2_buffer.field)
-                v4l2_buffer.field = \
-                                0x000F & (peasycap->\
-                                frame_buffer[peasycap->frame_read][0].kount);
+        if (true == peasycap->offerfields)
+                v4l2_buffer.field = V4L2_FIELD_BOTTOM;
+        else
+                v4l2_buffer.field = V4L2_FIELD_NONE;
         do_gettimeofday(&timeval);
         timeval2 = timeval;
 
 #if defined(AUDIOTIME)
         if (!peasycap->timeval0.tv_sec) {
-                timeval0 = timeval;
+                timeval8 = timeval;
                 timeval1 = timeval;
                 timeval2 = timeval;
                 dnbydt = 192000;
-
-                if (mutex_lock_interruptible(&(peasycap->mutex_timeval0)))
-                        return -ERESTARTSYS;
-                peasycap->timeval0 = timeval0;
-                mutex_unlock(&(peasycap->mutex_timeval0));
+                peasycap->timeval0 = timeval8;
         } else {
-                if (mutex_lock_interruptible(&(peasycap->mutex_timeval1)))
-                        return -ERESTARTSYS;
                 dnbydt = peasycap->dnbydt;
                 timeval1 = peasycap->timeval1;
-                mutex_unlock(&(peasycap->mutex_timeval1));
                 above = dnbydt * MICROSECONDS(timeval, timeval1);
                 below = 192000;
                 sdr = signed_div(above, below);
@@ -1774,72 +2301,76 @@ case VIDIOC_DQBUF:
                 timeval2.tv_usec = sdr.remainder;
                 timeval2.tv_sec = timeval1.tv_sec + sdr.quotient;
         }
-        if (!(isequence % 500)) {
+        if (!(peasycap->isequence % 500)) {
                 fudge = ((long long int)(1000000)) * \
                                 ((long long int)(timeval.tv_sec - \
                                                 timeval2.tv_sec)) + \
                                 (long long int)(timeval.tv_usec - \
-                                timeval2.tv_usec);
+                                                timeval2.tv_usec);
                 sdr = signed_div(fudge, 1000);
                 sll = sdr.quotient;
                 ull = sdr.remainder;
 
-                SAY("%5lli.%-3lli=ms timestamp fudge\n", sll, ull);
+                SAM("%5lli.%-3lli=ms timestamp fudge\n", sll, ull);
         }
 #endif /*AUDIOTIME*/
 
         v4l2_buffer.timestamp = timeval2;
-        v4l2_buffer.sequence = isequence++;
+        v4l2_buffer.sequence = peasycap->isequence++;
         v4l2_buffer.memory = V4L2_MEMORY_MMAP;
         v4l2_buffer.m.offset = v4l2_buffer.index * FRAME_BUFFER_SIZE;
         v4l2_buffer.length = FRAME_BUFFER_SIZE;
 
-        JOT(16, "  %10i=index\n", v4l2_buffer.index);
-        JOT(16, "  0x%08X=type\n", v4l2_buffer.type);
-        JOT(16, "  %10i=bytesused\n", v4l2_buffer.bytesused);
-        JOT(16, "  0x%08X=flags\n", v4l2_buffer.flags);
-        JOT(16, "  %10i=field\n", v4l2_buffer.field);
-        JOT(16, "  %10li=timestamp.tv_usec\n", \
+        JOM(16, "  %10i=index\n", v4l2_buffer.index);
+        JOM(16, "  0x%08X=type\n", v4l2_buffer.type);
+        JOM(16, "  %10i=bytesused\n", v4l2_buffer.bytesused);
+        JOM(16, "  0x%08X=flags\n", v4l2_buffer.flags);
+        JOM(16, "  %10i=field\n", v4l2_buffer.field);
+        JOM(16, "  %10li=timestamp.tv_sec\n", \
+                                        (long)v4l2_buffer.timestamp.tv_sec);
+        JOM(16, "  %10li=timestamp.tv_usec\n", \
                                         (long)v4l2_buffer.timestamp.tv_usec);
-        JOT(16, "  %10i=sequence\n", v4l2_buffer.sequence);
-        JOT(16, "  0x%08X=memory\n", v4l2_buffer.memory);
-        JOT(16, "  %10i=m.offset\n", v4l2_buffer.m.offset);
-        JOT(16, "  %10i=length\n", v4l2_buffer.length);
+        JOM(16, "  %10i=sequence\n", v4l2_buffer.sequence);
+        JOM(16, "  0x%08X=memory\n", v4l2_buffer.memory);
+        JOM(16, "  %10i=m.offset\n", v4l2_buffer.m.offset);
+        JOM(16, "  %10i=length\n", v4l2_buffer.length);
 
         if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, \
                                                 sizeof(struct v4l2_buffer))) {
-                POUT;
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        JOT(8, "..... user is offered frame buffer %i\n", \
+        input = peasycap->frame_buffer[peasycap->frame_read][0].input;
+        if (0x08 & input) {
+                JOM(8, "user is offered frame buffer %i, input %i\n", \
+                                        peasycap->frame_read, (0x07 & input));
+        } else {
+                JOM(8, "user is offered frame buffer %i\n", \
                                                         peasycap->frame_read);
+        }
         peasycap->frame_lock = 1;
+        JOM(8, "%i=peasycap->frame_fill\n", peasycap->frame_fill);
         if (peasycap->frame_read == peasycap->frame_fill) {
                 if (peasycap->frame_lock) {
-                        JOT(8, "ERROR:  filling frame buffer " \
+                        JOM(8, "WORRY:  filling frame buffer " \
                                                 "while offered to user\n");
                 }
         }
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/*---------------------------------------------------------------------------*/
-/*
- *  AUDIO URBS HAVE ALREADY BEEN SUBMITTED WHEN THIS COMMAND IS RECEIVED;
- *  VIDEO URBS HAVE NOT.
- */
-/*---------------------------------------------------------------------------*/
 case VIDIOC_STREAMON: {
-        static int i;
+        int i;
 
-        JOT(8, "VIDIOC_STREAMON\n");
+        JOM(8, "VIDIOC_STREAMON\n");
 
-        isequence = 0;
+        peasycap->isequence = 0;
         for (i = 0; i < 180; i++)
                 peasycap->merit[i] = 0;
         if ((struct usb_device *)NULL == peasycap->pusb_device) {
-                SAY("ERROR: peasycap->pusb_device is NULL\n");
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
         submit_video_urbs(peasycap);
@@ -1851,10 +2382,11 @@ case VIDIOC_STREAMON: {
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_STREAMOFF: {
-        JOT(8, "VIDIOC_STREAMOFF\n");
+        JOM(8, "VIDIOC_STREAMOFF\n");
 
         if ((struct usb_device *)NULL == peasycap->pusb_device) {
-                SAY("ERROR: peasycap->pusb_device is NULL\n");
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
@@ -1866,7 +2398,7 @@ case VIDIOC_STREAMOFF: {
  *  THE USERSPACE PROGRAM, E.G. mplayer, MAY HANG ON EXIT.   BEWARE.
  */
 /*---------------------------------------------------------------------------*/
-        JOT(8, "calling wake_up on wq_video and wq_audio\n");
+        JOM(8, "calling wake_up on wq_video and wq_audio\n");
         wake_up_interruptible(&(peasycap->wq_video));
         wake_up_interruptible(&(peasycap->wq_audio));
 /*---------------------------------------------------------------------------*/
@@ -1874,111 +2406,200 @@ case VIDIOC_STREAMOFF: {
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_PARM: {
-        static struct v4l2_streamparm v4l2_streamparm;
+        struct v4l2_streamparm *pv4l2_streamparm;
 
-        JOT(8, "VIDIOC_G_PARM\n");
-
-        if (0 != copy_from_user(&v4l2_streamparm, (void __user *)arg, \
+        JOM(8, "VIDIOC_G_PARM\n");
+        pv4l2_streamparm = kzalloc(sizeof(struct v4l2_streamparm), GFP_KERNEL);
+        if (!pv4l2_streamparm) {
+                SAM("ERROR: out of memory\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ENOMEM;
+        }
+        if (0 != copy_from_user(pv4l2_streamparm, (void __user *)arg, \
                                         sizeof(struct v4l2_streamparm))) {
-                POUT;
+                kfree(pv4l2_streamparm);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
 
-        if (v4l2_streamparm.type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-                POUT;
+        if (pv4l2_streamparm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                kfree(pv4l2_streamparm);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EINVAL;
         }
-        v4l2_streamparm.parm.capture.capability = 0;
-        v4l2_streamparm.parm.capture.capturemode = 0;
-        v4l2_streamparm.parm.capture.timeperframe.numerator = 1;
-        v4l2_streamparm.parm.capture.timeperframe.denominator = 30;
-        v4l2_streamparm.parm.capture.readbuffers = peasycap->frame_buffer_many;
-        v4l2_streamparm.parm.capture.extendedmode = 0;
-        if (0 != copy_to_user((void __user *)arg, &v4l2_streamparm, \
+        pv4l2_streamparm->parm.capture.capability = 0;
+        pv4l2_streamparm->parm.capture.capturemode = 0;
+        pv4l2_streamparm->parm.capture.timeperframe.numerator = 1;
+
+        if (peasycap->fps) {
+                pv4l2_streamparm->parm.capture.timeperframe.\
+                                                denominator = peasycap->fps;
+        } else {
+                if (true == peasycap->ntsc) {
+                        pv4l2_streamparm->parm.capture.timeperframe.\
+                                                denominator = 30;
+                } else {
+                        pv4l2_streamparm->parm.capture.timeperframe.\
+                                                denominator = 25;
+                }
+        }
+
+        pv4l2_streamparm->parm.capture.readbuffers = \
+                                                peasycap->frame_buffer_many;
+        pv4l2_streamparm->parm.capture.extendedmode = 0;
+        if (0 != copy_to_user((void __user *)arg, pv4l2_streamparm, \
                                         sizeof(struct v4l2_streamparm))) {
-                POUT;
+                kfree(pv4l2_streamparm);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
                 return -EFAULT;
         }
+        kfree(pv4l2_streamparm);
         break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_PARM: {
-        JOT(8, "VIDIOC_S_PARM unsupported\n");
+        JOM(8, "VIDIOC_S_PARM unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_AUDIO: {
-        JOT(8, "VIDIOC_G_AUDIO unsupported\n");
+        JOM(8, "VIDIOC_G_AUDIO unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_AUDIO: {
-        JOT(8, "VIDIOC_S_AUDIO unsupported\n");
+        JOM(8, "VIDIOC_S_AUDIO unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_S_TUNER: {
-        JOT(8, "VIDIOC_S_TUNER unsupported\n");
+        JOM(8, "VIDIOC_S_TUNER unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_FBUF:
 case VIDIOC_S_FBUF:
 case VIDIOC_OVERLAY: {
-        JOT(8, "VIDIOC_G_FBUF|VIDIOC_S_FBUF|VIDIOC_OVERLAY unsupported\n");
+        JOM(8, "VIDIOC_G_FBUF|VIDIOC_S_FBUF|VIDIOC_OVERLAY unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 case VIDIOC_G_TUNER: {
-        JOT(8, "VIDIOC_G_TUNER unsupported\n");
+        JOM(8, "VIDIOC_G_TUNER unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 case VIDIOC_G_FREQUENCY:
 case VIDIOC_S_FREQUENCY: {
-        JOT(8, "VIDIOC_G_FREQUENCY|VIDIOC_S_FREQUENCY unsupported\n");
+        JOM(8, "VIDIOC_G_FREQUENCY|VIDIOC_S_FREQUENCY unsupported\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -EINVAL;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 default: {
-        JOT(8, "ERROR: unrecognized V4L2 IOCTL command: 0x%08X\n", cmd);
-        explain_ioctl(cmd);
-        POUT;
+        JOM(8, "ERROR: unrecognized V4L2 IOCTL command: 0x%08X\n", cmd);
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
         return -ENOIOCTLCMD;
 }
 }
+mutex_unlock(&easycap_dongle[kd].mutex_video);
+JOM(4, "unlocked easycap_dongle[%i].mutex_video\n", kd);
 return 0;
 }
-
-long easycap_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct inode *inode = file->f_dentry->d_inode;
-        long ret;
-
-        lock_kernel();
-        ret = easycap_ioctl_bkl(inode, file, cmd, arg);
-        unlock_kernel();
-
-        return ret;
-}
-
-/*--------------------------------------------------------------------------*/
-static int easysnd_ioctl_bkl(struct inode *inode, struct file *file,
-                             unsigned int cmd, unsigned long arg)
+/*****************************************************************************/
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if ((defined(EASYCAP_IS_VIDEODEV_CLIENT)) || \
+        (defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)))
+long
+easysnd_ioctl_noinode(struct file *file, unsigned int cmd, unsigned long arg) {
+        return (long)easysnd_ioctl((struct inode *)NULL, file, cmd, arg);
+}
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT||EASYCAP_NEEDS_UNLOCKED_IOCTL*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+/*---------------------------------------------------------------------------*/
+int
+easysnd_ioctl(struct inode *inode, struct file *file,
+                                        unsigned int cmd, unsigned long arg)
 {
 struct easycap *peasycap;
 struct usb_device *p;
+int kd;
 
+if (NULL == file) {
+        SAY("ERROR:  file is NULL\n");
+        return -ERESTARTSYS;
+}
 peasycap = file->private_data;
 if (NULL == peasycap) {
         SAY("ERROR:  peasycap is NULL.\n");
-        return -1;
+        return -EFAULT;
+}
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap\n");
+        return -EFAULT;
 }
 p = peasycap->pusb_device;
+if (NULL == p) {
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
+        return -EFAULT;
+}
+kd = isdongle(peasycap);
+if (0 <= kd && DONGLE_MANY > kd) {
+        if (mutex_lock_interruptible(&easycap_dongle[kd].mutex_audio)) {
+                SAY("ERROR: cannot lock easycap_dongle[%i].mutex_audio\n", kd);
+                return -ERESTARTSYS;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_audio\n", kd);
+/*---------------------------------------------------------------------------*/
+/*
+ *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,
+ *  IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
+ *  IF NECESSARY, BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        if (kd != isdongle(peasycap))
+                return -ERESTARTSYS;
+        if (NULL == file) {
+                SAY("ERROR:  file is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+        peasycap = file->private_data;
+        if (NULL == peasycap) {
+                SAY("ERROR:  peasycap is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+        if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+                SAY("ERROR: bad peasycap\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -EFAULT;
+        }
+        p = peasycap->pusb_device;
+        if (NULL == peasycap->pusb_device) {
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+} else {
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE
+ *  ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED.  BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        return -ERESTARTSYS;
+}
 /*---------------------------------------------------------------------------*/
 switch (cmd) {
 case SNDCTL_DSP_GETCAPS: {
         int caps;
-        JOT(8, "SNDCTL_DSP_GETCAPS\n");
+        JOM(8, "SNDCTL_DSP_GETCAPS\n");
 
 #if defined(UPSAMPLE)
         if (true == peasycap->microphone)
@@ -1992,13 +2613,15 @@ case SNDCTL_DSP_GETCAPS: {
                 caps = 0x04400000;
 #endif /*UPSAMPLE*/
 
-        if (0 != copy_to_user((void __user *)arg, &caps, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &caps, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_GETFMTS: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_GETFMTS\n");
+        JOM(8, "SNDCTL_DSP_GETFMTS\n");
 
 #if defined(UPSAMPLE)
         if (true == peasycap->microphone)
@@ -2012,16 +2635,20 @@ case SNDCTL_DSP_GETFMTS: {
                 incoming = AFMT_S16_LE;
 #endif /*UPSAMPLE*/
 
-        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_SETFMT: {
         int incoming, outgoing;
-        JOT(8, "SNDCTL_DSP_SETFMT\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_SETFMT\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
 
 #if defined(UPSAMPLE)
         if (true == peasycap->microphone)
@@ -2036,22 +2663,27 @@ case SNDCTL_DSP_SETFMT: {
 #endif /*UPSAMPLE*/
 
         if (incoming != outgoing) {
-                JOT(8, "........... %i=outgoing\n", outgoing);
-                JOT(8, "        cf. %i=AFMT_S16_LE\n", AFMT_S16_LE);
-                JOT(8, "        cf. %i=AFMT_U8\n", AFMT_U8);
+                JOM(8, "........... %i=outgoing\n", outgoing);
+                JOM(8, "        cf. %i=AFMT_S16_LE\n", AFMT_S16_LE);
+                JOM(8, "        cf. %i=AFMT_U8\n", AFMT_U8);
                 if (0 != copy_to_user((void __user *)arg, &outgoing, \
-                                                                sizeof(int)))
+                                                                sizeof(int))) {
+                        mutex_unlock(&easycap_dongle[kd].mutex_audio);
                         return -EFAULT;
+                }
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EINVAL ;
         }
         break;
 }
 case SNDCTL_DSP_STEREO: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_STEREO\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_STEREO\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
 
 #if defined(UPSAMPLE)
         if (true == peasycap->microphone)
@@ -2065,16 +2697,20 @@ case SNDCTL_DSP_STEREO: {
                 incoming = 1;
 #endif /*UPSAMPLE*/
 
-        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_SPEED: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_SPEED\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_SPEED\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
 
 #if defined(UPSAMPLE)
         if (true == peasycap->microphone)
@@ -2088,29 +2724,37 @@ case SNDCTL_DSP_SPEED: {
                 incoming = 48000;
 #endif /*UPSAMPLE*/
 
-        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_GETTRIGGER: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_GETTRIGGER\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_GETTRIGGER\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
 
         incoming = PCM_ENABLE_INPUT;
-        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_SETTRIGGER: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_SETTRIGGER\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_SETTRIGGER\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
-        JOT(8, "........... cf 0x%x=PCM_ENABLE_INPUT " \
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
+        JOM(8, "........... cf 0x%x=PCM_ENABLE_INPUT " \
                                 "0x%x=PCM_ENABLE_OUTPUT\n", \
                                         PCM_ENABLE_INPUT, PCM_ENABLE_OUTPUT);
         ;
@@ -2121,19 +2765,23 @@ case SNDCTL_DSP_SETTRIGGER: {
 }
 case SNDCTL_DSP_GETBLKSIZE: {
         int incoming;
-        JOT(8, "SNDCTL_DSP_GETBLKSIZE\n");
-        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int)))
+        JOM(8, "SNDCTL_DSP_GETBLKSIZE\n");
+        if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
-        JOT(8, "........... %i=incoming\n", incoming);
+        }
+        JOM(8, "........... %i=incoming\n", incoming);
         incoming = peasycap->audio_bytes_per_fragment;
-        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int)))
+        if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
 case SNDCTL_DSP_GETISPACE: {
         struct audio_buf_info audio_buf_info;
 
-        JOT(8, "SNDCTL_DSP_GETISPACE\n");
+        JOM(8, "SNDCTL_DSP_GETISPACE\n");
 
         audio_buf_info.bytes      = peasycap->audio_bytes_per_fragment;
         audio_buf_info.fragments  = 1;
@@ -2141,555 +2789,31 @@ case SNDCTL_DSP_GETISPACE: {
         audio_buf_info.fragstotal = 0;
 
         if (0 != copy_to_user((void __user *)arg, &audio_buf_info, \
-                                                                sizeof(int)))
+                                                                sizeof(int))) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
+        }
         break;
 }
+case 0x00005401:
+case 0x00005402:
+case 0x00005403:
+case 0x00005404:
+case 0x00005405:
+case 0x00005406: {
+        JOM(8, "SNDCTL_TMR_...: 0x%08X unsupported\n", cmd);
+        mutex_unlock(&easycap_dongle[kd].mutex_audio);
+        return -ENOIOCTLCMD;
+}
 default: {
-        JOT(8, "ERROR: unrecognized DSP IOCTL command: 0x%08X\n", cmd);
-        POUT;
+        JOM(8, "ERROR: unrecognized DSP IOCTL command: 0x%08X\n", cmd);
+        mutex_unlock(&easycap_dongle[kd].mutex_audio);
         return -ENOIOCTLCMD;
 }
 }
+mutex_unlock(&easycap_dongle[kd].mutex_audio);
 return 0;
 }
+/*****************************************************************************/
 
-long easysnd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct inode *inode = file->f_dentry->d_inode;
-        long ret;
-
-        lock_kernel();
-        ret = easysnd_ioctl_bkl(inode, file, cmd, arg);
-        unlock_kernel();
-
-        return ret;
-}
 
-/*****************************************************************************/
-int explain_ioctl(__u32 wot)
-{
-int k;
-/*---------------------------------------------------------------------------*/
-/*
- *  THE DATA FOR THE ARRAY mess BELOW WERE CONSTRUCTED BY RUNNING THE FOLLOWING
- *  SHELL SCRIPT:
- *  #
- *  cat /usr/src/linux-headers-`uname -r`/include/linux/videodev2.h | \
- *     grep "^#define VIDIOC_" - | grep -v "_OLD" - | \
- *     sed -e "s,_IO.*$,,;p" | sed -e "N;s,\n,, " | \
- *     sed -e "s/^#define /  {/;s/#define /, \"/;s/$/\"},/" | \
- *     sed -e "s,       ,,g;s, ,,g" >ioctl.tmp
- *  echo "{0xFFFFFFFF,\"\"}" >>ioctl.tmp
- *  exit 0
- *  #
- * AND REINSTATING THE EXCISED "_OLD" CASES WERE LATER MANUALLY.
- *
- * THE DATA FOR THE ARRAY mess1 BELOW WERE CONSTRUCTED BY RUNNING THE FOLLOWING
- * SHELL SCRIPT:
- *  cat /usr/src/linux-headers-`uname -r`/include/linux/videodev.h | \
- *     grep "^#define VIDIOC" - | grep -v "_OLD" - | \
- *     sed -e "s,_IO.*$,,;p" | sed -e "N;s,\n,, " | \
- *     sed -e "s/^#define /  {/;s/#define /, \"/;s/$/\"},/" | \
- *     sed -e "s,   ,,g;s, ,,g" >ioctl.tmp
- *  echo "{0xFFFFFFFF,\"\"}" >>ioctl.tmp
- *  exit 0
- *  #
- */
-/*---------------------------------------------------------------------------*/
-static struct mess {
-        __u32 command;
-        char  name[64];
-} mess[] = {
-#if defined(VIDIOC_QUERYCAP)
-{VIDIOC_QUERYCAP, "VIDIOC_QUERYCAP"},
-#endif
-#if defined(VIDIOC_RESERVED)
-{VIDIOC_RESERVED, "VIDIOC_RESERVED"},
-#endif
-#if defined(VIDIOC_ENUM_FMT)
-{VIDIOC_ENUM_FMT, "VIDIOC_ENUM_FMT"},
-#endif
-#if defined(VIDIOC_G_FMT)
-{VIDIOC_G_FMT, "VIDIOC_G_FMT"},
-#endif
-#if defined(VIDIOC_S_FMT)
-{VIDIOC_S_FMT, "VIDIOC_S_FMT"},
-#endif
-#if defined(VIDIOC_REQBUFS)
-{VIDIOC_REQBUFS, "VIDIOC_REQBUFS"},
-#endif
-#if defined(VIDIOC_QUERYBUF)
-{VIDIOC_QUERYBUF, "VIDIOC_QUERYBUF"},
-#endif
-#if defined(VIDIOC_G_FBUF)
-{VIDIOC_G_FBUF, "VIDIOC_G_FBUF"},
-#endif
-#if defined(VIDIOC_S_FBUF)
-{VIDIOC_S_FBUF, "VIDIOC_S_FBUF"},
-#endif
-#if defined(VIDIOC_OVERLAY)
-{VIDIOC_OVERLAY, "VIDIOC_OVERLAY"},
-#endif
-#if defined(VIDIOC_QBUF)
-{VIDIOC_QBUF, "VIDIOC_QBUF"},
-#endif
-#if defined(VIDIOC_DQBUF)
-{VIDIOC_DQBUF, "VIDIOC_DQBUF"},
-#endif
-#if defined(VIDIOC_STREAMON)
-{VIDIOC_STREAMON, "VIDIOC_STREAMON"},
-#endif
-#if defined(VIDIOC_STREAMOFF)
-{VIDIOC_STREAMOFF, "VIDIOC_STREAMOFF"},
-#endif
-#if defined(VIDIOC_G_PARM)
-{VIDIOC_G_PARM, "VIDIOC_G_PARM"},
-#endif
-#if defined(VIDIOC_S_PARM)
-{VIDIOC_S_PARM, "VIDIOC_S_PARM"},
-#endif
-#if defined(VIDIOC_G_STD)
-{VIDIOC_G_STD, "VIDIOC_G_STD"},
-#endif
-#if defined(VIDIOC_S_STD)
-{VIDIOC_S_STD, "VIDIOC_S_STD"},
-#endif
-#if defined(VIDIOC_ENUMSTD)
-{VIDIOC_ENUMSTD, "VIDIOC_ENUMSTD"},
-#endif
-#if defined(VIDIOC_ENUMINPUT)
-{VIDIOC_ENUMINPUT, "VIDIOC_ENUMINPUT"},
-#endif
-#if defined(VIDIOC_G_CTRL)
-{VIDIOC_G_CTRL, "VIDIOC_G_CTRL"},
-#endif
-#if defined(VIDIOC_S_CTRL)
-{VIDIOC_S_CTRL, "VIDIOC_S_CTRL"},
-#endif
-#if defined(VIDIOC_G_TUNER)
-{VIDIOC_G_TUNER, "VIDIOC_G_TUNER"},
-#endif
-#if defined(VIDIOC_S_TUNER)
-{VIDIOC_S_TUNER, "VIDIOC_S_TUNER"},
-#endif
-#if defined(VIDIOC_G_AUDIO)
-{VIDIOC_G_AUDIO, "VIDIOC_G_AUDIO"},
-#endif
-#if defined(VIDIOC_S_AUDIO)
-{VIDIOC_S_AUDIO, "VIDIOC_S_AUDIO"},
-#endif
-#if defined(VIDIOC_QUERYCTRL)
-{VIDIOC_QUERYCTRL, "VIDIOC_QUERYCTRL"},
-#endif
-#if defined(VIDIOC_QUERYMENU)
-{VIDIOC_QUERYMENU, "VIDIOC_QUERYMENU"},
-#endif
-#if defined(VIDIOC_G_INPUT)
-{VIDIOC_G_INPUT, "VIDIOC_G_INPUT"},
-#endif
-#if defined(VIDIOC_S_INPUT)
-{VIDIOC_S_INPUT, "VIDIOC_S_INPUT"},
-#endif
-#if defined(VIDIOC_G_OUTPUT)
-{VIDIOC_G_OUTPUT, "VIDIOC_G_OUTPUT"},
-#endif
-#if defined(VIDIOC_S_OUTPUT)
-{VIDIOC_S_OUTPUT, "VIDIOC_S_OUTPUT"},
-#endif
-#if defined(VIDIOC_ENUMOUTPUT)
-{VIDIOC_ENUMOUTPUT, "VIDIOC_ENUMOUTPUT"},
-#endif
-#if defined(VIDIOC_G_AUDOUT)
-{VIDIOC_G_AUDOUT, "VIDIOC_G_AUDOUT"},
-#endif
-#if defined(VIDIOC_S_AUDOUT)
-{VIDIOC_S_AUDOUT, "VIDIOC_S_AUDOUT"},
-#endif
-#if defined(VIDIOC_G_MODULATOR)
-{VIDIOC_G_MODULATOR, "VIDIOC_G_MODULATOR"},
-#endif
-#if defined(VIDIOC_S_MODULATOR)
-{VIDIOC_S_MODULATOR, "VIDIOC_S_MODULATOR"},
-#endif
-#if defined(VIDIOC_G_FREQUENCY)
-{VIDIOC_G_FREQUENCY, "VIDIOC_G_FREQUENCY"},
-#endif
-#if defined(VIDIOC_S_FREQUENCY)
-{VIDIOC_S_FREQUENCY, "VIDIOC_S_FREQUENCY"},
-#endif
-#if defined(VIDIOC_CROPCAP)
-{VIDIOC_CROPCAP, "VIDIOC_CROPCAP"},
-#endif
-#if defined(VIDIOC_G_CROP)
-{VIDIOC_G_CROP, "VIDIOC_G_CROP"},
-#endif
-#if defined(VIDIOC_S_CROP)
-{VIDIOC_S_CROP, "VIDIOC_S_CROP"},
-#endif
-#if defined(VIDIOC_G_JPEGCOMP)
-{VIDIOC_G_JPEGCOMP, "VIDIOC_G_JPEGCOMP"},
-#endif
-#if defined(VIDIOC_S_JPEGCOMP)
-{VIDIOC_S_JPEGCOMP, "VIDIOC_S_JPEGCOMP"},
-#endif
-#if defined(VIDIOC_QUERYSTD)
-{VIDIOC_QUERYSTD, "VIDIOC_QUERYSTD"},
-#endif
-#if defined(VIDIOC_TRY_FMT)
-{VIDIOC_TRY_FMT, "VIDIOC_TRY_FMT"},
-#endif
-#if defined(VIDIOC_ENUMAUDIO)
-{VIDIOC_ENUMAUDIO, "VIDIOC_ENUMAUDIO"},
-#endif
-#if defined(VIDIOC_ENUMAUDOUT)
-{VIDIOC_ENUMAUDOUT, "VIDIOC_ENUMAUDOUT"},
-#endif
-#if defined(VIDIOC_G_PRIORITY)
-{VIDIOC_G_PRIORITY, "VIDIOC_G_PRIORITY"},
-#endif
-#if defined(VIDIOC_S_PRIORITY)
-{VIDIOC_S_PRIORITY, "VIDIOC_S_PRIORITY"},
-#endif
-#if defined(VIDIOC_G_SLICED_VBI_CAP)
-{VIDIOC_G_SLICED_VBI_CAP, "VIDIOC_G_SLICED_VBI_CAP"},
-#endif
-#if defined(VIDIOC_LOG_STATUS)
-{VIDIOC_LOG_STATUS, "VIDIOC_LOG_STATUS"},
-#endif
-#if defined(VIDIOC_G_EXT_CTRLS)
-{VIDIOC_G_EXT_CTRLS, "VIDIOC_G_EXT_CTRLS"},
-#endif
-#if defined(VIDIOC_S_EXT_CTRLS)
-{VIDIOC_S_EXT_CTRLS, "VIDIOC_S_EXT_CTRLS"},
-#endif
-#if defined(VIDIOC_TRY_EXT_CTRLS)
-{VIDIOC_TRY_EXT_CTRLS, "VIDIOC_TRY_EXT_CTRLS"},
-#endif
-#if defined(VIDIOC_ENUM_FRAMESIZES)
-{VIDIOC_ENUM_FRAMESIZES, "VIDIOC_ENUM_FRAMESIZES"},
-#endif
-#if defined(VIDIOC_ENUM_FRAMEINTERVALS)
-{VIDIOC_ENUM_FRAMEINTERVALS, "VIDIOC_ENUM_FRAMEINTERVALS"},
-#endif
-#if defined(VIDIOC_G_ENC_INDEX)
-{VIDIOC_G_ENC_INDEX, "VIDIOC_G_ENC_INDEX"},
-#endif
-#if defined(VIDIOC_ENCODER_CMD)
-{VIDIOC_ENCODER_CMD, "VIDIOC_ENCODER_CMD"},
-#endif
-#if defined(VIDIOC_TRY_ENCODER_CMD)
-{VIDIOC_TRY_ENCODER_CMD, "VIDIOC_TRY_ENCODER_CMD"},
-#endif
-#if defined(VIDIOC_G_CHIP_IDENT)
-{VIDIOC_G_CHIP_IDENT, "VIDIOC_G_CHIP_IDENT"},
-#endif
-
-#if defined(VIDIOC_OVERLAY_OLD)
-{VIDIOC_OVERLAY_OLD, "VIDIOC_OVERLAY_OLD"},
-#endif
-#if defined(VIDIOC_S_PARM_OLD)
-{VIDIOC_S_PARM_OLD, "VIDIOC_S_PARM_OLD"},
-#endif
-#if defined(VIDIOC_S_CTRL_OLD)
-{VIDIOC_S_CTRL_OLD, "VIDIOC_S_CTRL_OLD"},
-#endif
-#if defined(VIDIOC_G_AUDIO_OLD)
-{VIDIOC_G_AUDIO_OLD, "VIDIOC_G_AUDIO_OLD"},
-#endif
-#if defined(VIDIOC_G_AUDOUT_OLD)
-{VIDIOC_G_AUDOUT_OLD, "VIDIOC_G_AUDOUT_OLD"},
-#endif
-#if defined(VIDIOC_CROPCAP_OLD)
-{VIDIOC_CROPCAP_OLD, "VIDIOC_CROPCAP_OLD"},
-#endif
-{0xFFFFFFFF, ""}
-};
-
-static struct mess mess1[] = \
-{
-#if defined(VIDIOCGCAP)
-{VIDIOCGCAP, "VIDIOCGCAP"},
-#endif
-#if defined(VIDIOCGCHAN)
-{VIDIOCGCHAN, "VIDIOCGCHAN"},
-#endif
-#if defined(VIDIOCSCHAN)
-{VIDIOCSCHAN, "VIDIOCSCHAN"},
-#endif
-#if defined(VIDIOCGTUNER)
-{VIDIOCGTUNER, "VIDIOCGTUNER"},
-#endif
-#if defined(VIDIOCSTUNER)
-{VIDIOCSTUNER, "VIDIOCSTUNER"},
-#endif
-#if defined(VIDIOCGPICT)
-{VIDIOCGPICT, "VIDIOCGPICT"},
-#endif
-#if defined(VIDIOCSPICT)
-{VIDIOCSPICT, "VIDIOCSPICT"},
-#endif
-#if defined(VIDIOCCAPTURE)
-{VIDIOCCAPTURE, "VIDIOCCAPTURE"},
-#endif
-#if defined(VIDIOCGWIN)
-{VIDIOCGWIN, "VIDIOCGWIN"},
-#endif
-#if defined(VIDIOCSWIN)
-{VIDIOCSWIN, "VIDIOCSWIN"},
-#endif
-#if defined(VIDIOCGFBUF)
-{VIDIOCGFBUF, "VIDIOCGFBUF"},
-#endif
-#if defined(VIDIOCSFBUF)
-{VIDIOCSFBUF, "VIDIOCSFBUF"},
-#endif
-#if defined(VIDIOCKEY)
-{VIDIOCKEY, "VIDIOCKEY"},
-#endif
-#if defined(VIDIOCGFREQ)
-{VIDIOCGFREQ, "VIDIOCGFREQ"},
-#endif
-#if defined(VIDIOCSFREQ)
-{VIDIOCSFREQ, "VIDIOCSFREQ"},
-#endif
-#if defined(VIDIOCGAUDIO)
-{VIDIOCGAUDIO, "VIDIOCGAUDIO"},
-#endif
-#if defined(VIDIOCSAUDIO)
-{VIDIOCSAUDIO, "VIDIOCSAUDIO"},
-#endif
-#if defined(VIDIOCSYNC)
-{VIDIOCSYNC, "VIDIOCSYNC"},
-#endif
-#if defined(VIDIOCMCAPTURE)
-{VIDIOCMCAPTURE, "VIDIOCMCAPTURE"},
-#endif
-#if defined(VIDIOCGMBUF)
-{VIDIOCGMBUF, "VIDIOCGMBUF"},
-#endif
-#if defined(VIDIOCGUNIT)
-{VIDIOCGUNIT, "VIDIOCGUNIT"},
-#endif
-#if defined(VIDIOCGCAPTURE)
-{VIDIOCGCAPTURE, "VIDIOCGCAPTURE"},
-#endif
-#if defined(VIDIOCSCAPTURE)
-{VIDIOCSCAPTURE, "VIDIOCSCAPTURE"},
-#endif
-#if defined(VIDIOCSPLAYMODE)
-{VIDIOCSPLAYMODE, "VIDIOCSPLAYMODE"},
-#endif
-#if defined(VIDIOCSWRITEMODE)
-{VIDIOCSWRITEMODE, "VIDIOCSWRITEMODE"},
-#endif
-#if defined(VIDIOCGPLAYINFO)
-{VIDIOCGPLAYINFO, "VIDIOCGPLAYINFO"},
-#endif
-#if defined(VIDIOCSMICROCODE)
-{VIDIOCSMICROCODE, "VIDIOCSMICROCODE"},
-#endif
-{0xFFFFFFFF, ""}
-};
-
-k = 0;
-while (mess[k].name[0]) {
-        if (wot == mess[k].command) {
-                JOT(8, "ioctl 0x%08X is %s\n", \
-                                        mess[k].command, &mess[k].name[0]);
-                return 0;
-        }
-        k++;
-}
-JOT(8, "ioctl 0x%08X is not in videodev2.h\n", wot);
-
-k = 0;
-while (mess1[k].name[0]) {
-        if (wot == mess1[k].command) {
-                JOT(8, "ioctl 0x%08X is %s (V4L1)\n", \
-                                        mess1[k].command, &mess1[k].name[0]);
-                return 0;
-        }
-        k++;
-}
-JOT(8, "ioctl 0x%08X is not in videodev.h\n", wot);
-return -1;
-}
-/*****************************************************************************/
-int explain_cid(__u32 wot)
-{
-int k;
-/*---------------------------------------------------------------------------*/
-/*
- *  THE DATA FOR THE ARRAY mess BELOW WERE CONSTRUCTED BY RUNNING THE FOLLOWING
- *  SHELL SCRIPT:
- *  #
- *  cat /usr/src/linux-headers-`uname -r`/include/linux/videodev2.h | \
- *     grep "^#define V4L2_CID_" |  \
- *     sed -e "s,(.*$,,;p" | sed -e "N;s,\n,, " | \
- *     sed -e "s/^#define /  {/;s/#define /, \"/;s/$/\"},/" | \
- *     sed -e "s,       ,,g;s, ,,g" | grep -v "_BASE" | grep -v "MPEG" >cid.tmp
- *  echo "{0xFFFFFFFF,\"\"}" >>cid.tmp
- *  exit 0
- *  #
- */
-/*---------------------------------------------------------------------------*/
-static struct mess
-{
-__u32 command;
-char  name[64];
-} mess[] = {
-#if defined(V4L2_CID_USER_CLASS)
-{V4L2_CID_USER_CLASS, "V4L2_CID_USER_CLASS"},
-#endif
-#if defined(V4L2_CID_BRIGHTNESS)
-{V4L2_CID_BRIGHTNESS, "V4L2_CID_BRIGHTNESS"},
-#endif
-#if defined(V4L2_CID_CONTRAST)
-{V4L2_CID_CONTRAST, "V4L2_CID_CONTRAST"},
-#endif
-#if defined(V4L2_CID_SATURATION)
-{V4L2_CID_SATURATION, "V4L2_CID_SATURATION"},
-#endif
-#if defined(V4L2_CID_HUE)
-{V4L2_CID_HUE, "V4L2_CID_HUE"},
-#endif
-#if defined(V4L2_CID_AUDIO_VOLUME)
-{V4L2_CID_AUDIO_VOLUME, "V4L2_CID_AUDIO_VOLUME"},
-#endif
-#if defined(V4L2_CID_AUDIO_BALANCE)
-{V4L2_CID_AUDIO_BALANCE, "V4L2_CID_AUDIO_BALANCE"},
-#endif
-#if defined(V4L2_CID_AUDIO_BASS)
-{V4L2_CID_AUDIO_BASS, "V4L2_CID_AUDIO_BASS"},
-#endif
-#if defined(V4L2_CID_AUDIO_TREBLE)
-{V4L2_CID_AUDIO_TREBLE, "V4L2_CID_AUDIO_TREBLE"},
-#endif
-#if defined(V4L2_CID_AUDIO_MUTE)
-{V4L2_CID_AUDIO_MUTE, "V4L2_CID_AUDIO_MUTE"},
-#endif
-#if defined(V4L2_CID_AUDIO_LOUDNESS)
-{V4L2_CID_AUDIO_LOUDNESS, "V4L2_CID_AUDIO_LOUDNESS"},
-#endif
-#if defined(V4L2_CID_BLACK_LEVEL)
-{V4L2_CID_BLACK_LEVEL, "V4L2_CID_BLACK_LEVEL"},
-#endif
-#if defined(V4L2_CID_AUTO_WHITE_BALANCE)
-{V4L2_CID_AUTO_WHITE_BALANCE, "V4L2_CID_AUTO_WHITE_BALANCE"},
-#endif
-#if defined(V4L2_CID_DO_WHITE_BALANCE)
-{V4L2_CID_DO_WHITE_BALANCE, "V4L2_CID_DO_WHITE_BALANCE"},
-#endif
-#if defined(V4L2_CID_RED_BALANCE)
-{V4L2_CID_RED_BALANCE, "V4L2_CID_RED_BALANCE"},
-#endif
-#if defined(V4L2_CID_BLUE_BALANCE)
-{V4L2_CID_BLUE_BALANCE, "V4L2_CID_BLUE_BALANCE"},
-#endif
-#if defined(V4L2_CID_GAMMA)
-{V4L2_CID_GAMMA, "V4L2_CID_GAMMA"},
-#endif
-#if defined(V4L2_CID_WHITENESS)
-{V4L2_CID_WHITENESS, "V4L2_CID_WHITENESS"},
-#endif
-#if defined(V4L2_CID_EXPOSURE)
-{V4L2_CID_EXPOSURE, "V4L2_CID_EXPOSURE"},
-#endif
-#if defined(V4L2_CID_AUTOGAIN)
-{V4L2_CID_AUTOGAIN, "V4L2_CID_AUTOGAIN"},
-#endif
-#if defined(V4L2_CID_GAIN)
-{V4L2_CID_GAIN, "V4L2_CID_GAIN"},
-#endif
-#if defined(V4L2_CID_HFLIP)
-{V4L2_CID_HFLIP, "V4L2_CID_HFLIP"},
-#endif
-#if defined(V4L2_CID_VFLIP)
-{V4L2_CID_VFLIP, "V4L2_CID_VFLIP"},
-#endif
-#if defined(V4L2_CID_HCENTER)
-{V4L2_CID_HCENTER, "V4L2_CID_HCENTER"},
-#endif
-#if defined(V4L2_CID_VCENTER)
-{V4L2_CID_VCENTER, "V4L2_CID_VCENTER"},
-#endif
-#if defined(V4L2_CID_POWER_LINE_FREQUENCY)
-{V4L2_CID_POWER_LINE_FREQUENCY, "V4L2_CID_POWER_LINE_FREQUENCY"},
-#endif
-#if defined(V4L2_CID_HUE_AUTO)
-{V4L2_CID_HUE_AUTO, "V4L2_CID_HUE_AUTO"},
-#endif
-#if defined(V4L2_CID_WHITE_BALANCE_TEMPERATURE)
-{V4L2_CID_WHITE_BALANCE_TEMPERATURE, "V4L2_CID_WHITE_BALANCE_TEMPERATURE"},
-#endif
-#if defined(V4L2_CID_SHARPNESS)
-{V4L2_CID_SHARPNESS, "V4L2_CID_SHARPNESS"},
-#endif
-#if defined(V4L2_CID_BACKLIGHT_COMPENSATION)
-{V4L2_CID_BACKLIGHT_COMPENSATION, "V4L2_CID_BACKLIGHT_COMPENSATION"},
-#endif
-#if defined(V4L2_CID_CHROMA_AGC)
-{V4L2_CID_CHROMA_AGC, "V4L2_CID_CHROMA_AGC"},
-#endif
-#if defined(V4L2_CID_COLOR_KILLER)
-{V4L2_CID_COLOR_KILLER, "V4L2_CID_COLOR_KILLER"},
-#endif
-#if defined(V4L2_CID_LASTP1)
-{V4L2_CID_LASTP1, "V4L2_CID_LASTP1"},
-#endif
-#if defined(V4L2_CID_CAMERA_CLASS)
-{V4L2_CID_CAMERA_CLASS, "V4L2_CID_CAMERA_CLASS"},
-#endif
-#if defined(V4L2_CID_EXPOSURE_AUTO)
-{V4L2_CID_EXPOSURE_AUTO, "V4L2_CID_EXPOSURE_AUTO"},
-#endif
-#if defined(V4L2_CID_EXPOSURE_ABSOLUTE)
-{V4L2_CID_EXPOSURE_ABSOLUTE, "V4L2_CID_EXPOSURE_ABSOLUTE"},
-#endif
-#if defined(V4L2_CID_EXPOSURE_AUTO_PRIORITY)
-{V4L2_CID_EXPOSURE_AUTO_PRIORITY, "V4L2_CID_EXPOSURE_AUTO_PRIORITY"},
-#endif
-#if defined(V4L2_CID_PAN_RELATIVE)
-{V4L2_CID_PAN_RELATIVE, "V4L2_CID_PAN_RELATIVE"},
-#endif
-#if defined(V4L2_CID_TILT_RELATIVE)
-{V4L2_CID_TILT_RELATIVE, "V4L2_CID_TILT_RELATIVE"},
-#endif
-#if defined(V4L2_CID_PAN_RESET)
-{V4L2_CID_PAN_RESET, "V4L2_CID_PAN_RESET"},
-#endif
-#if defined(V4L2_CID_TILT_RESET)
-{V4L2_CID_TILT_RESET, "V4L2_CID_TILT_RESET"},
-#endif
-#if defined(V4L2_CID_PAN_ABSOLUTE)
-{V4L2_CID_PAN_ABSOLUTE, "V4L2_CID_PAN_ABSOLUTE"},
-#endif
-#if defined(V4L2_CID_TILT_ABSOLUTE)
-{V4L2_CID_TILT_ABSOLUTE, "V4L2_CID_TILT_ABSOLUTE"},
-#endif
-#if defined(V4L2_CID_FOCUS_ABSOLUTE)
-{V4L2_CID_FOCUS_ABSOLUTE, "V4L2_CID_FOCUS_ABSOLUTE"},
-#endif
-#if defined(V4L2_CID_FOCUS_RELATIVE)
-{V4L2_CID_FOCUS_RELATIVE, "V4L2_CID_FOCUS_RELATIVE"},
-#endif
-#if defined(V4L2_CID_FOCUS_AUTO)
-{V4L2_CID_FOCUS_AUTO, "V4L2_CID_FOCUS_AUTO"},
-#endif
-{0xFFFFFFFF, ""}
-};
-
-k = 0;
-while (mess[k].name[0]) {
-        if (wot == mess[k].command) {
-                JOT(8, "ioctl 0x%08X is %s\n", \
-                                        mess[k].command, &mess[k].name[0]);
-                return 0;
-        }
-        k++;
-}
-JOT(8, "cid 0x%08X is not in videodev2.h\n", wot);
-return -1;
-}
-/*****************************************************************************/
diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/easycap/easycap_low.c
index ad1fc4cc471a..28c4d1e3c02f 100644
--- a/drivers/staging/easycap/easycap_low.c
+++ b/drivers/staging/easycap/easycap_low.c
@@ -38,148 +38,209 @@
 */
 /****************************************************************************/
 
-#include "easycap_debug.h"
 #include "easycap.h"
+#include "easycap_debug.h"
 
 /*--------------------------------------------------------------------------*/
-const struct stk1160config { int reg; int set; } stk1160config[256] = {
-        {0x000, 0x0098},
-        {0x002, 0x0093},
-
-        {0x001, 0x0003},
-        {0x003, 0x0080},
-        {0x00D, 0x0000},
-        {0x00F, 0x0002},
-        {0x018, 0x0010},
-        {0x019, 0x0000},
-        {0x01A, 0x0014},
-        {0x01B, 0x000E},
-        {0x01C, 0x0046},
-
-        {0x100, 0x0033},
-        {0x103, 0x0000},
-        {0x104, 0x0000},
-        {0x105, 0x0000},
-        {0x106, 0x0000},
-
-#if defined(PREFER_NTSC)
-
-#undef  OLDMARGIN
-#if defined(OLDMARGIN)
-        {0x110, 0x0008},
-#else
-        {0x110, 0x0014},
-#endif /*OLDMARGIN*/
-
-        {0x111, 0x0000},
-        {0x112, 0x0003},
-        {0x113, 0x0000},
-
-#if defined(OLDMARGIN)
-        {0x114, 0x0508},
-#else
-        {0x114, 0x0514},
-#endif /*OLDMARGIN*/
-
-        {0x115, 0x0005},
-        {0x116, 0x00F3},
-        {0x117, 0x0000},
-
-#else /* ! PREFER_NTSC*/
-
-#if defined(OLDMARGIN)
-        {0x110, 0x0008},
-#else
-        {0x110, 0x0014},
-#endif /*OLDMARGIN*/
-
-        {0x111, 0x0000},
-        {0x112, 0x0020},
-        {0x113, 0x0000},
-
-#if defined(OLDMARGIN)
-        {0x114, 0x0508},
-#else
-        {0x114, 0x0514},
-#endif /*OLDMARGIN*/
-
-        {0x115, 0x0005},
-        {0x116, 0x0110},
-        {0x117, 0x0001},
-
-#endif /* ! PREFER_NTSC*/
-
-        {0x202, 0x000F},
-        {0x203, 0x004A},
-        {0x2FF, 0x0000},
-/*---------------------------------------------------------------------------*/
-        {0xFFF, 0xFFFF}
-        };
+const struct stk1160config { int reg; int set; } stk1160configPAL[256] = {
+                {0x000, 0x0098},
+                {0x002, 0x0093},
+
+                {0x001, 0x0003},
+                {0x003, 0x0080},
+                {0x00D, 0x0000},
+                {0x00F, 0x0002},
+                {0x018, 0x0010},
+                {0x019, 0x0000},
+                {0x01A, 0x0014},
+                {0x01B, 0x000E},
+                {0x01C, 0x0046},
+
+                {0x100, 0x0033},
+                {0x103, 0x0000},
+                {0x104, 0x0000},
+                {0x105, 0x0000},
+                {0x106, 0x0000},
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/*
+ *  RESOLUTION 640x480
+*/
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+                {0x110, 0x0008},
+                {0x111, 0x0000},
+                {0x112, 0x0020},
+                {0x113, 0x0000},
+                {0x114, 0x0508},
+                {0x115, 0x0005},
+                {0x116, 0x0110},
+                {0x117, 0x0001},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+                {0x202, 0x000F},
+                {0x203, 0x004A},
+                {0x2FF, 0x0000},
+
+                {0xFFF, 0xFFFF}
+};
 /*--------------------------------------------------------------------------*/
-const struct saa7113config { int reg; int set; } saa7113config[256] = {
-        {0x01, 0x08},
-        {0x02, 0x80},
-        {0x03, 0x33},
-        {0x04, 0x00},
-        {0x05, 0x00},
-        {0x06, 0xE9},
-        {0x07, 0x0D},
-#if defined(PREFER_NTSC)
-        {0x08, 0x78},
-#else
-        {0x08, 0x38},
-#endif /* ! PREFER_NTSC*/
-        {0x09, 0x00},
-        {0x0A, SAA_0A_DEFAULT},
-        {0x0B, SAA_0B_DEFAULT},
-        {0x0C, SAA_0C_DEFAULT},
-        {0x0D, SAA_0D_DEFAULT},
-        {0x0E, 0x01},
-        {0x0F, 0x36},
-        {0x10, 0x00},
-        {0x11, 0x0C},
-        {0x12, 0xE7},
-        {0x13, 0x00},
-        {0x15, 0x00},
-        {0x16, 0x00},
-#if defined(PREFER_NTSC)
-        {0x40, 0x82},
+const struct stk1160config stk1160configNTSC[256] = {
+                {0x000, 0x0098},
+                {0x002, 0x0093},
+
+                {0x001, 0x0003},
+                {0x003, 0x0080},
+                {0x00D, 0x0000},
+                {0x00F, 0x0002},
+                {0x018, 0x0010},
+                {0x019, 0x0000},
+                {0x01A, 0x0014},
+                {0x01B, 0x000E},
+                {0x01C, 0x0046},
+
+                {0x100, 0x0033},
+                {0x103, 0x0000},
+                {0x104, 0x0000},
+                {0x105, 0x0000},
+                {0x106, 0x0000},
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/*
+ *  RESOLUTION 640x480
+*/
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+                {0x110, 0x0008},
+                {0x111, 0x0000},
+                {0x112, 0x0003},
+                {0x113, 0x0000},
+                {0x114, 0x0508},
+                {0x115, 0x0005},
+                {0x116, 0x00F3},
+                {0x117, 0x0000},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+                {0x202, 0x000F},
+                {0x203, 0x004A},
+                {0x2FF, 0x0000},
+
+                {0xFFF, 0xFFFF}
+};
+/*--------------------------------------------------------------------------*/
+const struct saa7113config { int reg; int set; } saa7113configPAL[256] = {
+                {0x01, 0x08},
+#if defined(ANTIALIAS)
+                {0x02, 0xC0},
 #else
-        {0x40, 0x02},
-#endif /* ! PREFER_NTSC*/
-        {0x41, 0xFF},
-        {0x42, 0xFF},
-        {0x43, 0xFF},
-        {0x44, 0xFF},
-        {0x45, 0xFF},
-        {0x46, 0xFF},
-        {0x47, 0xFF},
-        {0x48, 0xFF},
-        {0x49, 0xFF},
-        {0x4A, 0xFF},
-        {0x4B, 0xFF},
-        {0x4C, 0xFF},
-        {0x4D, 0xFF},
-        {0x4E, 0xFF},
-        {0x4F, 0xFF},
-        {0x50, 0xFF},
-        {0x51, 0xFF},
-        {0x52, 0xFF},
-        {0x53, 0xFF},
-        {0x54, 0xFF},
-        {0x55, 0xFF},
-        {0x56, 0xFF},
-        {0x57, 0xFF},
-        {0x58, 0x40},
-        {0x59, 0x54},
-#if defined(PREFER_NTSC)
-        {0x5A, 0x0A},
+                {0x02, 0x80},
+#endif /*ANTIALIAS*/
+                {0x03, 0x33},
+                {0x04, 0x00},
+                {0x05, 0x00},
+                {0x06, 0xE9},
+                {0x07, 0x0D},
+                {0x08, 0x38},
+                {0x09, 0x00},
+                {0x0A, SAA_0A_DEFAULT},
+                {0x0B, SAA_0B_DEFAULT},
+                {0x0C, SAA_0C_DEFAULT},
+                {0x0D, SAA_0D_DEFAULT},
+                {0x0E, 0x01},
+                {0x0F, 0x36},
+                {0x10, 0x00},
+                {0x11, 0x0C},
+                {0x12, 0xE7},
+                {0x13, 0x00},
+                {0x15, 0x00},
+                {0x16, 0x00},
+                {0x40, 0x02},
+                {0x41, 0xFF},
+                {0x42, 0xFF},
+                {0x43, 0xFF},
+                {0x44, 0xFF},
+                {0x45, 0xFF},
+                {0x46, 0xFF},
+                {0x47, 0xFF},
+                {0x48, 0xFF},
+                {0x49, 0xFF},
+                {0x4A, 0xFF},
+                {0x4B, 0xFF},
+                {0x4C, 0xFF},
+                {0x4D, 0xFF},
+                {0x4E, 0xFF},
+                {0x4F, 0xFF},
+                {0x50, 0xFF},
+                {0x51, 0xFF},
+                {0x52, 0xFF},
+                {0x53, 0xFF},
+                {0x54, 0xFF},
+                {0x55, 0xFF},
+                {0x56, 0xFF},
+                {0x57, 0xFF},
+                {0x58, 0x40},
+                {0x59, 0x54},
+                {0x5A, 0x07},
+                {0x5B, 0x83},
+
+                {0xFF, 0xFF}
+};
+/*--------------------------------------------------------------------------*/
+const struct saa7113config saa7113configNTSC[256] = {
+                {0x01, 0x08},
+#if defined(ANTIALIAS)
+                {0x02, 0xC0},
 #else
-        {0x5A, 0x07},
-#endif /* ! PREFER_NTSC*/
-        {0x5B, 0x83},
-        {0xFF, 0xFF}
-        };
+                {0x02, 0x80},
+#endif /*ANTIALIAS*/
+                {0x03, 0x33},
+                {0x04, 0x00},
+                {0x05, 0x00},
+                {0x06, 0xE9},
+                {0x07, 0x0D},
+                {0x08, 0x78},
+                {0x09, 0x00},
+                {0x0A, SAA_0A_DEFAULT},
+                {0x0B, SAA_0B_DEFAULT},
+                {0x0C, SAA_0C_DEFAULT},
+                {0x0D, SAA_0D_DEFAULT},
+                {0x0E, 0x01},
+                {0x0F, 0x36},
+                {0x10, 0x00},
+                {0x11, 0x0C},
+                {0x12, 0xE7},
+                {0x13, 0x00},
+                {0x15, 0x00},
+                {0x16, 0x00},
+                {0x40, 0x82},
+                {0x41, 0xFF},
+                {0x42, 0xFF},
+                {0x43, 0xFF},
+                {0x44, 0xFF},
+                {0x45, 0xFF},
+                {0x46, 0xFF},
+                {0x47, 0xFF},
+                {0x48, 0xFF},
+                {0x49, 0xFF},
+                {0x4A, 0xFF},
+                {0x4B, 0xFF},
+                {0x4C, 0xFF},
+                {0x4D, 0xFF},
+                {0x4E, 0xFF},
+                {0x4F, 0xFF},
+                {0x50, 0xFF},
+                {0x51, 0xFF},
+                {0x52, 0xFF},
+                {0x53, 0xFF},
+                {0x54, 0xFF},
+                {0x55, 0xFF},
+                {0x56, 0xFF},
+                {0x57, 0xFF},
+                {0x58, 0x40},
+                {0x59, 0x54},
+                {0x5A, 0x0A},
+                {0x5B, 0x83},
+
+                {0xFF, 0xFF}
+};
 /*--------------------------------------------------------------------------*/
 
 /****************************************************************************/
@@ -187,6 +248,9 @@ int
 confirm_resolution(struct usb_device *p)
 {
 __u8 get0, get1, get2, get3, get4, get5, get6, get7;
+
+if (NULL == p)
+        return -ENODEV;
 GET(p, 0x0110, &get0);
 GET(p, 0x0111, &get1);
 GET(p, 0x0112, &get2);
@@ -227,6 +291,8 @@ confirm_stream(struct usb_device *p)
 __u16 get2;
 __u8 igot;
 
+if (NULL == p)
+        return -ENODEV;
 GET(p, 0x0100, &igot);  get2 = 0x80 & igot;
 if (0x80 == get2)
         JOT(8, "confirm_stream:  OK\n");
@@ -236,15 +302,24 @@ return 0;
 }
 /****************************************************************************/
 int
-setup_stk(struct usb_device *p)
+setup_stk(struct usb_device *p, bool ntsc)
 {
 int i0;
 
+if (NULL == p)
+        return -ENODEV;
 i0 = 0;
-while (0xFFF != stk1160config[i0].reg) {
-        SET(p, stk1160config[i0].reg, stk1160config[i0].set);
-        i0++;
+if (true == ntsc) {
+        while (0xFFF != stk1160configNTSC[i0].reg) {
+                SET(p, stk1160configNTSC[i0].reg, stk1160configNTSC[i0].set);
+                i0++;
+        }
+} else {
+        while (0xFFF != stk1160configPAL[i0].reg) {
+                SET(p, stk1160configPAL[i0].reg, stk1160configPAL[i0].set);
+                i0++;
         }
+}
 
 write_300(p);
 
@@ -252,19 +327,26 @@ return 0;
 }
 /****************************************************************************/
 int
-setup_saa(struct usb_device *p)
+setup_saa(struct usb_device *p, bool ntsc)
 {
 int i0, ir;
 
-
-set2to78(p);
-
-
+if (NULL == p)
+        return -ENODEV;
 i0 = 0;
-while (0xFF != saa7113config[i0].reg) {
-        ir = write_saa(p, saa7113config[i0].reg, saa7113config[i0].set);
-        i0++;
+if (true == ntsc) {
+        while (0xFF != saa7113configNTSC[i0].reg) {
+                ir = write_saa(p, saa7113configNTSC[i0].reg, \
+                                        saa7113configNTSC[i0].set);
+                i0++;
         }
+} else {
+        while (0xFF != saa7113configPAL[i0].reg) {
+                ir = write_saa(p, saa7113configPAL[i0].reg, \
+                                        saa7113configPAL[i0].set);
+                i0++;
+        }
+}
 return 0;
 }
 /****************************************************************************/
@@ -273,6 +355,8 @@ write_000(struct usb_device *p, __u16 set2, __u16 set0)
 {
 __u8 igot0, igot2;
 
+if (NULL == p)
+        return -ENODEV;
 GET(p, 0x0002, &igot2);
 GET(p, 0x0000, &igot0);
 SET(p, 0x0002, set2);
@@ -283,6 +367,8 @@ return 0;
 int
 write_saa(struct usb_device *p, __u16 reg0, __u16 set0)
 {
+if (NULL == p)
+        return -ENODEV;
 SET(p, 0x200, 0x00);
 SET(p, 0x204, reg0);
 SET(p, 0x205, set0);
@@ -306,6 +392,8 @@ __u8 igot;
 __u16 got502, got503;
 __u16 set502, set503;
 
+if (NULL == p)
+        return -ENODEV;
 SET(p, 0x0504, reg0);
 SET(p, 0x0500, 0x008B);
 
@@ -341,6 +429,8 @@ read_vt(struct usb_device *p, __u16 reg0)
 __u8 igot;
 __u16 got502, got503;
 
+if (NULL == p)
+        return -ENODEV;
 SET(p, 0x0504, reg0);
 SET(p, 0x0500, 0x008B);
 
@@ -360,6 +450,8 @@ return (got503 << 8) | got502;
 int
 write_300(struct usb_device *p)
 {
+if (NULL == p)
+        return -ENODEV;
 SET(p, 0x300, 0x0012);
 SET(p, 0x350, 0x002D);
 SET(p, 0x351, 0x0001);
@@ -376,24 +468,48 @@ return 0;
  */
 /*--------------------------------------------------------------------------*/
 int
-check_saa(struct usb_device *p)
+check_saa(struct usb_device *p, bool ntsc)
 {
 int i0, ir, rc;
-i0 = 0;
 
+if (NULL == p)
+        return -ENODEV;
+i0 = 0;
 rc = 0;
-while (0xFF != saa7113config[i0].reg) {
-        if (0x0F == saa7113config[i0].reg) {
-                i0++; continue;
+if (true == ntsc) {
+        while (0xFF != saa7113configNTSC[i0].reg) {
+                if (0x0F == saa7113configNTSC[i0].reg) {
+                        i0++;
+                        continue;
+                }
+
+                ir = read_saa(p, saa7113configNTSC[i0].reg);
+                if (ir != saa7113configNTSC[i0].set) {
+                        SAY("SAA register 0x%02X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                saa7113configNTSC[i0].reg, \
+                                                ir, saa7113configNTSC[i0].set);
+                        rc--;
+                }
+                i0++;
         }
+} else {
+        while (0xFF != saa7113configPAL[i0].reg) {
+                if (0x0F == saa7113configPAL[i0].reg) {
+                        i0++;
+                        continue;
+                }
 
-        ir = read_saa(p, saa7113config[i0].reg);
-        if (ir != saa7113config[i0].set) {
-                SAY("SAA register 0x%02X has 0x%02X, expected 0x%02X\n", \
-                        saa7113config[i0].reg, ir, saa7113config[i0].set);
-                rc--;
+                ir = read_saa(p, saa7113configPAL[i0].reg);
+                if (ir != saa7113configPAL[i0].set) {
+                        SAY("SAA register 0x%02X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                saa7113configPAL[i0].reg, \
+                                                ir, saa7113configPAL[i0].set);
+                        rc--;
+                }
+                i0++;
         }
-        i0++;
 }
 if (-8 > rc)
         return rc;
@@ -406,6 +522,8 @@ merit_saa(struct usb_device *p)
 {
 int rc;
 
+if (NULL == p)
+        return -ENODEV;
 rc = read_saa(p, 0x1F);
 if ((0 > rc) || (0x02 & rc))
         return 1 ;
@@ -416,29 +534,46 @@ else
 int
 ready_saa(struct usb_device *p)
 {
-int j, rc;
-static int max = 10;
-
+int j, rc, rate;
+const int max = 5, marktime = PATIENCE/5;
+/*--------------------------------------------------------------------------*/
+/*
+ *   RETURNS    0     FOR INTERLACED       50 Hz
+ *              1     FOR NON-INTERLACED   50 Hz
+ *              2     FOR INTERLACED       60 Hz
+ *              3     FOR NON-INTERLACED   60 Hz
+*/
+/*--------------------------------------------------------------------------*/
+if (NULL == p)
+        return -ENODEV;
 j = 0;
 while (max > j) {
         rc = read_saa(p, 0x1F);
         if (0 <= rc) {
-                if ((1 == (0x01 & rc))&&(0 == (0x40 & rc)))
+                if (0 == (0x40 & rc))
+                        break;
+                if (1 == (0x01 & rc))
                         break;
         }
-        msleep(100);  j++;
+        msleep(marktime);
+        j++;
 }
 if (max == j)
         return -1;
 else {
-        if (0x20 & rc)
+        if (0x20 & rc) {
+                rate = 2;
                 JOT(8, "hardware detects 60 Hz\n");
-        else
+        } else {
+                rate = 0;
                 JOT(8, "hardware detects 50 Hz\n");
+        }
         if (0x80 & rc)
                 JOT(8, "hardware detects interlacing\n");
-        else
+        else {
+                rate++;
                 JOT(8, "hardware detects no interlacing\n");
+        }
 }
 return 0;
 }
@@ -447,45 +582,80 @@ return 0;
 /*
  *  NOTE: THE FOLLOWING ARE NOT CHECKED:
  *  REGISTERS 0x000, 0x002:  FUNCTIONALITY IS NOT KNOWN
- *  REGISTER  0x100:  ACCEPT ALSO (0x80 | stk1160config[.].set)
+ *  REGISTER  0x100:  ACCEPT ALSO (0x80 | stk1160config....[.].set)
  */
 /*--------------------------------------------------------------------------*/
 int
-check_stk(struct usb_device *p)
+check_stk(struct usb_device *p, bool ntsc)
 {
 int i0, ir;
-i0 = 0;
-while (0xFFF != stk1160config[i0].reg) {
-        if (0x000 == stk1160config[i0].reg) {
-                i0++; continue;
-        }
-        if (0x002 == stk1160config[i0].reg) {
-                i0++; continue;
-        }
-
-        ir = read_stk(p, stk1160config[i0].reg);
 
-        if (0x100 == stk1160config[i0].reg) {
-                if ((ir != (0xFF & stk1160config[i0].set)) && \
-                        (ir != (0x80 | (0xFF & stk1160config[i0].set))) && \
-                                (0xFFFF != stk1160config[i0].set)) {
-                        SAY("STK register 0x%03X has 0x%02X, " \
-                                        "expected 0x%02X\n", \
-                                        stk1160config[i0].reg, ir, \
-                                        stk1160config[i0].set);
+if (NULL == p)
+        return -ENODEV;
+i0 = 0;
+if (true == ntsc) {
+        while (0xFFF != stk1160configNTSC[i0].reg) {
+                if (0x000 == stk1160configNTSC[i0].reg) {
+                        i0++; continue;
+                }
+                if (0x002 == stk1160configNTSC[i0].reg) {
+                        i0++; continue;
+                }
+                ir = read_stk(p, stk1160configNTSC[i0].reg);
+                if (0x100 == stk1160configNTSC[i0].reg) {
+                        if ((ir != (0xFF & stk1160configNTSC[i0].set)) && \
+                                        (ir != (0x80 | (0xFF & \
+                                        stk1160configNTSC[i0].set))) && \
+                                        (0xFFFF != \
+                                        stk1160configNTSC[i0].set)) {
+                                SAY("STK register 0x%03X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                stk1160configNTSC[i0].reg, \
+                                                ir, stk1160configNTSC[i0].set);
+                                }
+                        i0++; continue;
                         }
-                i0++; continue;
+                if ((ir != (0xFF & stk1160configNTSC[i0].set)) && \
+                                (0xFFFF != stk1160configNTSC[i0].set)) {
+                        SAY("STK register 0x%03X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                stk1160configNTSC[i0].reg, \
+                                                ir, stk1160configNTSC[i0].set);
                 }
-
-        if ((ir != (0xFF & stk1160config[i0].set)) && \
-                        (0xFFFF != stk1160config[i0].set)) {
-                SAY("STK register 0x%03X has 0x%02X, " \
-                                        "expected 0x%02X\n", \
-                                        stk1160config[i0].reg, ir, \
-                                        stk1160config[i0].set);
+                i0++;
+        }
+} else {
+        while (0xFFF != stk1160configPAL[i0].reg) {
+                if (0x000 == stk1160configPAL[i0].reg) {
+                        i0++; continue;
                 }
-        i0++;
+                if (0x002 == stk1160configPAL[i0].reg) {
+                        i0++; continue;
+                }
+                ir = read_stk(p, stk1160configPAL[i0].reg);
+                if (0x100 == stk1160configPAL[i0].reg) {
+                        if ((ir != (0xFF & stk1160configPAL[i0].set)) && \
+                                        (ir != (0x80 | (0xFF & \
+                                        stk1160configPAL[i0].set))) && \
+                                        (0xFFFF != \
+                                        stk1160configPAL[i0].set)) {
+                                SAY("STK register 0x%03X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                stk1160configPAL[i0].reg, \
+                                                ir, stk1160configPAL[i0].set);
+                                }
+                        i0++; continue;
+                        }
+                if ((ir != (0xFF & stk1160configPAL[i0].set)) && \
+                                (0xFFFF != stk1160configPAL[i0].set)) {
+                        SAY("STK register 0x%03X has 0x%02X, " \
+                                                "expected 0x%02X\n", \
+                                                stk1160configPAL[i0].reg, \
+                                                ir, stk1160configPAL[i0].set);
+                }
+                i0++;
         }
+}
 return 0;
 }
 /****************************************************************************/
@@ -494,6 +664,8 @@ read_saa(struct usb_device *p, __u16 reg0)
 {
 __u8 igot;
 
+if (NULL == p)
+        return -ENODEV;
 SET(p, 0x208, reg0);
 SET(p, 0x200, 0x20);
 if (0 != wait_i2c(p))
@@ -508,12 +680,14 @@ read_stk(struct usb_device *p, __u32 reg0)
 {
 __u8 igot;
 
+if (NULL == p)
+        return -ENODEV;
 igot = 0;
 GET(p, reg0, &igot);
 return igot;
 }
-/*****************************************************************************/
-/*---------------------------------------------------------------------------*/
+/****************************************************************************/
+/*--------------------------------------------------------------------------*/
 /*
  *    HARDWARE    USERSPACE INPUT NUMBER   PHYSICAL INPUT   DRIVER input VALUE
  *
@@ -534,81 +708,100 @@ return igot;
 int
 select_input(struct usb_device *p, int input, int mode)
 {
+int ir;
 
+if (NULL == p)
+        return -ENODEV;
 stop_100(p);
-
-msleep(20);
 switch (input) {
 case 0:
 case 1: {
-        SET(p, 0x0000, 0x0098); break;
+        if (0 != write_saa(p, 0x02, 0x80)) {
+                SAY("ERROR: failed to set SAA register 0x02 for input %i\n", \
+                                                                        input);
+        }
+        SET(p, 0x0000, 0x0098);
+        SET(p, 0x0002, 0x0078);
+        break;
 }
 case 2: {
-        SET(p, 0x0000, 0x0090); break;
+        if (0 != write_saa(p, 0x02, 0x80)) {
+                SAY("ERROR: failed to set SAA register 0x02 for input %i\n", \
+                                                                        input);
+        }
+        SET(p, 0x0000, 0x0090);
+        SET(p, 0x0002, 0x0078);
+        break;
 }
 case 3: {
-        SET(p, 0x0000, 0x0088); break;
+        if (0 != write_saa(p, 0x02, 0x80)) {
+                SAY("ERROR: failed to set SAA register 0x02 for input %i\n", \
+                                                                        input);
+        }
+        SET(p, 0x0000, 0x0088);
+        SET(p, 0x0002, 0x0078);
+        break;
 }
 case 4: {
-        SET(p, 0x0000, 0x0080); break;
+        if (0 != write_saa(p, 0x02, 0x80)) {
+                SAY("ERROR: failed to set SAA register 0x02 for input %i\n", \
+                                                                        input);
+        }
+        SET(p, 0x0000, 0x0080);
+        SET(p, 0x0002, 0x0078);
+        break;
 }
 case 5: {
         if (9 != mode)
                 mode = 7;
         switch (mode) {
-        case 7:
-                {
+        case 7: {
                 if (0 != write_saa(p, 0x02, 0x87)) {
-                        SAY("ERROR: failed to set SAA " \
-                                "register 0x02 for input " \
-                                "%i\n", input);
+                        SAY("ERROR: failed to set SAA register 0x02 " \
+                                                "for input %i\n", input);
                 }
                 if (0 != write_saa(p, 0x05, 0xFF)) {
-                        SAY("ERROR: failed to set SAA " \
-                                "register 0x05 for input " \
-                                "%i\n", input);
+                        SAY("ERROR: failed to set SAA register 0x05 " \
+                                                "for input %i\n", input);
                 }
                 break;
         }
-        case 9:
-                {
+        case 9: {
                 if (0 != write_saa(p, 0x02, 0x89)) {
-                        SAY("ERROR: failed to set SAA " \
-                                "register 0x02 for input " \
-                                "%i\n", input);
+                        SAY("ERROR: failed to set SAA register 0x02 " \
+                                                "for input %i\n", input);
                 }
                 if (0 != write_saa(p, 0x05, 0x00)) {
-                        SAY("ERROR: failed to set SAA " \
-                                "register 0x05 for input " \
-                                "%i\n", input);
+                        SAY("ERROR: failed to set SAA register 0x05 " \
+                                                "for input %i\n", input);
                 }
-                break;
+        break;
         }
-        default:
-                {
+        default: {
                 SAY("MISTAKE:  bad mode: %i\n", mode);
                 return -1;
-                }
+        }
         }
         if (0 != write_saa(p, 0x04, 0x00)) {
-                SAY("ERROR: failed to set SAA register 0x04 " \
-                                        "for input %i\n", input);
+                SAY("ERROR: failed to set SAA register 0x04 for input %i\n", \
+                                                                        input);
         }
         if (0 != write_saa(p, 0x09, 0x80)) {
-                SAY("ERROR: failed to set SAA register 0x09 " \
-                                        "for input %i\n", input);
+                SAY("ERROR: failed to set SAA register 0x09 for input %i\n", \
+                                                                        input);
         }
+        SET(p, 0x0002, 0x0093);
         break;
 }
-default:
-        {
+default: {
         SAY("ERROR:  bad input: %i\n", input);
         return -1;
 }
 }
-msleep(20);
-SET(p, 0x0002, 0x0093);
-msleep(20);
+ir = read_stk(p, 0x00);
+JOT(8, "STK register 0x00 has 0x%02X\n", ir);
+ir = read_saa(p, 0x02);
+JOT(8, "SAA register 0x02 has 0x%02X\n", ir);
 
 start_100(p);
 
@@ -621,6 +814,8 @@ set_resolution(struct usb_device *p, \
 {
 __u16 u0x0111, u0x0113, u0x0115, u0x0117;
 
+if (NULL == p)
+        return -ENODEV;
 u0x0111 = ((0xFF00 & set0) >> 8);
 u0x0113 = ((0xFF00 & set1) >> 8);
 u0x0115 = ((0xFF00 & set2) >> 8);
@@ -641,13 +836,25 @@ return 0;
 int
 start_100(struct usb_device *p)
 {
-__u16 get0;
-__u8 igot;
-
-GET(p, 0x0100, &igot);  get0 = igot;
-msleep(0x1f4);
+__u16 get116, get117, get0;
+__u8 igot116, igot117, igot;
+
+if (NULL == p)
+        return -ENODEV;
+GET(p, 0x0116, &igot116);
+get116 = igot116;
+GET(p, 0x0117, &igot117);
+get117 = igot117;
+SET(p, 0x0116, 0x0000);
+SET(p, 0x0117, 0x0000);
+
+GET(p, 0x0100, &igot);
+get0 = igot;
 SET(p, 0x0100, (0x80 | get0));
-msleep(0x1f4);
+
+SET(p, 0x0116, get116);
+SET(p, 0x0117, get117);
+
 return 0;
 }
 /****************************************************************************/
@@ -657,10 +864,11 @@ stop_100(struct usb_device *p)
 __u16 get0;
 __u8 igot;
 
-GET(p, 0x0100, &igot);  get0 = igot;
-msleep(0x1f4);
+if (NULL == p)
+        return -ENODEV;
+GET(p, 0x0100, &igot);
+get0 = igot;
 SET(p, 0x0100, (0x7F & get0));
-msleep(0x1f4);
 return 0;
 }
 /****************************************************************************/
@@ -674,9 +882,11 @@ wait_i2c(struct usb_device *p)
 {
 __u16 get0;
 __u8 igot;
-const int max = 4;
+const int max = 2;
 int k;
 
+if (NULL == p)
+        return -ENODEV;
 for (k = 0;  k < max;  k++) {
         GET(p, 0x0201, &igot);  get0 = igot;
         switch (get0) {
@@ -685,7 +895,7 @@ for (k = 0;  k < max;  k++) {
                 return 0;
         }
         case 0x00: {
-                msleep(10);
+                msleep(20);
                 continue;
         }
         default: {
@@ -703,8 +913,7 @@ __u16 igot;
 int rc0, rc1;
 
 if (!pusb_device)
-        return -EFAULT;
-
+        return -ENODEV;
 rc1 = 0;  igot = 0;
 rc0 = usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), \
                 (__u8)0x01, \
@@ -741,27 +950,14 @@ case 0x204:
 case 0x205:
 case 0x350:
 case 0x351: {
-        if (0 != igot) {
+        if (0 != (0xFF & igot)) {
                 JOT(8, "unexpected 0x%02X for STK register 0x%03X\n", \
                                                                 igot, index);
         }
 break;
 }
-case 0x114:
-case 0x116: {
-        if ((0xFF & value) != igot) {
-                JOT(8, "unexpected 0x%02X != 0x%02X " \
-                                                "for STK register 0x%03X\n", \
-                                                igot, value, index);
-        }
-break;
-}
-case 0x200: {
-        if (0 == igot)
-                break;
-}
 default: {
-        if (value != igot) {
+        if ((0xFF & value) != (0xFF & igot)) {
                 JOT(8, "unexpected 0x%02X != 0x%02X " \
                                         "for STK register 0x%03X\n", \
                                         igot, value, index);
@@ -780,8 +976,7 @@ regget(struct usb_device *pusb_device, __u16 index, void *pvoid)
 int ir;
 
 if (!pusb_device)
-        return -EFAULT;
-
+        return -ENODEV;
 ir = usb_control_msg(pusb_device, usb_rcvctrlpipe(pusb_device, 0), \
                 (__u8)0x00, \
                 (__u8)(USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE), \
@@ -796,6 +991,8 @@ return 0xFF & ir;
 int
 wakeup_device(struct usb_device *pusb_device)
 {
+if (!pusb_device)
+        return -ENODEV;
 return usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), \
                 (__u8)USB_REQ_SET_FEATURE, \
                 (__u8)(USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE), \
@@ -806,6 +1003,12 @@ return usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), \
                 (int)50000);
 }
 /*****************************************************************************/
+int
+audio_setup(struct easycap *peasycap)
+{
+struct usb_device *pusb_device;
+unsigned char buffer[1];
+int rc, id1, id2;
 /*---------------------------------------------------------------------------*/
 /*
  *                                IMPORTANT:
@@ -814,29 +1017,21 @@ return usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), \
  *  TO ENABLE AUDIO  THE VALUE 0x0200 MUST BE SENT.
  */
 /*---------------------------------------------------------------------------*/
-int
-audio_setup(struct easycap *peasycap)
-{
-struct usb_device *pusb_device;
-static __u8 request = 0x01;
-static __u8 requesttype = \
+const __u8 request = 0x01;
+const __u8 requesttype = \
                 (__u8)(USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE);
-
-static __u16 value_unmute = 0x0200;
-static __u16 index = 0x0301;
-
-static unsigned char buffer[1];
-static __u16 length = 1;
-int rc, id1, id2;
+const __u16 value_unmute = 0x0200;
+const __u16 index = 0x0301;
+const __u16 length = 1;
 
 if (NULL == peasycap)
         return -EFAULT;
 
 pusb_device = peasycap->pusb_device;
 if (NULL == pusb_device)
-        return -EFAULT;
+        return -ENODEV;
 
-JOT(8, "%02X %02X %02X %02X %02X %02X %02X %02X\n",     \
+JOM(8, "%02X %02X %02X %02X %02X %02X %02X %02X\n",     \
                         requesttype, request,           \
                         (0x00FF & value_unmute),        \
                         (0xFF00 & value_unmute) >> 8,   \
@@ -875,41 +1070,25 @@ if (rc != (int)length)
  *                    THE UPPER BYTE SEEMS TO HAVE NO EFFECT.
  */
 /*--------------------------------------------------------------------------*/
-
 SET(pusb_device, 0x0500, 0x0094);
-
 SET(pusb_device, 0x0500, 0x008C);
-
 SET(pusb_device, 0x0506, 0x0001);
 SET(pusb_device, 0x0507, 0x0000);
-
 id1 = read_vt(pusb_device, 0x007C);
 id2 = read_vt(pusb_device, 0x007E);
-SAY("0x%04X:0x%04X is audio vendor id\n", id1, id2);
-
+SAM("0x%04X:0x%04X is audio vendor id\n", id1, id2);
 /*---------------------------------------------------------------------------*/
 /*
-*   SELECT AUDIO SOURCE "LINE IN" AND SET DEFAULT GAIN TO 0 dB.
-*
-*   THESE COMMANDS SEEM TO BE ACCEPTED (THOUGH POSSIBLY IGNORED) EVEN WHEN
-*   THERE IS NO SEPARATE AUDIO CHIP PRESENT.
+ *  SELECT AUDIO SOURCE "LINE IN" AND SET THE AUDIO GAIN.
 */
 /*---------------------------------------------------------------------------*/
-
-write_vt(pusb_device, 0x0002, 0x8000);
-write_vt(pusb_device, 0x001C, 0x8000);
-
-write_vt(pusb_device, 0x000E, 0x0000);
-write_vt(pusb_device, 0x0010, 0x0000);
-write_vt(pusb_device, 0x0012, 0x8000);
-write_vt(pusb_device, 0x0016, 0x0000);
-
-write_vt(pusb_device, 0x001A, 0x0404);
-write_vt(pusb_device, 0x0002, 0x0000);
-write_vt(pusb_device, 0x001C, 0x0000);
-
+if (31 < easycap_gain)
+        easycap_gain = 31;
+if (0 > easycap_gain)
+        easycap_gain = 0;
+if (0 != audio_gainset(pusb_device, (__s8)easycap_gain))
+        SAY("ERROR: audio_gainset() failed\n");
 check_vt(pusb_device);
-
 return 0;
 }
 /*****************************************************************************/
@@ -918,6 +1097,8 @@ check_vt(struct usb_device *pusb_device)
 {
 int igot;
 
+if (!pusb_device)
+        return -ENODEV;
 igot = read_vt(pusb_device, 0x0002);
 if (0 > igot)
         SAY("ERROR: failed to read VT1612A register 0x02\n");
@@ -942,17 +1123,23 @@ if (0 > igot)
 if (0x8000 & igot)
         SAY("register 0x%02X muted\n", 0x12);
 
+igot = read_vt(pusb_device, 0x0014);
+if (0 > igot)
+        SAY("ERROR: failed to read VT1612A register 0x14\n");
+if (0x8000 & igot)
+        SAY("register 0x%02X muted\n", 0x14);
+
 igot = read_vt(pusb_device, 0x0016);
 if (0 > igot)
         SAY("ERROR: failed to read VT1612A register 0x16\n");
 if (0x8000 & igot)
         SAY("register 0x%02X muted\n", 0x16);
 
-igot = read_vt(pusb_device, 0x001A);
+igot = read_vt(pusb_device, 0x0018);
 if (0 > igot)
-        SAY("ERROR: failed to read VT1612A register 0x1A\n");
+        SAY("ERROR: failed to read VT1612A register 0x18\n");
 if (0x8000 & igot)
-        SAY("register 0x%02X muted\n", 0x1A);
+        SAY("register 0x%02X muted\n", 0x18);
 
 igot = read_vt(pusb_device, 0x001C);
 if (0 > igot)
@@ -964,14 +1151,18 @@ return 0;
 }
 /*****************************************************************************/
 /*---------------------------------------------------------------------------*/
-/*
- *  NOTE:  THIS DOES INCREASE THE VOLUME DRAMATICALLY:
- *         audio_gainset(pusb_device, 0x000F);
+/*  NOTE:  THIS DOES INCREASE THE VOLUME DRAMATICALLY:
+ *                      audio_gainset(pusb_device, 0x000F);
  *
- *  IF 16<loud<31 VT1621A REGISTER 0x1C IS SET FOR POSITIVE GAIN.
- *  IF loud<=16 VT1621A REGISTER 0x1C IS SET FOR ZERO GAIN.
- *  THERE IS NEVER ANY (ADDITIONAL) ATTENUATION.
- */
+ *       loud        dB  register 0x10      dB register 0x1C    dB total
+ *         0               -34.5                   0             -34.5
+ *        ..                ....                   .              ....
+ *        15                10.5                   0              10.5
+ *        16                12.0                   0              12.0
+ *        17                12.0                   1.5            13.5
+ *        ..                ....                  ....            ....
+ *        31                12.0                  22.5            34.5
+*/
 /*---------------------------------------------------------------------------*/
 int
 audio_gainset(struct usb_device *pusb_device, __s8 loud)
@@ -980,25 +1171,65 @@ int igot;
 __u8 u8;
 __u16 mute;
 
-if (16 > loud)
-        loud = 16;
-u8 = 0x000F & (__u8)(loud - 16);
+if (NULL == pusb_device)
+        return -ENODEV;
+if (0 > loud)
+        loud = 0;
+if (31 < loud)
+        loud = 31;
 
 write_vt(pusb_device, 0x0002, 0x8000);
+/*---------------------------------------------------------------------------*/
+igot = read_vt(pusb_device, 0x000E);
+if (0 > igot) {
+        SAY("ERROR: failed to read VT1612A register 0x0E\n");
+        mute = 0x0000;
+} else
+        mute = 0x8000 & ((unsigned int)igot);
+mute = 0;
+
+if (16 > loud)
+        u8 = 0x01 | (0x001F & (((__u8)(15 - loud)) << 1));
+else
+        u8 = 0;
 
+JOT(8, "0x%04X=(mute|u8) for VT1612A register 0x0E\n", mute | u8);
+write_vt(pusb_device, 0x000E, (mute | u8));
+/*---------------------------------------------------------------------------*/
+igot = read_vt(pusb_device, 0x0010);
+if (0 > igot) {
+        SAY("ERROR: failed to read VT1612A register 0x10\n");
+        mute = 0x0000;
+} else
+        mute = 0x8000 & ((unsigned int)igot);
+mute = 0;
+
+JOT(8, "0x%04X=(mute|u8|(u8<<8)) for VT1612A register 0x10,...0x18\n", \
+                                                        mute | u8 | (u8 << 8));
+write_vt(pusb_device, 0x0010, (mute | u8 | (u8 << 8)));
+write_vt(pusb_device, 0x0012, (mute | u8 | (u8 << 8)));
+write_vt(pusb_device, 0x0014, (mute | u8 | (u8 << 8)));
+write_vt(pusb_device, 0x0016, (mute | u8 | (u8 << 8)));
+write_vt(pusb_device, 0x0018, (mute | u8 | (u8 << 8)));
+/*---------------------------------------------------------------------------*/
 igot = read_vt(pusb_device, 0x001C);
 if (0 > igot) {
         SAY("ERROR: failed to read VT1612A register 0x1C\n");
         mute = 0x0000;
 } else
         mute = 0x8000 & ((unsigned int)igot);
+mute = 0;
 
-JOT(8, "0x%04X=(mute|u8|(u8<<8))\n", mute | u8 | (u8 << 8));
+if (16 <= loud)
+        u8 = 0x000F & (__u8)(loud - 16);
+else
+        u8 = 0;
 
-write_vt(pusb_device, 0x001C, 0x8000);
+JOT(8, "0x%04X=(mute|u8|(u8<<8)) for VT1612A register 0x1C\n", \
+                                                        mute | u8 | (u8 << 8));
 write_vt(pusb_device, 0x001C, (mute | u8 | (u8 << 8)));
+write_vt(pusb_device, 0x001A, 0x0404);
 write_vt(pusb_device, 0x0002, 0x0000);
-
 return 0;
 }
 /*****************************************************************************/
@@ -1007,35 +1238,11 @@ audio_gainget(struct usb_device *pusb_device)
 {
 int igot;
 
+if (NULL == pusb_device)
+        return -ENODEV;
 igot = read_vt(pusb_device, 0x001C);
 if (0 > igot)
         SAY("ERROR: failed to read VT1612A register 0x1C\n");
 return igot;
 }
 /*****************************************************************************/
-int
-set2to78(struct usb_device *p)
-{
-int ir;
-
-msleep(20);
-ir = regset(p, 0x0002, 0x0078);
-if (0 > ir)
-        SAY("ERROR: failed to set register 0x0002 to 0x0078\n");
-msleep(20);
-return ir;
-}
-/*****************************************************************************/
-int
-set2to93(struct usb_device *p)
-{
-int ir;
-
-msleep(20);
-ir = regset(p, 0x0002, 0x0093);
-if (0 > ir)
-        SAY("ERROR: failed to set register 0x0002 to 0x0078\n");
-msleep(20);
-return ir;
-}
-/*****************************************************************************/
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index 5a4bbd9b453f..acc1f56e6f29 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -30,9 +30,29 @@
 
 #include "easycap.h"
 #include "easycap_standard.h"
+#include "easycap_ioctl.h"
 
-int easycap_debug;
-module_param(easycap_debug, int, S_IRUGO | S_IWUSR);
+static int easycap_debug;
+static int easycap_bars;
+int easycap_gain = 16;
+module_param_named(debug, easycap_debug, int, S_IRUGO | S_IWUSR);
+module_param_named(bars, easycap_bars, int, S_IRUGO | S_IWUSR);
+module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
+
+/*---------------------------------------------------------------------------*/
+/*
+ *  dongle_this IS INDISPENSIBLY static BECAUSE FUNCTION easycap_usb_probe()
+ *  IS CALLED SUCCESSIVELY FOR INTERFACES 0, 1, 2 AND THE POINTER peasycap
+ *  ALLOCATED DURING THE PROBING OF INTERFACE 0 MUST BE REMEMBERED WHEN
+ *  PROBING INTERFACES 1 AND 2.
+ *
+ *  IOCTL LOCKING IS DONE AT MODULE LEVEL, NOT DEVICE LEVEL.
+*/
+/*---------------------------------------------------------------------------*/
+
+struct easycap_dongle easycap_dongle[DONGLE_MANY];
+static int dongle_this;
+static int dongle_done;
 
 /*---------------------------------------------------------------------------*/
 /*
@@ -63,22 +83,25 @@ const struct file_operations easycap_fops = {
         .owner          = THIS_MODULE,
         .open           = easycap_open,
         .release        = easycap_release,
-        .unlocked_ioctl = easycap_ioctl,
+#if defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)
+        .unlocked_ioctl = easycap_ioctl_noinode,
+#else
+        .ioctl          = easycap_ioctl,
+#endif /*EASYCAP_NEEDS_UNLOCKED_IOCTL*/
         .poll           = easycap_poll,
         .mmap           = easycap_mmap,
         .llseek         = no_llseek,
 };
 struct vm_operations_struct easycap_vm_ops = {
-.open  = easycap_vma_open,
-.close = easycap_vma_close,
-.fault = easycap_vma_fault,
+        .open  = easycap_vma_open,
+        .close = easycap_vma_close,
+        .fault = easycap_vma_fault,
 };
 struct usb_class_driver easycap_class = {
-.name = "usb/easycap%d",
-.fops = &easycap_fops,
-.minor_base = USB_SKEL_MINOR_BASE,
+        .name = "usb/easycap%d",
+        .fops = &easycap_fops,
+        .minor_base = USB_SKEL_MINOR_BASE,
 };
-
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #if defined(EASYCAP_IS_VIDEODEV_CLIENT)
 #if defined(EASYCAP_NEEDS_V4L2_FOPS)
@@ -86,16 +109,17 @@ const struct v4l2_file_operations v4l2_fops = {
         .owner          = THIS_MODULE,
         .open           = easycap_open_noinode,
         .release        = easycap_release_noinode,
-        .unlocked_ioctl = easycap_ioctl,
+#if defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)
+        .unlocked_ioctl = easycap_ioctl_noinode,
+#else
+        .ioctl          = easycap_ioctl,
+#endif /*EASYCAP_NEEDS_UNLOCKED_IOCTL*/
         .poll           = easycap_poll,
         .mmap           = easycap_mmap,
 };
 #endif /*EASYCAP_NEEDS_V4L2_FOPS*/
-int video_device_many /*=0*/;
-struct video_device *pvideo_array[VIDEO_DEVICE_MANY], *pvideo_device;
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
 /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
-
 /*--------------------------------------------------------------------------*/
 /*
  *  PARAMETERS USED WHEN REGISTERING THE AUDIO INTERFACE
@@ -105,7 +129,11 @@ const struct file_operations easysnd_fops = {
         .owner          = THIS_MODULE,
         .open           = easysnd_open,
         .release        = easysnd_release,
-        .unlocked_ioctl = easysnd_ioctl,
+#if defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)
+        .unlocked_ioctl = easysnd_ioctl_noinode,
+#else
+        .ioctl          = easysnd_ioctl,
+#endif /*EASYCAP_NEEDS_UNLOCKED_IOCTL*/
         .read           = easysnd_read,
         .llseek         = no_llseek,
 };
@@ -115,17 +143,26 @@ struct usb_class_driver easysnd_class = {
 .minor_base = USB_SKEL_MINOR_BASE,
 };
 /****************************************************************************/
-/*--------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
 /*
- *  IT IS NOT APPROPRIATE FOR easycap_open() TO SUBMIT THE VIDEO URBS HERE,
- *  BECAUSE THERE WILL ALWAYS BE SUBSEQUENT NEGOTIATION OF TV STANDARD AND
- *  FORMAT BY IOCTL AND IT IS INADVISABLE TO HAVE THE URBS RUNNING WHILE
- *  REGISTERS OF THE SA7113H ARE BEING MANIPULATED.
- *
- *  THE SUBMISSION OF VIDEO URBS IS THEREFORE DELAYED UNTIL THE IOCTL COMMAND
- *  STREAMON IS RECEIVED.
- */
-/*--------------------------------------------------------------------------*/
+ *  THIS ROUTINE DOES NOT DETECT DUPLICATE OCCURRENCES OF POINTER peasycap
+*/
+/*---------------------------------------------------------------------------*/
+int
+isdongle(struct easycap *peasycap)
+{
+int k;
+if (NULL == peasycap)
+        return -2;
+for (k = 0; k < DONGLE_MANY; k++) {
+        if (easycap_dongle[k].peasycap == peasycap) {
+                peasycap->isdongle = k;
+                return k;
+        }
+}
+return -1;
+}
+/*****************************************************************************/
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #if defined(EASYCAP_IS_VIDEODEV_CLIENT)
 int
@@ -140,15 +177,17 @@ easycap_open(struct inode *inode, struct file *file)
 {
 #if (!defined(EASYCAP_IS_VIDEODEV_CLIENT))
 struct usb_interface *pusb_interface;
+#else
+struct video_device *pvideo_device;
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
-struct usb_device *p;
 struct easycap *peasycap;
-int i, k, m, rc;
+int rc;
 
 JOT(4, "\n");
 SAY("==========OPEN=========\n");
 
 peasycap = (struct easycap *)NULL;
+/*---------------------------------------------------------------------------*/
 #if (!defined(EASYCAP_IS_VIDEODEV_CLIENT))
 if ((struct inode *)NULL == inode) {
         SAY("ERROR: inode is NULL.\n");
@@ -162,161 +201,427 @@ if (!pusb_interface) {
 peasycap = usb_get_intfdata(pusb_interface);
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #else
-for (i = 0;  i < video_device_many;  i++) {
-        pvideo_device = pvideo_array[i];
-        if ((struct video_device *)NULL != pvideo_device) {
-                peasycap = (struct easycap *)video_get_drvdata(pvideo_device);
-                break;
-        }
+pvideo_device = video_devdata(file);
+if ((struct video_device *)NULL == pvideo_device) {
+        SAY("ERROR: pvideo_device is NULL.\n");
+        return -EFAULT;
 }
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+peasycap = (struct easycap *)video_get_drvdata(pvideo_device);
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
-if ((struct easycap *)NULL == peasycap) {
-        SAY("MISTAKE: peasycap is NULL\n");
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
         return -EFAULT;
 }
-file->private_data = peasycap;
-/*---------------------------------------------------------------------------*/
-/*
- *  INITIALIZATION
- */
-/*---------------------------------------------------------------------------*/
-JOT(4, "starting initialization\n");
-
-for (k = 0;  k < FRAME_BUFFER_MANY;  k++) {
-        for (m = 0;  m < FRAME_BUFFER_SIZE/PAGE_SIZE;  m++)
-                memset(peasycap->frame_buffer[k][m].pgo, 0, PAGE_SIZE);
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
 }
-p = peasycap->pusb_device;
-if ((struct usb_device *)NULL == p) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+if (NULL == peasycap->pusb_device) {
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 } else {
-        JOT(16, "0x%08lX=peasycap->pusb_device\n", \
+        JOM(16, "0x%08lX=peasycap->pusb_device\n", \
                                         (long int)peasycap->pusb_device);
 }
+file->private_data = peasycap;
 rc = wakeup_device(peasycap->pusb_device);
 if (0 == rc)
-        JOT(8, "wakeup_device() OK\n");
+        JOM(8, "wakeup_device() OK\n");
 else {
-        SAY("ERROR: wakeup_device() returned %i\n", rc);
+        SAM("ERROR: wakeup_device() returned %i\n", rc);
+        if (-ENODEV == rc)
+                SAM("ERROR: wakeup_device() returned -ENODEV\n");
+        else
+                SAM("ERROR: wakeup_device() returned %i\n", rc);
+        return rc;
+}
+peasycap->input = 0;
+rc = reset(peasycap);
+if (0 != rc) {
+        SAM("ERROR: reset() returned %i\n", rc);
         return -EFAULT;
 }
-rc = setup_stk(p);  peasycap->input = 0;
-if (0 == rc)
-        JOT(8, "setup_stk() OK\n");
-else {
-        SAY("ERROR: setup_stk() returned %i\n", rc);
+return 0;
+}
+/*****************************************************************************/
+/*---------------------------------------------------------------------------*/
+/*
+ *  RESET THE HARDWARE TO ITS REFERENCE STATE.
+ *
+ *  THIS ROUTINE MAY BE CALLED REPEATEDLY IF easycap_complete() DETECTS
+ *  A BAD VIDEO FRAME SIZE.
+*/
+/*---------------------------------------------------------------------------*/
+int
+reset(struct easycap *peasycap)
+{
+struct easycap_standard const *peasycap_standard;
+int i, rc, input, rate;
+bool ntsc, other;
+
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
         return -EFAULT;
 }
-rc = setup_saa(p);
+input = peasycap->input;
+
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF THE SAA7113H HAS ALREADY ACQUIRED SYNC, USE ITS HARDWARE-DETECTED
+ *  FIELD FREQUENCY TO DISTINGUISH NTSC FROM PAL.  THIS IS ESSENTIAL FOR
+ *  gstreamer AND OTHER USERSPACE PROGRAMS WHICH MAY NOT ATTEMPT TO INITIATE
+ *  A SWITCH BETWEEN PAL AND NTSC.
+ *
+ *  FUNCTION ready_saa() MAY REQUIRE A SUBSTANTIAL FRACTION OF A SECOND TO
+ *  COMPLETE, SO SHOULD NOT BE INVOKED WITHOUT GOOD REASON.
+*/
+/*---------------------------------------------------------------------------*/
+other = false;
+if (true == peasycap->ntsc)
+        JOM(8, "true=peasycap->ntsc\n");
+else
+        JOM(8, "false=peasycap->ntsc\n");
+rate = ready_saa(peasycap->pusb_device);
+if (0 > rate) {
+        JOM(8, "not ready to capture after %i ms ...\n", PATIENCE);
+        if (true == peasycap->ntsc) {
+                JOM(8, "... trying PAL ...\n");  ntsc = false;
+        } else {
+                JOM(8, "... trying NTSC ...\n"); ntsc = true;
+}
+rc = setup_stk(peasycap->pusb_device, ntsc);
 if (0 == rc)
-        JOT(8, "setup_saa() OK\n");
+        JOM(4, "setup_stk() OK\n");
 else {
-        SAY("ERROR: setup_saa() returned %i\n", rc);
+        SAM("ERROR: setup_stk() returned %i\n", rc);
         return -EFAULT;
 }
-rc = check_saa(p);
+rc = setup_saa(peasycap->pusb_device, ntsc);
 if (0 == rc)
-        JOT(8, "check_saa() OK\n");
-else if (-8 < rc)
-        SAY("check_saa() returned %i\n", rc);
+        JOM(4, "setup_saa() OK\n");
 else {
-        SAY("ERROR: check_saa() returned %i\n", rc);
+        SAM("ERROR: setup_saa() returned %i\n", rc);
         return -EFAULT;
 }
-peasycap->standard_offset = -1;
+rate = ready_saa(peasycap->pusb_device);
+if (0 > rate) {
+        JOM(8, "not ready to capture after %i ms ...\n", PATIENCE);
+        JOM(8, "... saa register 0x1F has 0x%02X\n", \
+                                read_saa(peasycap->pusb_device, 0x1F));
+        ntsc = peasycap->ntsc;
+        } else {
+                JOM(8, "... success at second try:  %i=rate\n", rate);
+                ntsc = (0 < (rate/2)) ? true : false ;
+                other = true;
+        }
+} else {
+        JOM(8, "... success at first try:  %i=rate\n", rate);
+        ntsc = (0 < rate/2) ? true : false ;
+}
+if (true == ntsc)
+        JOM(8, "true=ntsc\n");
+else
+        JOM(8, "false=ntsc\n");
 /*---------------------------------------------------------------------------*/
-#if defined(PREFER_NTSC)
 
-rc = adjust_standard(peasycap, V4L2_STD_NTSC_M);
+rc = setup_stk(peasycap->pusb_device, ntsc);
 if (0 == rc)
-        JOT(8, "adjust_standard(.,NTSC_M) OK\n");
+        JOM(4, "setup_stk() OK\n");
 else {
-        SAY("ERROR: adjust_standard(.,NTSC_M) returned %i\n", rc);
+        SAM("ERROR: setup_stk() returned %i\n", rc);
         return -EFAULT;
 }
-rc = adjust_format(peasycap, 640, 480, V4L2_PIX_FMT_UYVY, V4L2_FIELD_NONE, \
-                                                                        false);
-if (0 <= rc)
-        JOT(8, "adjust_format(.,640,480,UYVY) OK\n");
+rc = setup_saa(peasycap->pusb_device, ntsc);
+if (0 == rc)
+        JOM(4, "setup_saa() OK\n");
 else {
-        SAY("ERROR: adjust_format(.,640,480,UYVY) returned %i\n", rc);
+        SAM("ERROR: setup_saa() returned %i\n", rc);
         return -EFAULT;
 }
 
-#else
+for (i = 0; i < 180; i++)
+        peasycap->merit[i] = 0;
+peasycap->video_eof = 0;
+peasycap->audio_eof = 0;
+do_gettimeofday(&peasycap->timeval7);
+/*---------------------------------------------------------------------------*/
+/*
+ * RESTORE INPUT AND FORCE REFRESH OF STANDARD, FORMAT, ETC.
+ *
+ * WHILE THIS PROCEDURE IS IN PROGRESS, SOME IOCTL COMMANDS WILL RETURN -EBUSY.
+*/
+/*---------------------------------------------------------------------------*/
+peasycap->input = -8192;
+peasycap->standard_offset = -8192;
+if (true == other) {
+        peasycap_standard = &easycap_standard[0];
+        while (0xFFFF != peasycap_standard->mask) {
+                if (true == ntsc) {
+                        if (NTSC_M == \
+                                peasycap_standard->v4l2_standard.index) {
+                                peasycap->inputset[input].standard_offset = \
+                                                peasycap_standard - \
+                                                        &easycap_standard[0];
+                                break;
+                        }
+                } else {
+                        if (PAL_BGHIN == \
+                                peasycap_standard->v4l2_standard.index) {
+                                peasycap->inputset[input].standard_offset = \
+                                                peasycap_standard -
+                                                        &easycap_standard[0];
+                                break;
+                        }
+                }
+                peasycap_standard++;
+        }
+        if (0xFFFF == peasycap_standard->mask) {
+                SAM("ERROR: standard not found\n");
+                return -EINVAL;
+        }
+JOM(8, "%i=peasycap->inputset[%i].standard_offset\n", \
+                peasycap->inputset[input].standard_offset, input);
+}
+peasycap->format_offset = -8192;
+peasycap->brightness = -8192;
+peasycap->contrast = -8192;
+peasycap->saturation = -8192;
+peasycap->hue = -8192;
+
+rc = newinput(peasycap, input);
 
-rc = adjust_standard(peasycap, \
-                (V4L2_STD_PAL_B | V4L2_STD_PAL_G | V4L2_STD_PAL_H | \
-                V4L2_STD_PAL_I | V4L2_STD_PAL_N));
 if (0 == rc)
-        JOT(8, "adjust_standard(.,PAL_BGHIN) OK\n");
+        JOM(4, "restored input, standard and format\n");
 else {
-        SAY("ERROR: adjust_standard(.,PAL_BGHIN) returned %i\n", rc);
+        SAM("ERROR: newinput(.,%i) returned %i\n", rc, input);
         return -EFAULT;
 }
-rc = adjust_format(peasycap, 640, 480, V4L2_PIX_FMT_UYVY, V4L2_FIELD_NONE, \
-                                                                        false);
-if (0 <= rc)
-        JOT(8, "adjust_format(.,640,480,uyvy,false) OK\n");
-else {
-        SAY("ERROR: adjust_format(.,640,480,uyvy,false) returned %i\n", rc);
+if (true == peasycap->ntsc)
+        JOM(8, "true=peasycap->ntsc\n");
+else
+        JOM(8, "false=peasycap->ntsc\n");
+
+if (0 > peasycap->input) {
+        SAM("MISTAKE:  %i=peasycap->input\n", peasycap->input);
+        return -ENOENT;
+}
+if (0 > peasycap->standard_offset) {
+        SAM("MISTAKE:  %i=peasycap->standard_offset\n", \
+                                                peasycap->standard_offset);
+        return -ENOENT;
+}
+if (0 > peasycap->format_offset) {
+        SAM("MISTAKE:  %i=peasycap->format_offset\n", \
+                                                peasycap->format_offset);
+        return -ENOENT;
+}
+if (0 > peasycap->brightness) {
+        SAM("MISTAKE:  %i=peasycap->brightness\n", peasycap->brightness);
+        return -ENOENT;
+}
+if (0 > peasycap->contrast) {
+        SAM("MISTAKE:  %i=peasycap->contrast\n", peasycap->contrast);
+        return -ENOENT;
+}
+if (0 > peasycap->saturation) {
+        SAM("MISTAKE:  %i=peasycap->saturation\n", peasycap->saturation);
+        return -ENOENT;
+}
+if (0 > peasycap->hue) {
+        SAM("MISTAKE:  %i=peasycap->hue\n", peasycap->hue);
+        return -ENOENT;
+}
+return 0;
+}
+/*****************************************************************************/
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF THE REQUESTED INPUT IS THE SAME AS THE EXISTING INPUT, DO NOTHING.
+ *  OTHERWISE:
+ *      KILL URBS, CLEAR FIELD AND FRAME BUFFERS AND RESET THEIR
+ *           _read AND _fill POINTERS.
+ *      SELECT THE NEW INPUT.
+ *      ADJUST THE STANDARD, FORMAT, BRIGHTNESS, CONTRAST, SATURATION AND HUE
+ *          ON THE BASIS OF INFORMATION IN STRUCTURE easycap.inputset[input].
+ *      RESUBMIT THE URBS IF STREAMING WAS ALREADY IN PROGRESS.
+ *
+ *  NOTE:
+ *      THIS ROUTINE MAY BE CALLED FREQUENTLY BY ZONEMINDER VIA IOCTL,
+ *      SO IT SHOULD WRITE ONLY SPARINGLY TO THE LOGFILE.
+*/
+/*---------------------------------------------------------------------------*/
+int
+newinput(struct easycap *peasycap, int input)
+{
+int rc, k, m, mood, off;
+int inputnow, video_idlenow, audio_idlenow;
+bool resubmit;
+
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
         return -EFAULT;
 }
+JOM(8, "%i=input sought\n", input);
 
-#endif /* !PREFER_NTSC*/
+if (0 > input && INPUT_MANY <= input)
+        return -ENOENT;
+inputnow = peasycap->input;
+if (input == inputnow)
+        return 0;
 /*---------------------------------------------------------------------------*/
-rc = adjust_brightness(peasycap, -8192);
+/*
+ *  IF STREAMING IS IN PROGRESS THE URBS ARE KILLED AT THIS
+ *  STAGE AND WILL BE RESUBMITTED PRIOR TO EXIT FROM THE ROUTINE.
+ *  IF NO STREAMING IS IN PROGRESS NO URBS WILL BE SUBMITTED BY THE
+ *  ROUTINE.
+*/
+/*---------------------------------------------------------------------------*/
+video_idlenow = peasycap->video_idle;
+audio_idlenow = peasycap->audio_idle;
+
+peasycap->video_idle = 1;
+peasycap->audio_idle = 1;
+if (peasycap->video_isoc_streaming) {
+        resubmit = true;
+        kill_video_urbs(peasycap);
+} else
+        resubmit = false;
+/*---------------------------------------------------------------------------*/
+if (NULL == peasycap->pusb_device) {
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
+        return -ENODEV;
+}
+rc = usb_set_interface(peasycap->pusb_device,
+                        peasycap->video_interface, \
+                        peasycap->video_altsetting_off);
 if (0 != rc) {
-        SAY("ERROR: adjust_brightness(default) returned %i\n", rc);
+        SAM("ERROR: usb_set_interface() returned %i\n", rc);
         return -EFAULT;
 }
-rc = adjust_contrast(peasycap, -8192);
+rc = stop_100(peasycap->pusb_device);
 if (0 != rc) {
-        SAY("ERROR: adjust_contrast(default) returned %i\n", rc);
+        SAM("ERROR: stop_100() returned %i\n", rc);
         return -EFAULT;
 }
-rc = adjust_saturation(peasycap, -8192);
-if (0 != rc) {
-        SAY("ERROR: adjust_saturation(default) returned %i\n", rc);
-        return -EFAULT;
+for (k = 0; k < FIELD_BUFFER_MANY; k++) {
+        for (m = 0; m < FIELD_BUFFER_SIZE/PAGE_SIZE; m++)
+                memset(peasycap->field_buffer[k][m].pgo, 0, PAGE_SIZE);
 }
-rc = adjust_hue(peasycap, -8192);
-if (0 != rc) {
-        SAY("ERROR: adjust_hue(default) returned %i\n", rc);
-        return -EFAULT;
+for (k = 0; k < FRAME_BUFFER_MANY; k++) {
+        for (m = 0; m < FRAME_BUFFER_SIZE/PAGE_SIZE; m++)
+                memset(peasycap->frame_buffer[k][m].pgo, 0, PAGE_SIZE);
+}
+peasycap->field_page = 0;
+peasycap->field_read = 0;
+peasycap->field_fill = 0;
+
+peasycap->frame_read = 0;
+peasycap->frame_fill = 0;
+for (k = 0; k < peasycap->input; k++) {
+        (peasycap->frame_fill)++;
+        if (peasycap->frame_buffer_many <= peasycap->frame_fill)
+                peasycap->frame_fill = 0;
 }
+peasycap->input = input;
+select_input(peasycap->pusb_device, peasycap->input, 9);
 /*---------------------------------------------------------------------------*/
-rc = usb_set_interface(peasycap->pusb_device, peasycap->video_interface, \
-                                                peasycap->video_altsetting_on);
-if (0 == rc)
-        JOT(8, "usb_set_interface(.,%i,%i) OK\n", peasycap->video_interface, \
-                                                peasycap->video_altsetting_on);
-else {
-        SAY("ERROR: usb_set_interface() returned %i\n", rc);
+if (input == peasycap->inputset[input].input) {
+        off = peasycap->inputset[input].standard_offset;
+        if (off != peasycap->standard_offset) {
+                rc = adjust_standard(peasycap, \
+                                easycap_standard[off].v4l2_standard.id);
+                if (0 != rc) {
+                        SAM("ERROR: adjust_standard() returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->standard_offset\n", \
+                                                peasycap->standard_offset);
+        } else {
+                JOM(8, "%i=peasycap->standard_offset unchanged\n", \
+                                                peasycap->standard_offset);
+        }
+        off = peasycap->inputset[input].format_offset;
+        if (off != peasycap->format_offset) {
+                rc = adjust_format(peasycap, \
+                        easycap_format[off].v4l2_format.fmt.pix.width, \
+                        easycap_format[off].v4l2_format.fmt.pix.height, \
+                        easycap_format[off].v4l2_format.fmt.pix.pixelformat, \
+                        easycap_format[off].v4l2_format.fmt.pix.field, false);
+                if (0 > rc) {
+                        SAM("ERROR: adjust_format() returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->format_offset\n", peasycap->format_offset);
+        } else {
+                JOM(8, "%i=peasycap->format_offset unchanged\n", \
+                                                peasycap->format_offset);
+        }
+        mood = peasycap->inputset[input].brightness;
+        if (mood != peasycap->brightness) {
+                rc = adjust_brightness(peasycap, mood);
+                if (0 != rc) {
+                        SAM("ERROR: adjust_brightness returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->brightness\n", peasycap->brightness);
+        }
+        mood = peasycap->inputset[input].contrast;
+        if (mood != peasycap->contrast) {
+                rc = adjust_contrast(peasycap, mood);
+                if (0 != rc) {
+                        SAM("ERROR: adjust_contrast returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->contrast\n", peasycap->contrast);
+        }
+        mood = peasycap->inputset[input].saturation;
+        if (mood != peasycap->saturation) {
+                rc = adjust_saturation(peasycap, mood);
+                if (0 != rc) {
+                        SAM("ERROR: adjust_saturation returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->saturation\n", peasycap->saturation);
+        }
+        mood = peasycap->inputset[input].hue;
+        if (mood != peasycap->hue) {
+                rc = adjust_hue(peasycap, mood);
+                if (0 != rc) {
+                        SAM("ERROR: adjust_hue returned %i\n", rc);
+                        return -EFAULT;
+                }
+                JOM(8, "%i=peasycap->hue\n", peasycap->hue);
+        }
+} else {
+        SAM("MISTAKE: easycap.inputset[%i] unpopulated\n", input);
+        return -ENOENT;
+}
+/*---------------------------------------------------------------------------*/
+if (NULL == peasycap->pusb_device) {
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
+        return -ENODEV;
+}
+rc = usb_set_interface(peasycap->pusb_device,
+                        peasycap->video_interface, \
+                        peasycap->video_altsetting_on);
+if (0 != rc) {
+        SAM("ERROR: usb_set_interface() returned %i\n", rc);
         return -EFAULT;
 }
-rc = start_100(p);
-if (0 == rc)
-        JOT(8, "start_100() OK\n");
-else {
-        SAY("ERROR: start_100() returned %i\n", rc);
+rc = start_100(peasycap->pusb_device);
+if (0 != rc) {
+        SAM("ERROR: start_100() returned %i\n", rc);
         return -EFAULT;
 }
+if (true == resubmit)
+        submit_video_urbs(peasycap);
+
 peasycap->video_isoc_sequence = VIDEO_ISOC_BUFFER_MANY - 1;
-peasycap->video_idle = 0;
+peasycap->video_idle = video_idlenow;
+peasycap->audio_idle = audio_idlenow;
 peasycap->video_junk = 0;
-for (i = 0; i < 180; i++)
-        peasycap->merit[i] = 0;
-peasycap->video_eof = 0;
-peasycap->audio_eof = 0;
 
-do_gettimeofday(&peasycap->timeval7);
-
-peasycap->fudge = 0;
-
-JOT(4, "finished initialization\n");
 return 0;
 }
 /*****************************************************************************/
@@ -326,33 +631,25 @@ submit_video_urbs(struct easycap *peasycap)
 struct data_urb *pdata_urb;
 struct urb *purb;
 struct list_head *plist_head;
-int j, isbad, m, rc;
+int j, isbad, nospc, m, rc;
 int isbuf;
 
-if ((struct list_head *)NULL == peasycap->purb_video_head) {
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
+
+if (NULL == peasycap->purb_video_head) {
         SAY("ERROR: peasycap->urb_video_head uninitialized\n");
         return -EFAULT;
 }
-if ((struct usb_device *)NULL == peasycap->pusb_device) {
+if (NULL == peasycap->pusb_device) {
         SAY("ERROR: peasycap->pusb_device is NULL\n");
-        return -EFAULT;
+        return -ENODEV;
 }
 if (!peasycap->video_isoc_streaming) {
-
-
-
-
-
-
-
-
-        JOT(4, "submission of all video urbs\n");
-        if (0 != ready_saa(peasycap->pusb_device)) {
-                SAY("ERROR: not ready to capture after waiting " \
-                                                        "one second\n");
-                SAY(".....  continuing anyway\n");
-        }
-        isbad = 0;  m = 0;
+        JOM(4, "submission of all video urbs\n");
+        isbad = 0;  nospc = 0;  m = 0;
         list_for_each(plist_head, (peasycap->purb_video_head)) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
                 if (NULL != pdata_urb) {
@@ -389,44 +686,57 @@ if (!peasycap->video_isoc_streaming) {
                                 rc = usb_submit_urb(purb, GFP_KERNEL);
                                 if (0 != rc) {
                                         isbad++;
-                                        SAY("ERROR: usb_submit_urb() failed " \
+                                        SAM("ERROR: usb_submit_urb() failed " \
                                                         "for urb with rc:\n");
                                         switch (rc) {
                                         case -ENOMEM: {
-                                                SAY("ENOMEM\n");
+                                                SAM("ERROR: -ENOMEM=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -ENODEV: {
-                                                SAY("ENODEV\n");
+                                                SAM("ERROR: -ENODEV=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -ENXIO: {
-                                                SAY("ENXIO\n");
+                                                SAM("ERROR: -ENXIO=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -EINVAL: {
-                                                SAY("EINVAL\n");
+                                                SAM("ERROR: -EINVAL=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -EAGAIN: {
-                                                SAY("EAGAIN\n");
+                                                SAM("ERROR: -EAGAIN=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -EFBIG: {
-                                                SAY("EFBIG\n");
+                                                SAM("ERROR: -EFBIG=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -EPIPE: {
-                                                SAY("EPIPE\n");
+                                                SAM("ERROR: -EPIPE=" \
+                                                        "usb_submit_urb()\n");
                                                 break;
                                         }
                                         case -EMSGSIZE: {
-                                                SAY("EMSGSIZE\n");
+                                                SAM("ERROR: -EMSGSIZE=" \
+                                                        "usb_submit_urb()\n");
+                                                break;
+                                        }
+                                        case -ENOSPC: {
+                                                nospc++;
                                                 break;
                                         }
                                         default: {
-                                                SAY("unknown error code %i\n",\
-                                                                         rc);
+                                                SAM("ERROR: %i=" \
+                                                        "usb_submit_urb()\n",\
+                                                        rc);
                                                 break;
                                         }
                                         }
@@ -434,14 +744,20 @@ if (!peasycap->video_isoc_streaming) {
                                         m++;
                                 }
                                 } else {
-                                        isbad++;
+                                         isbad++;
                                 }
                         } else {
                                  isbad++;
                         }
                 }
+        if (nospc) {
+                SAM("-ENOSPC=usb_submit_urb() for %i urbs\n", nospc);
+                SAM(".....  possibly inadequate USB bandwidth\n");
+                peasycap->video_eof = 1;
+        }
+
         if (isbad) {
-                JOT(4, "attempting cleanup instead of submitting\n");
+                JOM(4, "attempting cleanup instead of submitting\n");
                 list_for_each(plist_head, (peasycap->purb_video_head)) {
                         pdata_urb = list_entry(plist_head, struct data_urb, \
                                                                 list_head);
@@ -454,16 +770,10 @@ if (!peasycap->video_isoc_streaming) {
                 peasycap->video_isoc_streaming = 0;
         } else {
                 peasycap->video_isoc_streaming = 1;
-                JOT(4, "submitted %i video urbs\n", m);
+                JOM(4, "submitted %i video urbs\n", m);
         }
-
-
-
-
-
-
 } else {
-        JOT(4, "already streaming video urbs\n");
+        JOM(4, "already streaming video urbs\n");
 }
 return 0;
 }
@@ -475,35 +785,32 @@ int m;
 struct list_head *plist_head;
 struct data_urb *pdata_urb;
 
-if ((struct easycap *)NULL == peasycap) {
+if (NULL == peasycap) {
         SAY("ERROR: peasycap is NULL\n");
         return -EFAULT;
 }
 if (peasycap->video_isoc_streaming) {
-
-
-
         if ((struct list_head *)NULL != peasycap->purb_video_head) {
                 peasycap->video_isoc_streaming = 0;
-                JOT(4, "killing video urbs\n");
+                JOM(4, "killing video urbs\n");
                 m = 0;
                 list_for_each(plist_head, (peasycap->purb_video_head)) {
                         pdata_urb = list_entry(plist_head, struct data_urb, \
                                                                 list_head);
-                        if ((struct data_urb *)NULL != pdata_urb) {
-                                if ((struct urb *)NULL != pdata_urb->purb) {
+                        if (NULL != pdata_urb) {
+                                if (NULL != pdata_urb->purb) {
                                         usb_kill_urb(pdata_urb->purb);
                                         m++;
                                 }
                         }
                 }
-                JOT(4, "%i video urbs killed\n", m);
+                JOM(4, "%i video urbs killed\n", m);
         } else {
-                SAY("ERROR: peasycap->purb_video_head is NULL\n");
+                SAM("ERROR: peasycap->purb_video_head is NULL\n");
                 return -EFAULT;
         }
 } else {
-        JOT(8, "%i=video_isoc_streaming, no video urbs killed\n", \
+        JOM(8, "%i=video_isoc_streaming, no video urbs killed\n", \
                                         peasycap->video_isoc_streaming);
 }
 return 0;
@@ -533,11 +840,15 @@ if (NULL == peasycap) {
         SAY("ending unsuccessfully\n");
         return -EFAULT;
 }
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
 if (0 != kill_video_urbs(peasycap)) {
-        SAY("ERROR: kill_video_urbs() failed\n");
+        SAM("ERROR: kill_video_urbs() failed\n");
         return -EFAULT;
 }
-JOT(4, "ending successfully\n");
+JOM(4, "ending successfully\n");
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #else
 #
@@ -550,63 +861,45 @@ return 0;
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #if defined(EASYCAP_IS_VIDEODEV_CLIENT)
 int
-videodev_release(struct video_device *pvd)
+videodev_release(struct video_device *pvideo_device)
 {
 struct easycap *peasycap;
-int i, j, k;
 
 JOT(4, "\n");
 
-k = 0;
-for (i = 0;  i < video_device_many;  i++) {
-        pvideo_device = pvideo_array[i];
-        if ((struct video_device *)NULL != pvideo_device) {
-                if (pvd->minor == pvideo_device->minor) {
-                        peasycap = (struct easycap *)\
-                                        video_get_drvdata(pvideo_device);
-                        if ((struct easycap *)NULL == peasycap) {
-                                SAY("ERROR:  peasycap is NULL\n");
-                                SAY("ending unsuccessfully\n");
-                                return -EFAULT;
-                        }
-                        if (0 != kill_video_urbs(peasycap)) {
-                                SAY("ERROR: kill_video_urbs() failed\n");
-                                return -EFAULT;
-                        }
-                        JOT(4, "freeing video_device structure: " \
-                                                        "/dev/video%i\n", i);
-                        kfree((void *)pvideo_device);
-                        for (j = i;  j < (VIDEO_DEVICE_MANY - 1);  j++)
-                                pvideo_array[j] = pvideo_array[j + 1];
-                        video_device_many--;  k++;
-                        break;
-                }
-        }
-}
-if (!k) {
-        SAY("ERROR: lost video_device structure for %i=minor\n", pvd->minor);
-        SAY("cannot free: may cause memory leak\n");
+peasycap = video_get_drvdata(pvideo_device);
+if (NULL == peasycap) {
+        SAY("ERROR:  peasycap is NULL\n");
         SAY("ending unsuccessfully\n");
         return -EFAULT;
 }
-
-JOT(4, "ending successfully\n");
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
+if (0 != kill_video_urbs(peasycap)) {
+        SAM("ERROR: kill_video_urbs() failed\n");
+        return -EFAULT;
+}
+JOM(4, "ending successfully\n");
 return 0;
 }
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
-/****************************************************************************/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+/*****************************************************************************/
 /*--------------------------------------------------------------------------*/
 /*
- *  THIS FUNCTION IS CALLED FROM WITHIN easycap_usb_disconnect().
- *  BY THIS STAGE THE DEVICE HAS ALREADY BEEN PHYSICALLY UNPLUGGED.
- *  peasycap->pusb_device IS NO LONGER VALID AND SHOULD HAVE BEEN SET TO NULL.
+ *  THIS FUNCTION IS CALLED FROM WITHIN easycap_usb_disconnect() AND IS
+ *  PROTECTED BY SEMAPHORES SET AND CLEARED BY easycap_usb_disconnect().
+ *
+ *  BY THIS STAGE THE DEVICE HAS ALREADY BEEN PHYSICALLY UNPLUGGED, SO
+ *  peasycap->pusb_device IS NO LONGER VALID.
  */
 /*---------------------------------------------------------------------------*/
 void
 easycap_delete(struct kref *pkref)
 {
-int k, m, lost;
+int k, m, gone, kd;
 int allocation_video_urb, allocation_video_page, allocation_video_struct;
 int allocation_audio_urb, allocation_audio_page, allocation_audio_struct;
 int registered_video, registered_audio;
@@ -617,22 +910,27 @@ struct list_head *plist_head, *plist_next;
 JOT(4, "\n");
 
 peasycap = container_of(pkref, struct easycap, kref);
-if ((struct easycap *)NULL == peasycap) {
-        SAY("ERROR: peasycap is NULL: cannot perform deletions\n");
+if (NULL == peasycap) {
+        SAM("ERROR: peasycap is NULL: cannot perform deletions\n");
+        return;
+}
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
         return;
 }
+kd = isdongle(peasycap);
 /*---------------------------------------------------------------------------*/
 /*
  *  FREE VIDEO.
  */
 /*---------------------------------------------------------------------------*/
 if ((struct list_head *)NULL != peasycap->purb_video_head) {
-        JOT(4, "freeing video urbs\n");
+        JOM(4, "freeing video urbs\n");
         m = 0;
         list_for_each(plist_head, (peasycap->purb_video_head)) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
                 if (NULL == pdata_urb)
-                        JOT(4, "ERROR: pdata_urb is NULL\n");
+                        JOM(4, "ERROR: pdata_urb is NULL\n");
                 else {
                         if ((struct urb *)NULL != pdata_urb->purb) {
                                 usb_free_urb(pdata_urb->purb);
@@ -643,9 +941,9 @@ if ((struct list_head *)NULL != peasycap->purb_video_head) {
                 }
         }
 
-        JOT(4, "%i video urbs freed\n", m);
+        JOM(4, "%i video urbs freed\n", m);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "freeing video data_urb structures.\n");
+        JOM(4, "freeing video data_urb structures.\n");
         m = 0;
         list_for_each_safe(plist_head, plist_next, peasycap->purb_video_head) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
@@ -656,14 +954,12 @@ if ((struct list_head *)NULL != peasycap->purb_video_head) {
                         m++;
                 }
         }
-        JOT(4, "%i video data_urb structures freed\n", m);
-        JOT(4, "setting peasycap->purb_video_head=NULL\n");
+        JOM(4, "%i video data_urb structures freed\n", m);
+        JOM(4, "setting peasycap->purb_video_head=NULL\n");
         peasycap->purb_video_head = (struct list_head *)NULL;
-        } else {
-JOT(4, "peasycap->purb_video_head is NULL\n");
 }
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing video isoc buffers.\n");
+JOM(4, "freeing video isoc buffers.\n");
 m = 0;
 for (k = 0;  k < VIDEO_ISOC_BUFFER_MANY;  k++) {
         if ((void *)NULL != peasycap->video_isoc_buffer[k].pgo) {
@@ -676,10 +972,10 @@ for (k = 0;  k < VIDEO_ISOC_BUFFER_MANY;  k++) {
                 m++;
         }
 }
-JOT(4, "isoc video buffers freed: %i pages\n", m * (0x01 << VIDEO_ISOC_ORDER));
+JOM(4, "isoc video buffers freed: %i pages\n", m * (0x01 << VIDEO_ISOC_ORDER));
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing video field buffers.\n");
-lost = 0;
+JOM(4, "freeing video field buffers.\n");
+gone = 0;
 for (k = 0;  k < FIELD_BUFFER_MANY;  k++) {
         for (m = 0;  m < FIELD_BUFFER_SIZE/PAGE_SIZE;  m++) {
                 if ((void *)NULL != peasycap->field_buffer[k][m].pgo) {
@@ -687,14 +983,14 @@ for (k = 0;  k < FIELD_BUFFER_MANY;  k++) {
                                         (peasycap->field_buffer[k][m].pgo));
                         peasycap->field_buffer[k][m].pgo = (void *)NULL;
                         peasycap->allocation_video_page -= 1;
-                        lost++;
+                        gone++;
                 }
         }
 }
-JOT(4, "video field buffers freed: %i pages\n", lost);
+JOM(4, "video field buffers freed: %i pages\n", gone);
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing video frame buffers.\n");
-lost = 0;
+JOM(4, "freeing video frame buffers.\n");
+gone = 0;
 for (k = 0;  k < FRAME_BUFFER_MANY;  k++) {
         for (m = 0;  m < FRAME_BUFFER_SIZE/PAGE_SIZE;  m++) {
                 if ((void *)NULL != peasycap->frame_buffer[k][m].pgo) {
@@ -702,23 +998,23 @@ for (k = 0;  k < FRAME_BUFFER_MANY;  k++) {
                                         (peasycap->frame_buffer[k][m].pgo));
                         peasycap->frame_buffer[k][m].pgo = (void *)NULL;
                         peasycap->allocation_video_page -= 1;
-                        lost++;
+                        gone++;
                 }
         }
 }
-JOT(4, "video frame buffers freed: %i pages\n", lost);
+JOM(4, "video frame buffers freed: %i pages\n", gone);
 /*---------------------------------------------------------------------------*/
 /*
  *  FREE AUDIO.
  */
 /*---------------------------------------------------------------------------*/
 if ((struct list_head *)NULL != peasycap->purb_audio_head) {
-        JOT(4, "freeing audio urbs\n");
+        JOM(4, "freeing audio urbs\n");
         m = 0;
         list_for_each(plist_head, (peasycap->purb_audio_head)) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
                 if (NULL == pdata_urb)
-                        JOT(4, "ERROR: pdata_urb is NULL\n");
+                        JOM(4, "ERROR: pdata_urb is NULL\n");
                 else {
                         if ((struct urb *)NULL != pdata_urb->purb) {
                                 usb_free_urb(pdata_urb->purb);
@@ -728,9 +1024,9 @@ if ((struct list_head *)NULL != peasycap->purb_audio_head) {
                         }
                 }
         }
-        JOT(4, "%i audio urbs freed\n", m);
+        JOM(4, "%i audio urbs freed\n", m);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "freeing audio data_urb structures.\n");
+        JOM(4, "freeing audio data_urb structures.\n");
         m = 0;
         list_for_each_safe(plist_head, plist_next, peasycap->purb_audio_head) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
@@ -741,14 +1037,12 @@ if ((struct list_head *)NULL != peasycap->purb_audio_head) {
                         m++;
                 }
         }
-JOT(4, "%i audio data_urb structures freed\n", m);
-JOT(4, "setting peasycap->purb_audio_head=NULL\n");
+JOM(4, "%i audio data_urb structures freed\n", m);
+JOM(4, "setting peasycap->purb_audio_head=NULL\n");
 peasycap->purb_audio_head = (struct list_head *)NULL;
-} else {
-JOT(4, "peasycap->purb_audio_head is NULL\n");
 }
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing audio isoc buffers.\n");
+JOM(4, "freeing audio isoc buffers.\n");
 m = 0;
 for (k = 0;  k < AUDIO_ISOC_BUFFER_MANY;  k++) {
         if ((void *)NULL != peasycap->audio_isoc_buffer[k].pgo) {
@@ -761,22 +1055,22 @@ for (k = 0;  k < AUDIO_ISOC_BUFFER_MANY;  k++) {
                 m++;
         }
 }
-JOT(4, "easysnd_delete(): isoc audio buffers freed: %i pages\n", \
+JOM(4, "easysnd_delete(): isoc audio buffers freed: %i pages\n", \
                                         m * (0x01 << AUDIO_ISOC_ORDER));
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing audio buffers.\n");
-lost = 0;
+JOM(4, "freeing audio buffers.\n");
+gone = 0;
 for (k = 0;  k < peasycap->audio_buffer_page_many;  k++) {
         if ((void *)NULL != peasycap->audio_buffer[k].pgo) {
                 free_page((unsigned long)(peasycap->audio_buffer[k].pgo));
                 peasycap->audio_buffer[k].pgo = (void *)NULL;
                 peasycap->allocation_audio_page -= 1;
-                lost++;
+                gone++;
         }
 }
-JOT(4, "easysnd_delete(): audio buffers freed: %i pages\n", lost);
+JOM(4, "easysnd_delete(): audio buffers freed: %i pages\n", gone);
 /*---------------------------------------------------------------------------*/
-JOT(4, "freeing easycap structure.\n");
+JOM(4, "freeing easycap structure.\n");
 allocation_video_urb    = peasycap->allocation_video_urb;
 allocation_video_page   = peasycap->allocation_video_page;
 allocation_video_struct = peasycap->allocation_video_struct;
@@ -785,15 +1079,16 @@ allocation_audio_urb    = peasycap->allocation_audio_urb;
 allocation_audio_page   = peasycap->allocation_audio_page;
 allocation_audio_struct = peasycap->allocation_audio_struct;
 registered_audio        = peasycap->registered_audio;
-m = 0;
-if ((struct easycap *)NULL != peasycap) {
-        kfree(peasycap);  peasycap = (struct easycap *)NULL;
+
+kfree(peasycap);
+if (0 <= kd && DONGLE_MANY > kd) {
+        easycap_dongle[kd].peasycap = (struct easycap *)NULL;
+        JOT(4, "   null-->easycap_dongle[%i].peasycap\n", kd);
         allocation_video_struct -= sizeof(struct easycap);
-        m++;
+} else {
+        SAY("ERROR: cannot purge easycap_dongle[].peasycap");
 }
-JOT(4, "%i easycap structure freed\n", m);
 /*---------------------------------------------------------------------------*/
-
 SAY("%8i= video urbs     after all deletions\n", allocation_video_urb);
 SAY("%8i= video pages    after all deletions\n", allocation_video_page);
 SAY("%8i= video structs  after all deletions\n", allocation_video_struct);
@@ -810,27 +1105,85 @@ return;
 unsigned int easycap_poll(struct file *file, poll_table *wait)
 {
 struct easycap *peasycap;
+int rc, kd;
 
 JOT(8, "\n");
 
 if (NULL == ((poll_table *)wait))
         JOT(8, "WARNING:  poll table pointer is NULL ... continuing\n");
-if (NULL == ((struct file *)file)) {
+if ((struct file *)NULL == file) {
         SAY("ERROR:  file pointer is NULL\n");
-        return -EFAULT;
+        return -ERESTARTSYS;
 }
 peasycap = file->private_data;
 if (NULL == peasycap) {
         SAY("ERROR:  peasycap is NULL\n");
         return -EFAULT;
 }
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
+if (NULL == peasycap->pusb_device) {
+        SAY("ERROR:  peasycap->pusb_device is NULL\n");
+        return -EFAULT;
+}
+/*---------------------------------------------------------------------------*/
+kd = isdongle(peasycap);
+if (0 <= kd && DONGLE_MANY > kd) {
+        if (mutex_lock_interruptible(&easycap_dongle[kd].mutex_video)) {
+                SAY("ERROR: cannot down easycap_dongle[%i].mutex_video\n", kd);
+                return -ERESTARTSYS;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_video\n", kd);
+        /*-------------------------------------------------------------------*/
+        /*
+         *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER
+         *  peasycap, IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
+         *  IF NECESSARY, BAIL OUT.
+        */
+        /*-------------------------------------------------------------------*/
+        if (kd != isdongle(peasycap))
+                return -ERESTARTSYS;
+        if (NULL == file) {
+                SAY("ERROR:  file is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+        peasycap = file->private_data;
+        if (NULL == peasycap) {
+                SAY("ERROR:  peasycap is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+        if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+                SAY("ERROR: bad peasycap: 0x%08lX\n", \
+                                                (unsigned long int) peasycap);
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+        if (NULL == peasycap->pusb_device) {
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return -ERESTARTSYS;
+        }
+} else
+        /*-------------------------------------------------------------------*/
+        /*
+         *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap
+         *  BEFORE THE ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL
+         *  HAVE FAILED.  BAIL OUT.
+        */
+        /*-------------------------------------------------------------------*/
+        return -ERESTARTSYS;
+/*---------------------------------------------------------------------------*/
+rc = easycap_dqbuf(peasycap, 0);
 peasycap->polled = 1;
-
-if (0 == easycap_dqbuf(peasycap, 0))
+mutex_unlock(&easycap_dongle[kd].mutex_video);
+if (0 == rc)
         return POLLIN | POLLRDNORM;
 else
         return POLLERR;
-
 }
 /*****************************************************************************/
 /*---------------------------------------------------------------------------*/
@@ -841,7 +1194,7 @@ else
 int
 easycap_dqbuf(struct easycap *peasycap, int mode)
 {
-int miss, rc;
+int input, ifield, miss, rc;
 
 JOT(8, "\n");
 
@@ -849,129 +1202,188 @@ if (NULL == peasycap) {
         SAY("ERROR:  peasycap is NULL\n");
         return -EFAULT;
 }
+if (NULL == peasycap->pusb_device) {
+        SAY("ERROR:  peasycap->pusb_device is NULL\n");
+        return -EFAULT;
+}
+ifield = 0;
+JOM(8, "%i=ifield\n", ifield);
+/*---------------------------------------------------------------------------*/
+/*
+ *  CHECK FOR LOST INPUT SIGNAL.
+ *
+ *  FOR THE FOUR-CVBS EasyCAP, THIS DOES NOT WORK AS EXPECTED.
+ *  IF INPUT 0 IS PRESENT AND SYNC ACQUIRED, UNPLUGGING INPUT 4 DOES NOT
+ *  RESULT IN SETTING BIT 0x40 ON REGISTER 0x1F, PRESUMABLY BECAUSE THERE
+ *  IS FLYWHEELING ON INPUT 0.  THE UPSHOT IS:
+ *
+ *    INPUT 0   PLUGGED, INPUT 4   PLUGGED => SCREEN 0 OK,   SCREEN 4 OK
+ *    INPUT 0   PLUGGED, INPUT 4 UNPLUGGED => SCREEN 0 OK,   SCREEN 4 BLACK
+ *    INPUT 0 UNPLUGGED, INPUT 4   PLUGGED => SCREEN 0 BARS, SCREEN 4 OK
+ *    INPUT 0 UNPLUGGED, INPUT 4 UNPLUGGED => SCREEN 0 BARS, SCREEN 4 BARS
+*/
+/*---------------------------------------------------------------------------*/
+input = peasycap->input;
+if (0 <= input && INPUT_MANY > input) {
+        rc = read_saa(peasycap->pusb_device, 0x1F);
+        if (0 <= rc) {
+                if (rc & 0x40)
+                        peasycap->lost[input] += 1;
+                else
+                        peasycap->lost[input] -= 2;
+
+        if (0 > peasycap->lost[input])
+                peasycap->lost[input] = 0;
+        else if ((2 * VIDEO_LOST_TOLERATE) < peasycap->lost[input])
+                peasycap->lost[input] = (2 * VIDEO_LOST_TOLERATE);
+        }
+}
 /*---------------------------------------------------------------------------*/
 /*
- *  WAIT FOR FIELD 0
+ *  WAIT FOR FIELD ifield  (0 => TOP, 1 => BOTTOM)
  */
 /*---------------------------------------------------------------------------*/
 miss = 0;
-if (mutex_lock_interruptible(&(peasycap->mutex_mmap_video[0])))
-        return -ERESTARTSYS;
 while ((peasycap->field_read == peasycap->field_fill) || \
                                 (0 != (0xFF00 & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount)) || \
-                                (0 != (0x00FF & peasycap->field_buffer\
+                                (ifield != (0x00FF & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount))) {
-        mutex_unlock(&(peasycap->mutex_mmap_video[0]));
-
         if (mode)
                 return -EAGAIN;
 
-        JOT(8, "first wait  on wq_video, " \
+        JOM(8, "first wait  on wq_video, " \
                                 "%i=field_read  %i=field_fill\n", \
                                 peasycap->field_read, peasycap->field_fill);
 
-        msleep(1);
         if (0 != (wait_event_interruptible(peasycap->wq_video, \
                         (peasycap->video_idle || peasycap->video_eof  || \
                         ((peasycap->field_read != peasycap->field_fill) && \
                                 (0 == (0xFF00 & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount)) && \
-                                (0 == (0x00FF & peasycap->field_buffer\
-                                        [peasycap->field_read][0].kount))))))){
-                SAY("aborted by signal\n");
+                                (ifield == (0x00FF & peasycap->field_buffer\
+                                        [peasycap->field_read][0].kount))))))) {
+                SAM("aborted by signal\n");
                 return -EIO;
                 }
         if (peasycap->video_idle) {
-                JOT(8, "%i=peasycap->video_idle\n", peasycap->video_idle);
-                return -EIO;
+                JOM(8, "%i=peasycap->video_idle ... returning -EAGAIN\n", \
+                                                        peasycap->video_idle);
+                return -EAGAIN;
         }
         if (peasycap->video_eof) {
-                JOT(8, "%i=peasycap->video_eof\n", peasycap->video_eof);
-                debrief(peasycap);
+                JOM(8, "%i=peasycap->video_eof\n", peasycap->video_eof);
+                #if defined(PERSEVERE)
+                if (1 == peasycap->status) {
+                        JOM(8, "persevering ...\n");
+                        peasycap->video_eof = 0;
+                        peasycap->audio_eof = 0;
+                        if (0 != reset(peasycap)) {
+                                JOM(8, " ... failed ... returning -EIO\n");
+                                peasycap->video_eof = 1;
+                                peasycap->audio_eof = 1;
+                                kill_video_urbs(peasycap);
+                                return -EIO;
+                        }
+                        peasycap->status = 0;
+                        JOM(8, " ... OK ... returning -EAGAIN\n");
+                        return -EAGAIN;
+                }
+                #endif /*PERSEVERE*/
+                peasycap->video_eof = 1;
+                peasycap->audio_eof = 1;
                 kill_video_urbs(peasycap);
+                JOM(8, "returning -EIO\n");
                 return -EIO;
         }
 miss++;
-if (mutex_lock_interruptible(&(peasycap->mutex_mmap_video[0])))
-        return -ERESTARTSYS;
 }
-mutex_unlock(&(peasycap->mutex_mmap_video[0]));
-JOT(8, "first awakening on wq_video after %i waits\n", miss);
+JOM(8, "first awakening on wq_video after %i waits\n", miss);
 
 rc = field2frame(peasycap);
 if (0 != rc)
-        SAY("ERROR: field2frame() returned %i\n", rc);
-
-if (true == peasycap->offerfields) {
-        peasycap->frame_read = peasycap->frame_fill;
-        (peasycap->frame_fill)++;
-        if (peasycap->frame_buffer_many <= peasycap->frame_fill)
-                peasycap->frame_fill = 0;
-
-        if (0x01 & easycap_standard[peasycap->standard_offset].mask) {
-                peasycap->frame_buffer[peasycap->frame_read][0].kount = \
-                                                        V4L2_FIELD_BOTTOM;
-        } else {
-                peasycap->frame_buffer[peasycap->frame_read][0].kount = \
-                                                        V4L2_FIELD_TOP;
-        }
-JOT(8, "setting:    %i=peasycap->frame_read\n", peasycap->frame_read);
-JOT(8, "bumped to:  %i=peasycap->frame_fill\n", peasycap->frame_fill);
-}
+        SAM("ERROR: field2frame() returned %i\n", rc);
 /*---------------------------------------------------------------------------*/
 /*
- *  WAIT FOR FIELD 1
+ *  WAIT FOR THE OTHER FIELD
  */
 /*---------------------------------------------------------------------------*/
+if (ifield)
+        ifield = 0;
+else
+        ifield = 1;
 miss = 0;
-if (mutex_lock_interruptible(&(peasycap->mutex_mmap_video[0])))
-        return -ERESTARTSYS;
 while ((peasycap->field_read == peasycap->field_fill) || \
                                 (0 != (0xFF00 & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount)) || \
-                                (0 == (0x00FF & peasycap->field_buffer\
+                                (ifield != (0x00FF & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount))) {
-        mutex_unlock(&(peasycap->mutex_mmap_video[0]));
-
         if (mode)
                 return -EAGAIN;
 
-        JOT(8, "second wait on wq_video, " \
+        JOM(8, "second wait on wq_video, " \
                                 "%i=field_read  %i=field_fill\n", \
                                 peasycap->field_read, peasycap->field_fill);
-        msleep(1);
         if (0 != (wait_event_interruptible(peasycap->wq_video, \
                         (peasycap->video_idle || peasycap->video_eof  || \
                         ((peasycap->field_read != peasycap->field_fill) && \
                                 (0 == (0xFF00 & peasycap->field_buffer\
                                         [peasycap->field_read][0].kount)) && \
-                                (0 != (0x00FF & peasycap->field_buffer\
-                                        [peasycap->field_read][0].kount))))))){
-                SAY("aborted by signal\n");
+                                (ifield == (0x00FF & peasycap->field_buffer\
+                                        [peasycap->field_read][0].\
+                                                                kount))))))) {
+                SAM("aborted by signal\n");
                 return -EIO;
         }
         if (peasycap->video_idle) {
-                JOT(8, "%i=peasycap->video_idle\n", peasycap->video_idle);
-                return -EIO;
+                JOM(8, "%i=peasycap->video_idle ... returning -EAGAIN\n", \
+                                                        peasycap->video_idle);
+                return -EAGAIN;
         }
         if (peasycap->video_eof) {
-                JOT(8, "%i=peasycap->video_eof\n", peasycap->video_eof);
-                debrief(peasycap);
+                JOM(8, "%i=peasycap->video_eof\n", peasycap->video_eof);
+                #if defined(PERSEVERE)
+                if (1 == peasycap->status) {
+                        JOM(8, "persevering ...\n");
+                        peasycap->video_eof = 0;
+                        peasycap->audio_eof = 0;
+                        if (0 != reset(peasycap)) {
+                                JOM(8, " ... failed ... returning -EIO\n");
+                                peasycap->video_eof = 1;
+                                peasycap->audio_eof = 1;
+                                kill_video_urbs(peasycap);
+                                return -EIO;
+                        }
+                        peasycap->status = 0;
+                        JOM(8, " ... OK ... returning -EAGAIN\n");
+                        return -EAGAIN;
+                }
+                #endif /*PERSEVERE*/
+                peasycap->video_eof = 1;
+                peasycap->audio_eof = 1;
                 kill_video_urbs(peasycap);
+                JOM(8, "returning -EIO\n");
                 return -EIO;
         }
 miss++;
-if (mutex_lock_interruptible(&(peasycap->mutex_mmap_video[0])))
-        return -ERESTARTSYS;
 }
-mutex_unlock(&(peasycap->mutex_mmap_video[0]));
-JOT(8, "second awakening on wq_video after %i waits\n", miss);
+JOM(8, "second awakening on wq_video after %i waits\n", miss);
 
 rc = field2frame(peasycap);
 if (0 != rc)
-        SAY("ERROR: field2frame() returned %i\n", rc);
-
+        SAM("ERROR: field2frame() returned %i\n", rc);
+/*---------------------------------------------------------------------------*/
+/*
+ *  WASTE THIS FRAME
+*/
+/*---------------------------------------------------------------------------*/
+if (0 != peasycap->skip) {
+        peasycap->skipped++;
+        if (peasycap->skip != peasycap->skipped)
+                return peasycap->skip - peasycap->skipped;
+        peasycap->skipped = 0;
+}
+/*---------------------------------------------------------------------------*/
 peasycap->frame_read = peasycap->frame_fill;
 peasycap->queued[peasycap->frame_read] = 0;
 peasycap->done[peasycap->frame_read]   = V4L2_BUF_FLAG_DONE;
@@ -988,8 +1400,8 @@ if (0x01 & easycap_standard[peasycap->standard_offset].mask) {
                                                         V4L2_FIELD_BOTTOM;
 }
 
-JOT(8, "setting:    %i=peasycap->frame_read\n", peasycap->frame_read);
-JOT(8, "bumped to:  %i=peasycap->frame_fill\n", peasycap->frame_fill);
+JOM(8, "setting:    %i=peasycap->frame_read\n", peasycap->frame_read);
+JOM(8, "bumped to:  %i=peasycap->frame_fill\n", peasycap->frame_fill);
 
 return 0;
 }
@@ -1003,14 +1415,12 @@ return 0;
  *  odd==false IS TRANSFERRED TO THE FRAME BUFFER.
  *
  *  THE BOOLEAN PARAMETER offerfields IS true ONLY WHEN THE USER PROGRAM
- *  CHOOSES THE OPTION V4L2_FIELD_ALTERNATE.  NO USERSPACE PROGRAM TESTED
- *  TO DATE HAS DONE THIS.  BUGS ARE LIKELY.
+ *  CHOOSES THE OPTION V4L2_FIELD_INTERLACED.
  */
 /*---------------------------------------------------------------------------*/
 int
 field2frame(struct easycap *peasycap)
 {
-static struct timeval timeval0;
 struct timeval timeval;
 long long int above, below;
 __u32 remainder;
@@ -1019,16 +1429,26 @@ struct signed_div_result sdr;
 void *pex, *pad;
 int kex, kad, mex, mad, rex, rad, rad2;
 int c2, c3, w2, w3, cz, wz;
-int rc, bytesperpixel, multiplier, much, more, over, rump, caches;
+int rc, bytesperpixel, multiplier, much, more, over, rump, caches, input;
 __u8 mask, margin;
-bool odd, isuy, decimatepixel, offerfields;
+bool odd, isuy, decimatepixel, offerfields, badinput;
+
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 
-JOT(8, "=====  parity %i, field buffer %i --> frame buffer %i\n", \
+badinput = false;
+input = 0x07 & peasycap->field_buffer[peasycap->field_read][0].input;
+
+JOM(8, "=====  parity %i, input 0x%02X, field buffer %i --> " \
+                                                "frame buffer %i\n", \
                         peasycap->field_buffer[peasycap->field_read][0].kount,\
+                        peasycap->field_buffer[peasycap->field_read][0].input,\
                         peasycap->field_read, peasycap->frame_fill);
-JOT(8, "=====  %i=bytesperpixel\n", peasycap->bytesperpixel);
+JOM(8, "=====  %i=bytesperpixel\n", peasycap->bytesperpixel);
 if (true == peasycap->offerfields)
-        JOT(8, "===== offerfields\n");
+        JOM(8, "===== offerfields\n");
 
 /*---------------------------------------------------------------------------*/
 /*
@@ -1036,15 +1456,17 @@ if (true == peasycap->offerfields)
  */
 /*---------------------------------------------------------------------------*/
 if (peasycap->field_read == peasycap->field_fill) {
-        SAY("ERROR: on entry, still filling field buffer %i\n", \
+        SAM("ERROR: on entry, still filling field buffer %i\n", \
                                                         peasycap->field_read);
         return 0;
 }
 #if defined(EASYCAP_TESTCARD)
 easycap_testcard(peasycap, peasycap->field_read);
 #else
-if (0 != (0x0400 & peasycap->field_buffer[peasycap->field_read][0].kount))
-        easycap_testcard(peasycap, peasycap->field_read);
+if (0 <= input && INPUT_MANY > input) {
+        if (easycap_bars && VIDEO_LOST_TOLERATE <= peasycap->lost[input])
+                easycap_testcard(peasycap, peasycap->field_read);
+}
 #endif /*EASYCAP_TESTCARD*/
 /*---------------------------------------------------------------------------*/
 
@@ -1055,7 +1477,7 @@ decimatepixel = peasycap->decimatepixel;
 if ((2 != bytesperpixel) && \
                         (3 != bytesperpixel) && \
                         (4 != bytesperpixel)) {
-        SAY("MISTAKE: %i=bytesperpixel\n", bytesperpixel);
+        SAM("MISTAKE: %i=bytesperpixel\n", bytesperpixel);
         return -EFAULT;
 }
 if (true == decimatepixel)
@@ -1082,8 +1504,8 @@ if (peasycap->field_buffer[kex][0].kount)
 else
         odd = false;
 
-if ((true == odd) && (false == offerfields) &&(false == decimatepixel)) {
-        JOT(8, "  initial skipping    %4i          bytes p.%4i\n", \
+if ((true == odd) && (false == decimatepixel)) {
+        JOM(8, "  initial skipping    %4i          bytes p.%4i\n", \
                                                         w3/multiplier, mad);
         pad += (w3 / multiplier);  rad -= (w3 / multiplier);
 }
@@ -1108,7 +1530,7 @@ while (cz < wz) {
                         rump = 0;
 
                         if (much % 2) {
-                                SAY("MISTAKE: much is odd\n");
+                                SAM("MISTAKE: much is odd\n");
                                 return -EFAULT;
                         }
 
@@ -1116,13 +1538,11 @@ while (cz < wz) {
                                         much) / 2;
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                         if (1 < bytesperpixel) {
-                                if ((rad * \
-                                        2) < (much * \
-                                                bytesperpixel)) {
+                                if (rad * 2 < much * bytesperpixel) {
                                         /*
                                         **   INJUDICIOUS ALTERATION OF THIS
-                                        **   BLOCK WILL CAUSE BREAKAGE.
-                                        **   BEWARE.
+                                        **   STATEMENT BLOCK WILL CAUSE
+                                        **   BREAKAGE.  BEWARE.
                                         **/
                                         rad2 = rad + bytesperpixel - 1;
                                         much = ((((2 * \
@@ -1145,18 +1565,25 @@ while (cz < wz) {
                                 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                         } else {
-                                SAY("MISTAKE: %i=bytesperpixel\n", \
+                                SAM("MISTAKE: %i=bytesperpixel\n", \
                                                 bytesperpixel);
                                 return -EFAULT;
                         }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                         if (rump)
                                 caches++;
-
+                                if (true == badinput) {
+                                        JOM(8, "ERROR: 0x%02X=->field_buffer" \
+                                                "[%i][%i].input, " \
+                                                "0x%02X=(0x08|->input)\n", \
+                                                peasycap->field_buffer\
+                                                [kex][mex].input, kex, mex, \
+                                                (0x08|peasycap->input));
+                                }
                         rc = redaub(peasycap, pad, pex, much, more, \
                                                         mask, margin, isuy);
                         if (0 > rc) {
-                                SAY("ERROR: redaub() failed\n");
+                                SAM("ERROR: redaub() failed\n");
                                 return -EFAULT;
                         }
                         if (much % 4) {
@@ -1171,6 +1598,9 @@ while (cz < wz) {
                                 mex++;
                                 pex = peasycap->field_buffer[kex][mex].pgo;
                                 rex = PAGE_SIZE;
+                                if (peasycap->field_buffer[kex][mex].input != \
+                                                (0x08|peasycap->input))
+                                        badinput = true;
                         }
                         pad  += more;
                         rad -= more;
@@ -1190,7 +1620,7 @@ while (cz < wz) {
  *  UNLESS IT IS THE LAST LINE OF AN ODD FRAME
  */
 /*---------------------------------------------------------------------------*/
-                if (((false == odd) || (cz != wz))&&(false == offerfields)) {
+                if ((false == odd) || (cz != wz)) {
                         over = w3;
                         do {
                                 if (!rad) {
@@ -1224,7 +1654,7 @@ while (cz < wz) {
                         rump = 0;
 
                         if (much % 2) {
-                                SAY("MISTAKE: much is odd\n");
+                                SAM("MISTAKE: much is odd\n");
                                 return -EFAULT;
                         }
 
@@ -1232,12 +1662,11 @@ while (cz < wz) {
                                         much) / 4;
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                         if (1 < bytesperpixel) {
-                                if ((rad * 4) < (much * \
-                                                bytesperpixel)) {
+                                if (rad * 4 < much * bytesperpixel) {
                                         /*
                                         **   INJUDICIOUS ALTERATION OF THIS
-                                        **   BLOCK WILL CAUSE BREAKAGE.
-                                        **   BEWARE.
+                                        **   STATEMENT BLOCK WILL CAUSE
+                                        **   BREAKAGE.  BEWARE.
                                         **/
                                         rad2 = rad + bytesperpixel - 1;
                                         much = ((((2 * rad2)/bytesperpixel)/2)\
@@ -1261,7 +1690,7 @@ while (cz < wz) {
                                         }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                                 } else {
-                                        SAY("MISTAKE: %i=bytesperpixel\n", \
+                                        SAM("MISTAKE: %i=bytesperpixel\n", \
                                                 bytesperpixel);
                                         return -EFAULT;
                                 }
@@ -1269,10 +1698,18 @@ while (cz < wz) {
                         if (rump)
                                 caches++;
 
+                                if (true == badinput) {
+                                        JOM(8, "ERROR: 0x%02X=->field_buffer" \
+                                                "[%i][%i].input, " \
+                                                "0x%02X=(0x08|->input)\n", \
+                                                peasycap->field_buffer\
+                                                [kex][mex].input, kex, mex, \
+                                                (0x08|peasycap->input));
+                                }
                         rc = redaub(peasycap, pad, pex, much, more, \
                                                         mask, margin, isuy);
                         if (0 > rc) {
-                                SAY("ERROR: redaub() failed\n");
+                                SAM("ERROR: redaub() failed\n");
                                 return -EFAULT;
                         }
                         over -= much;   cz += much;
@@ -1281,6 +1718,9 @@ while (cz < wz) {
                                 mex++;
                                 pex = peasycap->field_buffer[kex][mex].pgo;
                                 rex = PAGE_SIZE;
+                                if (peasycap->field_buffer[kex][mex].input != \
+                                                (0x08|peasycap->input))
+                                        badinput = true;
                         }
                         pad  += more;
                         rad -= more;
@@ -1307,6 +1747,16 @@ while (cz < wz) {
                                 mex++;
                                 pex = peasycap->field_buffer[kex][mex].pgo;
                                 rex = PAGE_SIZE;
+                                if (peasycap->field_buffer[kex][mex].input != \
+                                                (0x08|peasycap->input)) {
+                                        JOM(8, "ERROR: 0x%02X=->field_buffer"\
+                                                "[%i][%i].input, " \
+                                                "0x%02X=(0x08|->input)\n", \
+                                                peasycap->field_buffer\
+                                                [kex][mex].input, kex, mex, \
+                                                (0x08|peasycap->input));
+                                        badinput = true;
+                                }
                         }
                         much = over;
                         if (rex < much)
@@ -1325,39 +1775,39 @@ while (cz < wz) {
 /*---------------------------------------------------------------------------*/
 c2 = (mex + 1)*PAGE_SIZE - rex;
 if (cz != c2)
-        SAY("ERROR: discrepancy %i in bytes read\n", c2 - cz);
+        SAM("ERROR: discrepancy %i in bytes read\n", c2 - cz);
 c3 = (mad + 1)*PAGE_SIZE - rad;
 
 if (false == decimatepixel) {
         if (bytesperpixel * \
                 cz != c3) \
-                SAY("ERROR: discrepancy %i in bytes written\n", \
+                SAM("ERROR: discrepancy %i in bytes written\n", \
                                                 c3 - (bytesperpixel * \
                                                                         cz));
 } else {
         if (false == odd) {
                 if (bytesperpixel * \
                         cz != (4 * c3))
-                        SAY("ERROR: discrepancy %i in bytes written\n", \
+                        SAM("ERROR: discrepancy %i in bytes written\n", \
                                                 (2*c3)-(bytesperpixel * \
                                                                         cz));
                 } else {
                         if (0 != c3)
-                                SAY("ERROR: discrepancy %i " \
+                                SAM("ERROR: discrepancy %i " \
                                                 "in bytes written\n", c3);
                 }
 }
 if (rump)
-        SAY("ERROR: undischarged cache at end of line in frame buffer\n");
+        SAM("WORRY: undischarged cache at end of line in frame buffer\n");
 
-JOT(8, "===== field2frame(): %i bytes --> %i bytes (incl skip)\n", c2, c3);
-JOT(8, "===== field2frame(): %i=mad  %i=rad\n", mad, rad);
+JOM(8, "===== field2frame(): %i bytes --> %i bytes (incl skip)\n", c2, c3);
+JOM(8, "===== field2frame(): %i=mad  %i=rad\n", mad, rad);
 
 if (true == odd)
-        JOT(8, "+++++ field2frame():  frame buffer %i is full\n", kad);
+        JOM(8, "+++++ field2frame():  frame buffer %i is full\n", kad);
 
 if (peasycap->field_read == peasycap->field_fill)
-        SAY("WARNING: on exit, filling field buffer %i\n", \
+        SAM("WARNING: on exit, filling field buffer %i\n", \
                                                         peasycap->field_read);
 /*---------------------------------------------------------------------------*/
 /*
@@ -1365,23 +1815,24 @@ if (peasycap->field_read == peasycap->field_fill)
  */
 /*---------------------------------------------------------------------------*/
 do_gettimeofday(&timeval);
-if (timeval0.tv_sec) {
+if (peasycap->timeval6.tv_sec) {
         below = ((long long int)(1000000)) * \
-                ((long long int)(timeval.tv_sec  - timeval0.tv_sec)) + \
-                         (long long int)(timeval.tv_usec - timeval0.tv_usec);
+                ((long long int)(timeval.tv_sec - \
+                                        peasycap->timeval6.tv_sec)) + \
+                 (long long int)(timeval.tv_usec - peasycap->timeval6.tv_usec);
         above = (long long int)1000000;
 
         sdr = signed_div(above, below);
         above = sdr.quotient;
         remainder = (__u32)sdr.remainder;
 
-        JOT(8, "video streaming at %3lli.%03i fields per second\n", above, \
+        JOM(8, "video streaming at %3lli.%03i fields per second\n", above, \
                                                         (remainder/1000));
 }
-timeval0 = timeval;
+peasycap->timeval6 = timeval;
 
 if (caches)
-        JOT(8, "%i=caches\n", caches);
+        JOM(8, "%i=caches\n", caches);
 return 0;
 }
 /*****************************************************************************/
@@ -1434,7 +1885,7 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more, \
                                         __u8 mask, __u8 margin, bool isuy)
 {
 static __s32 ay[256], bu[256], rv[256], gu[256], gv[256];
-static __u8 cache[8], *pcache;
+__u8 *pcache;
 __u8 r, g, b, y, u, v, c, *p2, *p3, *pz, *pr;
 int  bytesperpixel;
 bool byteswaporder, decimatepixel, last;
@@ -1442,7 +1893,7 @@ int j, rump;
 __s32 s32;
 
 if (much % 2) {
-        SAY("MISTAKE: much is odd\n");
+        SAM("MISTAKE: much is odd\n");
         return -EFAULT;
 }
 bytesperpixel = peasycap->bytesperpixel;
@@ -1475,30 +1926,31 @@ if (!bu[255]) {
                 ay[j] = ay[16];
         for (j = 236; j < 256; j++)
                 ay[j] = ay[235];
-        JOT(8, "lookup tables are prepared\n");
+        JOM(8, "lookup tables are prepared\n");
 }
-if ((__u8 *)NULL == pcache)
-        pcache = &cache[0];
+pcache = peasycap->pcache;
+if (NULL == pcache)
+        pcache = &peasycap->cache[0];
 /*---------------------------------------------------------------------------*/
 /*
  *  TRANSFER CONTENTS OF CACHE TO THE FRAME BUFFER
  */
 /*---------------------------------------------------------------------------*/
 if (!pcache) {
-        SAY("MISTAKE: pcache is NULL\n");
+        SAM("MISTAKE: pcache is NULL\n");
         return -EFAULT;
 }
 
-if (pcache != &cache[0])
-        JOT(16, "cache has %i bytes\n", (int)(pcache - &cache[0]));
-p2 = &cache[0];
-p3 = (__u8 *)pad - (int)(pcache - &cache[0]);
+if (pcache != &peasycap->cache[0])
+        JOM(16, "cache has %i bytes\n", (int)(pcache - &peasycap->cache[0]));
+p2 = &peasycap->cache[0];
+p3 = (__u8 *)pad - (int)(pcache - &peasycap->cache[0]);
 while (p2 < pcache) {
         *p3++ = *p2;  p2++;
 }
-pcache = &cache[0];
+pcache = &peasycap->cache[0];
 if (p3 != pad) {
-        SAY("MISTAKE: pointer misalignment\n");
+        SAM("MISTAKE: pointer misalignment\n");
         return -EFAULT;
 }
 /*---------------------------------------------------------------------------*/
@@ -1513,7 +1965,7 @@ else
         v = *(p2 - 1);
 
 if (rump)
-        JOT(16, "%4i=much  %4i=more  %i=rump\n", much, more, rump);
+        JOM(16, "%4i=much  %4i=more  %i=rump\n", much, more, rump);
 
 /*---------------------------------------------------------------------------*/
 switch (bytesperpixel) {
@@ -1619,7 +2071,7 @@ case 3:
                                                         0 : (__u8)s32);
 
                                 if ((true == last) && rump) {
-                                        pcache = &cache[0];
+                                        pcache = &peasycap->cache[0];
                                         switch (bytesperpixel - rump) {
                                         case 1: {
                                                 *p3 = r;
@@ -1634,7 +2086,7 @@ case 3:
                                                 break;
                                         }
                                         default: {
-                                                SAY("MISTAKE: %i=rump\n", \
+                                                SAM("MISTAKE: %i=rump\n", \
                                                         bytesperpixel - rump);
                                                 return -EFAULT;
                                         }
@@ -1692,7 +2144,7 @@ case 3:
                                                                 0 : (__u8)s32);
 
                                 if ((true == last) && rump) {
-                                        pcache = &cache[0];
+                                        pcache = &peasycap->cache[0];
                                         switch (bytesperpixel - rump) {
                                         case 1: {
                                                 *p3 = b;
@@ -1707,7 +2159,7 @@ case 3:
                                                 break;
                                         }
                                         default: {
-                                                SAY("MISTAKE: %i=rump\n", \
+                                                SAM("MISTAKE: %i=rump\n", \
                                                         bytesperpixel - rump);
                                                 return -EFAULT;
                                         }
@@ -1768,7 +2220,7 @@ case 3:
                                                                 0 : (__u8)s32);
 
                                         if ((true == last) && rump) {
-                                                pcache = &cache[0];
+                                                pcache = &peasycap->cache[0];
                                                 switch (bytesperpixel - rump) {
                                                 case 1: {
                                                         *p3 = r;
@@ -1783,7 +2235,7 @@ case 3:
                                                         break;
                                                 }
                                                 default: {
-                                                        SAY("MISTAKE: " \
+                                                        SAM("MISTAKE: " \
                                                         "%i=rump\n", \
                                                         bytesperpixel - rump);
                                                         return -EFAULT;
@@ -1844,7 +2296,7 @@ case 3:
                                                                 0 : (__u8)s32);
 
                                         if ((true == last) && rump) {
-                                                pcache = &cache[0];
+                                                pcache = &peasycap->cache[0];
                                                 switch (bytesperpixel - rump) {
                                                 case 1: {
                                                         *p3 = b;
@@ -1859,7 +2311,7 @@ case 3:
                                                         break;
                                                 }
                                                 default: {
-                                                        SAY("MISTAKE: " \
+                                                        SAM("MISTAKE: " \
                                                         "%i=rump\n", \
                                                         bytesperpixel - rump);
                                                         return -EFAULT;
@@ -1924,7 +2376,7 @@ case 4:
                                                                 0 : (__u8)s32);
 
                                 if ((true == last) && rump) {
-                                        pcache = &cache[0];
+                                        pcache = &peasycap->cache[0];
                                         switch (bytesperpixel - rump) {
                                         case 1: {
                                                 *p3 = r;
@@ -1948,7 +2400,7 @@ case 4:
                                                 break;
                                         }
                                         default: {
-                                                SAY("MISTAKE: %i=rump\n", \
+                                                SAM("MISTAKE: %i=rump\n", \
                                                         bytesperpixel - rump);
                                                 return -EFAULT;
                                         }
@@ -2006,7 +2458,7 @@ case 4:
                                                                 0 : (__u8)s32);
 
                                 if ((true == last) && rump) {
-                                        pcache = &cache[0];
+                                        pcache = &peasycap->cache[0];
                                         switch (bytesperpixel - rump) {
                                         case 1: {
                                                 *p3 = b;
@@ -2030,7 +2482,7 @@ case 4:
                                                 break;
                                         }
                                         default: {
-                                                SAY("MISTAKE: %i=rump\n", \
+                                                SAM("MISTAKE: %i=rump\n", \
                                                         bytesperpixel - rump);
                                                 return -EFAULT;
                                         }
@@ -2093,7 +2545,7 @@ case 4:
                                                                 0 : (__u8)s32);
 
                                         if ((true == last) && rump) {
-                                                pcache = &cache[0];
+                                                pcache = &peasycap->cache[0];
                                                 switch (bytesperpixel - rump) {
                                                 case 1: {
                                                         *p3 = r;
@@ -2117,7 +2569,7 @@ case 4:
                                                         break;
                                                 }
                                                 default: {
-                                                        SAY("MISTAKE: " \
+                                                        SAM("MISTAKE: " \
                                                         "%i=rump\n", \
                                                         bytesperpixel - \
                                                         rump);
@@ -2178,7 +2630,7 @@ case 4:
                                                                 0 : (__u8)s32);
 
                                         if ((true == last) && rump) {
-                                                pcache = &cache[0];
+                                                pcache = &peasycap->cache[0];
                                                 switch (bytesperpixel - rump) {
                                                 case 1: {
                                                         *p3 = b;
@@ -2202,7 +2654,7 @@ case 4:
                                                         break;
                                                 }
                                                 default: {
-                                                        SAY("MISTAKE: " \
+                                                        SAM("MISTAKE: " \
                                                         "%i=rump\n", \
                                                         bytesperpixel - rump);
                                                         return -EFAULT;
@@ -2226,48 +2678,13 @@ case 4:
         break;
         }
 default: {
-        SAY("MISTAKE: %i=bytesperpixel\n", bytesperpixel);
+        SAM("MISTAKE: %i=bytesperpixel\n", bytesperpixel);
         return -EFAULT;
         }
 }
 return 0;
 }
 /*****************************************************************************/
-void
-debrief(struct easycap *peasycap)
-{
-if ((struct usb_device *)NULL != peasycap->pusb_device) {
-        check_stk(peasycap->pusb_device);
-        check_saa(peasycap->pusb_device);
-        sayreadonly(peasycap);
-        SAY("%i=peasycap->field_fill\n", peasycap->field_fill);
-        SAY("%i=peasycap->field_read\n", peasycap->field_read);
-        SAY("%i=peasycap->frame_fill\n", peasycap->frame_fill);
-        SAY("%i=peasycap->frame_read\n", peasycap->frame_read);
-}
-return;
-}
-/*****************************************************************************/
-void
-sayreadonly(struct easycap *peasycap)
-{
-static int done;
-int got00, got1F, got60, got61, got62;
-
-if ((!done) && ((struct usb_device *)NULL != peasycap->pusb_device)) {
-        done = 1;
-        got00 = read_saa(peasycap->pusb_device, 0x00);
-        got1F = read_saa(peasycap->pusb_device, 0x1F);
-        got60 = read_saa(peasycap->pusb_device, 0x60);
-        got61 = read_saa(peasycap->pusb_device, 0x61);
-        got62 = read_saa(peasycap->pusb_device, 0x62);
-        SAY("0x%02X=reg0x00  0x%02X=reg0x1F\n", got00, got1F);
-        SAY("0x%02X=reg0x60  0x%02X=reg0x61  0x%02X=reg0x62\n", \
-                                                        got60, got61, got62);
-}
-return;
-}
-/*****************************************************************************/
 /*---------------------------------------------------------------------------*/
 /*
  *  SEE CORBET ET AL. "LINUX DEVICE DRIVERS", 3rd EDITION, PAGES 430-434
@@ -2292,11 +2709,16 @@ easycap_vma_open(struct vm_area_struct *pvma)
 struct easycap *peasycap;
 
 peasycap = pvma->vm_private_data;
-if (NULL != peasycap)
-        peasycap->vma_many++;
-
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return;
+}
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return;
+}
+peasycap->vma_many++;
 JOT(8, "%i=peasycap->vma_many\n", peasycap->vma_many);
-
 return;
 }
 /*****************************************************************************/
@@ -2306,10 +2728,16 @@ easycap_vma_close(struct vm_area_struct *pvma)
 struct easycap *peasycap;
 
 peasycap = pvma->vm_private_data;
-if (NULL != peasycap) {
-        peasycap->vma_many--;
-        JOT(8, "%i=peasycap->vma_many\n", peasycap->vma_many);
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return;
+}
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return;
 }
+peasycap->vma_many--;
+JOT(8, "%i=peasycap->vma_many\n", peasycap->vma_many);
 return;
 }
 /*****************************************************************************/
@@ -2355,24 +2783,22 @@ if (NULL == peasycap) {
         SAY("ERROR: peasycap is NULL\n");
         return retcode;
 }
-mutex_lock(&(peasycap->mutex_mmap_video[0]));
 /*---------------------------------------------------------------------------*/
 pbuf = peasycap->frame_buffer[k][m].pgo;
 if (NULL == pbuf) {
-        SAY("ERROR:  pbuf is NULL\n");
+        SAM("ERROR:  pbuf is NULL\n");
         goto finish;
 }
 page = virt_to_page(pbuf);
 if (NULL == page) {
-        SAY("ERROR:  page is NULL\n");
+        SAM("ERROR:  page is NULL\n");
         goto finish;
 }
 get_page(page);
 /*---------------------------------------------------------------------------*/
 finish:
-mutex_unlock(&(peasycap->mutex_mmap_video[0]));
 if (NULL == page) {
-        SAY("ERROR:  page is NULL after get_page(page)\n");
+        SAM("ERROR:  page is NULL after get_page(page)\n");
 } else {
         pvmf->page = page;
         retcode = VM_FAULT_MINOR;
@@ -2383,7 +2809,7 @@ return retcode;
 /*---------------------------------------------------------------------------*/
 /*
  *  ON COMPLETION OF A VIDEO URB ITS DATA IS COPIED TO THE FIELD BUFFERS
- *  PROVIDED peasycap->video_idle IS ZER0.  REGARDLESS OF THIS BEING TRUE,
+ *  PROVIDED peasycap->video_idle IS ZERO.  REGARDLESS OF THIS BEING TRUE,
  *  IT IS RESUBMITTED PROVIDED peasycap->video_isoc_streaming IS NOT ZERO.
  *
  *  THIS FUNCTION IS AN INTERRUPT SERVICE ROUTINE AND MUST NOT SLEEP.
@@ -2400,7 +2826,8 @@ return retcode;
  *      0 != (kount & 0x8000)   => AT LEAST ONE URB COMPLETED WITH ERRORS
  *      0 != (kount & 0x4000)   => BUFFER HAS TOO MUCH DATA
  *      0 != (kount & 0x2000)   => BUFFER HAS NOT ENOUGH DATA
- *      0 != (kount & 0x0400)   => FIELD WAS SUBMITTED BY BRIDGER ROUTINE
+ *      0 != (kount & 0x1000)   => BUFFER HAS DATA FROM DISPARATE INPUTS
+ *      0 != (kount & 0x0400)   => RESERVED
  *      0 != (kount & 0x0200)   => FIELD BUFFER NOT YET CHECKED
  *      0 != (kount & 0x0100)   => BUFFER HAS TWO EXTRA BYTES - WHY?
  */
@@ -2408,19 +2835,14 @@ return retcode;
 void
 easycap_complete(struct urb *purb)
 {
-static int mt;
 struct easycap *peasycap;
 struct data_buffer *pfield_buffer;
 char errbuf[16];
 int i, more, much, leap, rc, last;
 int videofieldamount;
-unsigned int override;
+unsigned int override, bad;
 int framestatus, framelength, frameactual, frameoffset;
 __u8 *pu;
-#if defined(BRIDGER)
-struct timeval timeval;
-long long usec;
-#endif /*BRIDGER*/
 
 if (NULL == purb) {
         SAY("ERROR: easycap_complete(): purb is NULL\n");
@@ -2431,74 +2853,78 @@ if (NULL == peasycap) {
         SAY("ERROR: easycap_complete(): peasycap is NULL\n");
         return;
 }
-
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return;
+}
 if (peasycap->video_eof)
         return;
-
 for (i = 0; i < VIDEO_ISOC_BUFFER_MANY; i++)
         if (purb->transfer_buffer == peasycap->video_isoc_buffer[i].pgo)
                 break;
-JOT(16, "%2i=urb\n", i);
+JOM(16, "%2i=urb\n", i);
 last = peasycap->video_isoc_sequence;
 if ((((VIDEO_ISOC_BUFFER_MANY - 1) == last) && \
                                                 (0 != i)) || \
         (((VIDEO_ISOC_BUFFER_MANY - 1) != last) && \
                                                 ((last + 1) != i))) {
-        SAY("ERROR: out-of-order urbs %i,%i ... continuing\n", last, i);
+        JOM(16, "ERROR: out-of-order urbs %i,%i ... continuing\n", last, i);
 }
 peasycap->video_isoc_sequence = i;
 
 if (peasycap->video_idle) {
-        JOT(16, "%i=video_idle  %i=video_isoc_streaming\n", \
+        JOM(16, "%i=video_idle  %i=video_isoc_streaming\n", \
                         peasycap->video_idle, peasycap->video_isoc_streaming);
         if (peasycap->video_isoc_streaming) {
                 rc = usb_submit_urb(purb, GFP_ATOMIC);
                 if (0 != rc) {
-                        SAY("ERROR: while %i=video_idle, " \
-                                        "usb_submit_urb() failed with rc:\n", \
-                                                        peasycap->video_idle);
                         switch (rc) {
                         case -ENOMEM: {
-                                SAY("ENOMEM\n");
+                                SAM("ENOMEM\n");
                                 break;
                         }
                         case -ENODEV: {
-                                SAY("ENODEV\n");
+                                SAM("ENODEV\n");
                                 break;
                         }
                         case -ENXIO: {
-                                SAY("ENXIO\n");
+                                SAM("ENXIO\n");
                                 break;
                         }
                         case -EINVAL: {
-                                SAY("EINVAL\n");
+                                SAM("EINVAL\n");
                                 break;
                         }
                         case -EAGAIN: {
-                                SAY("EAGAIN\n");
+                                SAM("EAGAIN\n");
                                 break;
                         }
                         case -EFBIG: {
-                                SAY("EFBIG\n");
+                                SAM("EFBIG\n");
                                 break;
                         }
                         case -EPIPE: {
-                                SAY("EPIPE\n");
+                                SAM("EPIPE\n");
                                 break;
                         }
                         case -EMSGSIZE: {
-                                SAY("EMSGSIZE\n");
+                                SAM("EMSGSIZE\n");
                                 break;
                         }
                         case -ENOSPC: {
-                                SAY("ENOSPC\n");
+                                SAM("ENOSPC\n");
                                 break;
                         }
                         default: {
-                                SAY("0x%08X\n", rc);
+                                SAM("0x%08X\n", rc);
                                 break;
                         }
                         }
+                        if (-ENODEV != rc) \
+                                SAM("ERROR: while %i=video_idle, " \
+                                                        "usb_submit_urb() " \
+                                                        "failed with rc:\n", \
+                                                        peasycap->video_idle);
                 }
         }
 return;
@@ -2506,80 +2932,80 @@ return;
 override = 0;
 /*---------------------------------------------------------------------------*/
 if (FIELD_BUFFER_MANY <= peasycap->field_fill) {
-        SAY("ERROR: bad peasycap->field_fill\n");
+        SAM("ERROR: bad peasycap->field_fill\n");
         return;
 }
 if (purb->status) {
         if ((-ESHUTDOWN == purb->status) || (-ENOENT == purb->status)) {
-                JOT(8, "urb status -ESHUTDOWN or -ENOENT\n");
+                JOM(8, "urb status -ESHUTDOWN or -ENOENT\n");
                 return;
         }
 
         (peasycap->field_buffer[peasycap->field_fill][0].kount) |= 0x8000 ;
-        SAY("ERROR: bad urb status:\n");
+        SAM("ERROR: bad urb status:\n");
         switch (purb->status) {
         case -EINPROGRESS: {
-                SAY("-EINPROGRESS\n"); break;
+                SAM("-EINPROGRESS\n"); break;
         }
         case -ENOSR: {
-                SAY("-ENOSR\n"); break;
+                SAM("-ENOSR\n"); break;
         }
         case -EPIPE: {
-                SAY("-EPIPE\n"); break;
+                SAM("-EPIPE\n"); break;
         }
         case -EOVERFLOW: {
-                SAY("-EOVERFLOW\n"); break;
+                SAM("-EOVERFLOW\n"); break;
         }
         case -EPROTO: {
-                SAY("-EPROTO\n"); break;
+                SAM("-EPROTO\n"); break;
         }
         case -EILSEQ: {
-                SAY("-EILSEQ\n"); break;
+                SAM("-EILSEQ\n"); break;
         }
         case -ETIMEDOUT: {
-                SAY("-ETIMEDOUT\n"); break;
+                SAM("-ETIMEDOUT\n"); break;
         }
         case -EMSGSIZE: {
-                SAY("-EMSGSIZE\n"); break;
+                SAM("-EMSGSIZE\n"); break;
         }
         case -EOPNOTSUPP: {
-                SAY("-EOPNOTSUPP\n"); break;
+                SAM("-EOPNOTSUPP\n"); break;
         }
         case -EPFNOSUPPORT: {
-                SAY("-EPFNOSUPPORT\n"); break;
+                SAM("-EPFNOSUPPORT\n"); break;
         }
         case -EAFNOSUPPORT: {
-                SAY("-EAFNOSUPPORT\n"); break;
+                SAM("-EAFNOSUPPORT\n"); break;
         }
         case -EADDRINUSE: {
-                SAY("-EADDRINUSE\n"); break;
+                SAM("-EADDRINUSE\n"); break;
         }
         case -EADDRNOTAVAIL: {
-                SAY("-EADDRNOTAVAIL\n"); break;
+                SAM("-EADDRNOTAVAIL\n"); break;
         }
         case -ENOBUFS: {
-                SAY("-ENOBUFS\n"); break;
+                SAM("-ENOBUFS\n"); break;
         }
         case -EISCONN: {
-                SAY("-EISCONN\n"); break;
+                SAM("-EISCONN\n"); break;
         }
         case -ENOTCONN: {
-                SAY("-ENOTCONN\n"); break;
+                SAM("-ENOTCONN\n"); break;
         }
         case -ESHUTDOWN: {
-                SAY("-ESHUTDOWN\n"); break;
+                SAM("-ESHUTDOWN\n"); break;
         }
         case -ENOENT: {
-                SAY("-ENOENT\n"); break;
+                SAM("-ENOENT\n"); break;
         }
         case -ECONNRESET: {
-                SAY("-ECONNRESET\n"); break;
+                SAM("-ECONNRESET\n"); break;
         }
         case -ENOSPC: {
-                SAY("ENOSPC\n"); break;
+                SAM("ENOSPC\n"); break;
         }
         default: {
-                SAY("unknown error code 0x%08X\n", purb->status); break;
+                SAM("unknown error code 0x%08X\n", purb->status); break;
         }
         }
 /*---------------------------------------------------------------------------*/
@@ -2638,7 +3064,7 @@ if (purb->status) {
                                 strcpy(&errbuf[0], "-ECONNRESET"); break;
                         }
                         case -ENOSPC: {
-                                SAY("ENOSPC\n"); break;
+                                SAM("ENOSPC\n"); break;
                         }
                         case -ESHUTDOWN: {
                                 strcpy(&errbuf[0], "-ESHUTDOWN"); break;
@@ -2653,7 +3079,7 @@ if (purb->status) {
                 frameactual = purb->iso_frame_desc[i].actual_length;
                 frameoffset = purb->iso_frame_desc[i].offset;
 
-                JOT(16, "frame[%2i]:" \
+                JOM(16, "frame[%2i]:" \
                                 "%4i=status "  \
                                 "%4i=actual "  \
                                 "%4i=length "  \
@@ -2667,19 +3093,20 @@ if (purb->status) {
                                 PAGE_SIZE) + \
                                 (int)(pfield_buffer->pto - pfield_buffer->pgo);
                 if (4 == more)
-                        mt++;
+                        peasycap->video_mt++;
                 if (4 < more) {
-                        if (mt) {
-                                JOT(8, "%4i empty video urb frames\n", mt);
-                                mt = 0;
+                        if (peasycap->video_mt) {
+                                JOM(8, "%4i empty video urb frames\n", \
+                                                        peasycap->video_mt);
+                                peasycap->video_mt = 0;
                         }
                         if (FIELD_BUFFER_MANY <= peasycap->field_fill) {
-                                SAY("ERROR: bad peasycap->field_fill\n");
+                                SAM("ERROR: bad peasycap->field_fill\n");
                                 return;
                         }
                         if (FIELD_BUFFER_SIZE/PAGE_SIZE <= \
                                                         peasycap->field_page) {
-                                SAY("ERROR: bad peasycap->field_page\n");
+                                SAM("ERROR: bad peasycap->field_page\n");
                                 return;
                         }
                         pfield_buffer = &peasycap->field_buffer\
@@ -2712,11 +3139,13 @@ if (purb->status) {
                                                 peasycap->videofieldamount) {
                                         if (2 == videofieldamount - \
                                                         peasycap->\
-                                                        videofieldamount)
+                                                        videofieldamount) {
                                                 (peasycap->field_buffer\
                                                 [peasycap->field_fill]\
                                                         [0].kount) |= 0x0100;
-                                        else
+                                                peasycap->video_junk += (1 + \
+                                                        VIDEO_JUNK_TOLERATE);
+                                        } else
                                                 (peasycap->field_buffer\
                                                 [peasycap->field_fill]\
                                                         [0].kount) |= 0x4000;
@@ -2727,53 +3156,74 @@ if (purb->status) {
                                                 [peasycap->field_fill]\
                                                         [0].kount) |= 0x2000;
                                         }
-                                if (!(0xFF00 & peasycap->field_buffer\
+                                        bad = 0xFF00 & peasycap->field_buffer\
                                                 [peasycap->field_fill]\
-                                                [0].kount)) {
-                                        (peasycap->video_junk)--;
-                                        if (-16 > peasycap->video_junk)
-                                                peasycap->video_junk = -16;
-                                        peasycap->field_read = \
+                                                [0].kount;
+                                        if (!bad) {
+                                                (peasycap->video_junk)--;
+                                                if (-VIDEO_JUNK_TOLERATE > \
+                                                        peasycap->video_junk) \
+                                                        peasycap->video_junk =\
+                                                        -VIDEO_JUNK_TOLERATE;
+                                                peasycap->field_read = \
                                                         (peasycap->\
                                                                 field_fill)++;
-
-                                        if (FIELD_BUFFER_MANY <= \
-                                                peasycap->field_fill)
-                                                peasycap->field_fill = 0;
-                                        peasycap->field_page = 0;
-                                        pfield_buffer = &peasycap->\
-                                                field_buffer\
-                                                [peasycap->field_fill]\
-                                                [peasycap->field_page];
-                                        pfield_buffer->pto = \
+                                                if (FIELD_BUFFER_MANY <= \
+                                                                peasycap->\
+                                                                field_fill)
+                                                        peasycap->\
+                                                                field_fill = 0;
+                                                peasycap->field_page = 0;
+                                                pfield_buffer = &peasycap->\
+                                                        field_buffer\
+                                                        [peasycap->\
+                                                        field_fill]\
+                                                        [peasycap->\
+                                                        field_page];
+                                                pfield_buffer->pto = \
                                                         pfield_buffer->pgo;
-
-                                        JOT(8, "bumped to: %i=peasycap->" \
-                                                "field_fill  %i=parity\n", \
-                                                peasycap->field_fill, \
-                                                0x00FF & pfield_buffer->kount);
-                                        JOT(8, "field buffer %i has %i " \
-                                                "bytes fit to be read\n", \
-                                                peasycap->field_read, \
-                                                videofieldamount);
-                                        JOT(8, "wakeup call to wq_video, " \
-                                                "%i=field_read %i=field_fill "\
-                                                "%i=parity\n", \
-                                                peasycap->field_read, \
-                                                peasycap->field_fill, \
-                                                0x00FF & peasycap->\
-                                                field_buffer[peasycap->\
-                                                field_read][0].kount);
-                                        wake_up_interruptible(&(peasycap->\
-                                                                wq_video));
-                                        do_gettimeofday(&peasycap->timeval7);
+                                                JOM(8, "bumped to: %i="\
+                                                        "peasycap->" \
+                                                        "field_fill  %i="\
+                                                        "parity\n", \
+                                                        peasycap->field_fill, \
+                                                        0x00FF & \
+                                                        pfield_buffer->kount);
+                                                JOM(8, "field buffer %i has "\
+                                                        "%i bytes fit to be "\
+                                                        "read\n", \
+                                                        peasycap->field_read, \
+                                                        videofieldamount);
+                                                JOM(8, "wakeup call to "\
+                                                        "wq_video, " \
+                                                        "%i=field_read "\
+                                                        "%i=field_fill "\
+                                                        "%i=parity\n", \
+                                                        peasycap->field_read, \
+                                                        peasycap->field_fill, \
+                                                        0x00FF & peasycap->\
+                                                        field_buffer\
+                                                        [peasycap->\
+                                                        field_read][0].kount);
+                                                wake_up_interruptible\
+                                                        (&(peasycap->\
+                                                                 wq_video));
+                                                do_gettimeofday\
+                                                        (&peasycap->timeval7);
                                         } else {
                                         peasycap->video_junk++;
-                                        JOT(8, "field buffer %i had %i " \
-                                                "bytes, now discarded\n", \
+                                        if (bad & 0x0010) \
+                                                peasycap->video_junk += \
+                                                (1 + VIDEO_JUNK_TOLERATE/2);
+                                        JOM(8, "field buffer %i had %i " \
+                                                "bytes, now discarded: "\
+                                                "0x%04X\n", \
                                                 peasycap->field_fill, \
-                                                videofieldamount);
-
+                                                videofieldamount,\
+                                                (0xFF00 & \
+                                                peasycap->field_buffer\
+                                                [peasycap->field_fill][0].\
+                                                kount));
                                         (peasycap->field_fill)++;
 
                                         if (FIELD_BUFFER_MANY <= \
@@ -2787,20 +3237,22 @@ if (purb->status) {
                                         pfield_buffer->pto = \
                                                         pfield_buffer->pgo;
 
-                                        JOT(8, "bumped to: %i=peasycap->" \
+                                        JOM(8, "bumped to: %i=peasycap->" \
                                                 "field_fill  %i=parity\n", \
                                                 peasycap->field_fill, \
                                                 0x00FF & pfield_buffer->kount);
                                 }
                                 if (8 == more) {
-                                        JOT(8, "end-of-field: received " \
+                                        JOM(8, "end-of-field: received " \
                                                 "parity byte 0x%02X\n", \
                                                 (0xFF & *pu));
                                         if (0x40 & *pu)
                                                 pfield_buffer->kount = 0x0000;
                                         else
                                                 pfield_buffer->kount = 0x0001;
-                                        JOT(8, "end-of-field: 0x%02X=kount\n",\
+                                        pfield_buffer->input = 0x08 | \
+                                                (0x07 & peasycap->input);
+                                        JOM(8, "end-of-field: 0x%02X=kount\n",\
                                                 0xFF & pfield_buffer->kount);
                                 }
                         }
@@ -2813,12 +3265,12 @@ if (purb->status) {
                         more -= leap;
 
                         if (FIELD_BUFFER_MANY <= peasycap->field_fill) {
-                                SAY("ERROR: bad peasycap->field_fill\n");
+                                SAM("ERROR: bad peasycap->field_fill\n");
                                 return;
                         }
                         if (FIELD_BUFFER_SIZE/PAGE_SIZE <= \
                                                         peasycap->field_page) {
-                                SAY("ERROR: bad peasycap->field_page\n");
+                                SAM("ERROR: bad peasycap->field_page\n");
                                 return;
                         }
                         pfield_buffer = &peasycap->field_buffer\
@@ -2829,7 +3281,7 @@ if (purb->status) {
                                                 [peasycap->field_page];
                                 if (PAGE_SIZE < (pfield_buffer->pto - \
                                                         pfield_buffer->pgo)) {
-                                        SAY("ERROR: bad pfield_buffer->pto\n");
+                                        SAM("ERROR: bad pfield_buffer->pto\n");
                                         return;
                                 }
                                 if (PAGE_SIZE == (pfield_buffer->pto - \
@@ -2837,7 +3289,7 @@ if (purb->status) {
                                         (peasycap->field_page)++;
                                         if (FIELD_BUFFER_SIZE/PAGE_SIZE <= \
                                                         peasycap->field_page) {
-                                                JOT(16, "wrapping peasycap->" \
+                                                JOM(16, "wrapping peasycap->" \
                                                         "field_page\n");
                                                 peasycap->field_page = 0;
                                         }
@@ -2847,6 +3299,15 @@ if (purb->status) {
                                                         [peasycap->field_page];
                                         pfield_buffer->pto = \
                                                         pfield_buffer->pgo;
+                                        pfield_buffer->input = 0x08 | \
+                                                (0x07 & peasycap->input);
+                                        if ((peasycap->field_buffer[peasycap->\
+                                                        field_fill][0]).\
+                                                                input != \
+                                                        pfield_buffer->input)
+                                                (peasycap->field_buffer\
+                                                        [peasycap->field_fill]\
+                                                        [0]).kount |= 0x1000;
                                 }
 
                                 much = PAGE_SIZE - (int)(pfield_buffer->pto - \
@@ -2865,55 +3326,6 @@ if (purb->status) {
 }
 /*---------------------------------------------------------------------------*/
 /*
- *
- *
- *             *** UNDER DEVELOPMENT/TESTING - NOT READY YET! ***
- *
- *
- *
- *  VIDEOTAPES MAY HAVE BEEN MANUALLY PAUSED AND RESTARTED DURING RECORDING.
- *  THIS CAUSES LOSS OF SYNC, CONFUSING DOWNSTREAM USERSPACE PROGRAMS WHICH
- *  MAY INTERPRET THE INTERRUPTION AS A SYMPTOM OF LATENCY.  TO OVERCOME THIS
- *  THE DRIVER BRIDGES THE HIATUS BY SENDING DUMMY VIDEO FRAMES AT ROUGHLY
- *  THE RIGHT TIME INTERVALS IN THE HOPE OF PERSUADING THE DOWNSTREAM USERSPACE
- *  PROGRAM TO RESUME NORMAL SERVICE WHEN THE INTERRUPTION IS OVER.
- */
-/*---------------------------------------------------------------------------*/
-#if defined(BRIDGER)
-do_gettimeofday(&timeval);
-if (peasycap->timeval7.tv_sec) {
-        usec = 1000000*(timeval.tv_sec  - peasycap->timeval7.tv_sec) + \
-                        (timeval.tv_usec - peasycap->timeval7.tv_usec);
-        if (usec > (peasycap->usec + peasycap->tolerate)) {
-                JOT(8, "bridging hiatus\n");
-                peasycap->video_junk = 0;
-                peasycap->field_buffer[peasycap->field_fill][0].kount |= 0x0400;
-
-                peasycap->field_read = (peasycap->field_fill)++;
-
-                if (FIELD_BUFFER_MANY <= peasycap->field_fill) \
-                                                peasycap->field_fill = 0;
-                peasycap->field_page = 0;
-                pfield_buffer = &peasycap->field_buffer\
-                                [peasycap->field_fill][peasycap->field_page];
-                pfield_buffer->pto = pfield_buffer->pgo;
-
-                JOT(8, "bumped to: %i=peasycap->field_fill  %i=parity\n", \
-                        peasycap->field_fill, 0x00FF & pfield_buffer->kount);
-                JOT(8, "field buffer %i has %i bytes to be overwritten\n", \
-                        peasycap->field_read, videofieldamount);
-                JOT(8, "wakeup call to wq_video, " \
-                        "%i=field_read %i=field_fill %i=parity\n", \
-                        peasycap->field_read, peasycap->field_fill, \
-                        0x00FF & \
-                        peasycap->field_buffer[peasycap->field_read][0].kount);
-                wake_up_interruptible(&(peasycap->wq_video));
-                do_gettimeofday(&peasycap->timeval7);
-        }
-}
-#endif /*BRIDGER*/
-/*---------------------------------------------------------------------------*/
-/*
  *  RESUBMIT THIS URB, UNLESS A SEVERE PERSISTENT ERROR CONDITION EXISTS.
  *
  *  IF THE WAIT QUEUES ARE NOT CLEARED IN RESPONSE TO AN ERROR CONDITION
@@ -2921,51 +3333,57 @@ if (peasycap->timeval7.tv_sec) {
  */
 /*---------------------------------------------------------------------------*/
 if (VIDEO_ISOC_BUFFER_MANY <= peasycap->video_junk) {
-        SAY("easycap driver shutting down on condition green\n");
+        SAM("easycap driver shutting down on condition green\n");
+        peasycap->status = 1;
         peasycap->video_eof = 1;
+        peasycap->video_junk = 0;
+        wake_up_interruptible(&peasycap->wq_video);
+#if !defined(PERSEVERE)
         peasycap->audio_eof = 1;
-        peasycap->video_junk = -VIDEO_ISOC_BUFFER_MANY;
-        wake_up_interruptible(&(peasycap->wq_video));
-        wake_up_interruptible(&(peasycap->wq_audio));
+        wake_up_interruptible(&peasycap->wq_audio);
+#endif /*PERSEVERE*/
         return;
 }
 if (peasycap->video_isoc_streaming) {
         rc = usb_submit_urb(purb, GFP_ATOMIC);
         if (0 != rc) {
-                SAY("ERROR: while %i=video_idle, usb_submit_urb() failed " \
-                                        "with rc:\n", peasycap->video_idle);
                 switch (rc) {
                 case -ENOMEM: {
-                        SAY("ENOMEM\n"); break;
+                        SAM("ENOMEM\n"); break;
                 }
                 case -ENODEV: {
-                        SAY("ENODEV\n"); break;
+                        SAM("ENODEV\n"); break;
                 }
                 case -ENXIO: {
-                        SAY("ENXIO\n"); break;
+                        SAM("ENXIO\n"); break;
                 }
                 case -EINVAL: {
-                        SAY("EINVAL\n"); break;
+                        SAM("EINVAL\n"); break;
                 }
                 case -EAGAIN: {
-                        SAY("EAGAIN\n"); break;
+                        SAM("EAGAIN\n"); break;
                 }
                 case -EFBIG: {
-                        SAY("EFBIG\n"); break;
+                        SAM("EFBIG\n"); break;
                 }
                 case -EPIPE: {
-                        SAY("EPIPE\n"); break;
+                        SAM("EPIPE\n"); break;
                 }
                 case -EMSGSIZE: {
-                        SAY("EMSGSIZE\n");  break;
+                        SAM("EMSGSIZE\n");  break;
                 }
                 case -ENOSPC: {
-                        SAY("ENOSPC\n"); break;
+                        SAM("ENOSPC\n"); break;
                 }
                 default: {
-                        SAY("0x%08X\n", rc); break;
+                        SAM("0x%08X\n", rc); break;
                 }
                 }
+                if (-ENODEV != rc) \
+                        SAM("ERROR: while %i=video_idle, " \
+                                                "usb_submit_urb() " \
+                                                "failed with rc:\n", \
+                                                peasycap->video_idle);
         }
 }
 return;
@@ -2977,8 +3395,8 @@ return;
  *                                  FIXME
  *
  *
- *  THIS FUNCTION ASSUMES THAT, ON EACH AND EVERY OCCASION THAT THE DEVICE IS
- *  PHYSICALLY PLUGGED IN, INTERFACE 0 IS PROBED FIRST.
+ *  THIS FUNCTION ASSUMES THAT, ON EACH AND EVERY OCCASION THAT THE EasyCAP
+ *  IS PHYSICALLY PLUGGED IN, INTERFACE 0 IS PROBED FIRST.
  *  IF THIS IS NOT TRUE, THERE IS THE POSSIBILITY OF AN Oops.
  *
  *  THIS HAS NEVER BEEN A PROBLEM IN PRACTICE, BUT SOMETHING SEEMS WRONG HERE.
@@ -2994,7 +3412,7 @@ struct usb_endpoint_descriptor *pepd;
 struct usb_interface_descriptor *pusb_interface_descriptor;
 struct usb_interface_assoc_descriptor *pusb_interface_assoc_descriptor;
 struct urb *purb;
-static struct easycap *peasycap /*=NULL*/;
+struct easycap *peasycap;
 struct data_urb *pdata_urb;
 size_t wMaxPacketSize;
 int ISOCwMaxPacketSize;
@@ -3004,19 +3422,32 @@ int CTRLwMaxPacketSize;
 __u8 bEndpointAddress;
 __u8 ISOCbEndpointAddress;
 __u8 INTbEndpointAddress;
-int isin, i, j, k, m;
+int isin, i, j, k, m, rc;
 __u8 bInterfaceNumber;
 __u8 bInterfaceClass;
 __u8 bInterfaceSubClass;
 void *pbuf;
 int okalt[8], isokalt;
-int okepn[8], isokepn;
-int okmps[8], isokmps;
+int okepn[8];
+int okmps[8];
 int maxpacketsize;
-int rc;
+__u16 mask;
+__s32 value;
+struct easycap_format *peasycap_format;
 
 JOT(4, "\n");
 
+if (!dongle_done) {
+        dongle_done = 1;
+        for (k = 0; k < DONGLE_MANY; k++) {
+                easycap_dongle[k].peasycap = (struct easycap *)NULL;
+                mutex_init(&easycap_dongle[k].mutex_video);
+                mutex_init(&easycap_dongle[k].mutex_audio);
+        }
+}
+
+peasycap = (struct easycap *)NULL;
+
 if ((struct usb_interface *)NULL == pusb_interface) {
         SAY("ERROR: pusb_interface is NULL\n");
         return -EFAULT;
@@ -3117,46 +3548,83 @@ JOT(4, "intf[%i]: pusb_interface_assoc_descriptor is NULL\n", \
 /*
  *  A NEW struct easycap IS ALWAYS ALLOCATED WHEN INTERFACE 0 IS PROBED.
  *  IT IS NOT POSSIBLE HERE TO FREE ANY EXISTING struct easycap.  THIS
- *  SHOULD HAVE BEEN DONE BY easycap_delete() WHEN THE DEVICE WAS PHYSICALLY
- *  UNPLUGGED.
- */
+ *  SHOULD HAVE BEEN DONE BY easycap_delete() WHEN THE EasyCAP WAS
+ *  PHYSICALLY UNPLUGGED.
+ *
+ *  THE POINTER peasycap TO THE struct easycap IS REMEMBERED WHEN
+ *  INTERFACES 1 AND 2 ARE PROBED.
+ *
+ *  IF TWO EasyCAPs ARE PLUGGED IN NEARLY SIMULTANEOUSLY THERE WILL
+ *  BE TROUBLE.  BEWARE.
+*/
 /*---------------------------------------------------------------------------*/
 if (0 == bInterfaceNumber) {
         peasycap = kzalloc(sizeof(struct easycap), GFP_KERNEL);
         if (NULL == peasycap) {
                 SAY("ERROR: Could not allocate peasycap\n");
                 return -ENOMEM;
-        } else {
-                peasycap->allocation_video_struct = sizeof(struct easycap);
-                peasycap->allocation_video_page = 0;
-                peasycap->allocation_video_urb = 0;
-                peasycap->allocation_audio_struct = 0;
-                peasycap->allocation_audio_page = 0;
-                peasycap->allocation_audio_urb = 0;
         }
+        SAM("allocated 0x%08lX=peasycap\n", (unsigned long int) peasycap);
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if defined(EASYCAP_IS_VIDEODEV_CLIENT)
+        SAM("where     0x%08lX=&peasycap->video_device\n", \
+                                (unsigned long int) &peasycap->video_device);
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+        SAM("and       0x%08lX=&peasycap->v4l2_device\n", \
+                                (unsigned long int) &peasycap->v4l2_device);
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
 /*---------------------------------------------------------------------------*/
 /*
- *  INITIALIZE THE NEW easycap STRUCTURE.
- *  NO PARAMETERS ARE SPECIFIED HERE REQUIRING THE SETTING OF REGISTERS.
- *  THAT IS DONE FIRST BY easycap_open() AND LATER BY easycap_ioctl().
- */
+ *  PERFORM URGENT INTIALIZATIONS ...
+*/
 /*---------------------------------------------------------------------------*/
-        peasycap->pusb_device = pusb_device;
-        peasycap->pusb_interface = pusb_interface;
-
+        strcpy(&peasycap->telltale[0], TELLTALE);
         kref_init(&peasycap->kref);
-        JOT(8, "intf[%i]: after kref_init(..._video) " \
+        JOM(8, "intf[%i]: after kref_init(..._video) " \
                         "%i=peasycap->kref.refcount.counter\n", \
                         bInterfaceNumber, peasycap->kref.refcount.counter);
 
-        init_waitqueue_head(&(peasycap->wq_video));
-        init_waitqueue_head(&(peasycap->wq_audio));
+        init_waitqueue_head(&peasycap->wq_video);
+        init_waitqueue_head(&peasycap->wq_audio);
+
+        for (dongle_this = 0; dongle_this < DONGLE_MANY; dongle_this++) {
+                if (NULL == easycap_dongle[dongle_this].peasycap) {
+                        if (0 == mutex_is_locked(&easycap_dongle\
+                                                [dongle_this].mutex_video)) {
+                                if (0 == mutex_is_locked(&easycap_dongle\
+                                                [dongle_this].mutex_audio)) {
+                                        easycap_dongle\
+                                                [dongle_this].peasycap = \
+                                                                peasycap;
+                                        JOM(8, "intf[%i]: peasycap-->easycap" \
+                                                "_dongle[%i].peasycap\n", \
+                                                bInterfaceNumber, dongle_this);
+                                        break;
+                                }
+                        }
+                }
+        }
+        if (DONGLE_MANY <= dongle_this) {
+                SAM("ERROR: too many dongles\n");
+                return -ENOMEM;
+        }
 
-        mutex_init(&(peasycap->mutex_timeval0));
-        mutex_init(&(peasycap->mutex_timeval1));
+        peasycap->allocation_video_struct = sizeof(struct easycap);
+        peasycap->allocation_video_page = 0;
+        peasycap->allocation_video_urb = 0;
+        peasycap->allocation_audio_struct = 0;
+        peasycap->allocation_audio_page = 0;
+        peasycap->allocation_audio_urb = 0;
 
-        for (k = 0; k < FRAME_BUFFER_MANY; k++)
-                mutex_init(&(peasycap->mutex_mmap_video[k]));
+/*---------------------------------------------------------------------------*/
+/*
+ *  ... AND FURTHER INITIALIZE THE STRUCTURE
+*/
+/*---------------------------------------------------------------------------*/
+        peasycap->pusb_device = pusb_device;
+        peasycap->pusb_interface = pusb_interface;
 
         peasycap->ilk = 0;
         peasycap->microphone = false;
@@ -3177,46 +3645,172 @@ if (0 == bInterfaceNumber) {
 
         peasycap->frame_buffer_many = FRAME_BUFFER_MANY;
 
-        if ((struct mutex *)NULL == &(peasycap->mutex_mmap_video[0])) {
-                SAY("ERROR: &(peasycap->mutex_mmap_video[%i]) is NULL\n", 0);
-                return -EFAULT;
-        }
+        for (k = 0; k < INPUT_MANY; k++)
+                peasycap->lost[k] = 0;
+        peasycap->skip = 0;
+        peasycap->skipped = 0;
+        peasycap->offerfields = 0;
 /*---------------------------------------------------------------------------*/
 /*
- *  DYNAMICALLY FILL IN THE AVAILABLE FORMATS.
+ *  DYNAMICALLY FILL IN THE AVAILABLE FORMATS ...
  */
 /*---------------------------------------------------------------------------*/
         rc = fillin_formats();
         if (0 > rc) {
-                SAY("ERROR: fillin_formats() returned %i\n", rc);
+                SAM("ERROR: fillin_formats() returned %i\n", rc);
                 return -EFAULT;
         }
-        JOT(4, "%i formats available\n", rc);
-        } else {
+        JOM(4, "%i formats available\n", rc);
 /*---------------------------------------------------------------------------*/
-                if ((struct easycap *)NULL == peasycap) {
-                        SAY("ERROR: peasycap is NULL " \
-                                        "when probing interface %i\n", \
-                                                        bInterfaceNumber);
-                        return -EFAULT;
+/*
+ *  ... AND POPULATE easycap.inputset[]
+*/
+/*---------------------------------------------------------------------------*/
+        for (k = 0; k < INPUT_MANY; k++) {
+                peasycap->inputset[k].input_ok = 0;
+                peasycap->inputset[k].standard_offset_ok = 0;
+                peasycap->inputset[k].format_offset_ok = 0;
+                peasycap->inputset[k].brightness_ok = 0;
+                peasycap->inputset[k].contrast_ok = 0;
+                peasycap->inputset[k].saturation_ok = 0;
+                peasycap->inputset[k].hue_ok = 0;
+        }
+        if (true == peasycap->ntsc) {
+                i = 0;
+                m = 0;
+                mask = 0;
+                while (0xFFFF != easycap_standard[i].mask) {
+                        if (NTSC_M == easycap_standard[i].\
+                                                        v4l2_standard.index) {
+                                m++;
+                                for (k = 0; k < INPUT_MANY; k++) {
+                                        peasycap->inputset[k].\
+                                                        standard_offset = i;
+                                }
+                        mask = easycap_standard[i].mask;
+                        }
+                        i++;
                 }
+        } else {
+                i = 0;
+                m = 0;
+                mask = 0;
+                while (0xFFFF != easycap_standard[i].mask) {
+                        if (PAL_BGHIN == easycap_standard[i].\
+                                                        v4l2_standard.index) {
+                                m++;
+                                for (k = 0; k < INPUT_MANY; k++) {
+                                        peasycap->inputset[k].\
+                                                        standard_offset = i;
+                                }
+                        mask = easycap_standard[i].mask;
+                        }
+                        i++;
+                }
+        }
 
-        JOT(8, "kref_get() with %i=peasycap->kref.refcount.counter\n", \
-                                        (int)peasycap->kref.refcount.counter);
-        kref_get(&peasycap->kref);
+        if (1 != m) {
+                SAM("MISTAKE: easycap.inputset[].standard_offset " \
+                                                "unpopulated, %i=m\n", m);
+                return -ENOENT;
+        }
+
+        peasycap_format = &easycap_format[0];
+        i = 0;
+        m = 0;
+        while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
+                if (((peasycap_format->mask & 0x0F) == (mask & 0x0F)) && \
+                                (peasycap_format->\
+                                        v4l2_format.fmt.pix.field == \
+                                                        V4L2_FIELD_NONE) && \
+                                (peasycap_format->\
+                                        v4l2_format.fmt.pix.pixelformat == \
+                                                        V4L2_PIX_FMT_UYVY) && \
+                                (peasycap_format->\
+                                        v4l2_format.fmt.pix.width  == \
+                                                        640) && \
+                                (peasycap_format->\
+                                        v4l2_format.fmt.pix.height == 480)) {
+                        m++;
+                        for (k = 0; k < INPUT_MANY; k++)
+                                peasycap->inputset[k].format_offset = i;
+                        break;
+                }
+        peasycap_format++;
+        i++;
+        }
+        if (1 != m) {
+                SAM("MISTAKE: easycap.inputset[].format_offset unpopulated\n");
+        return -ENOENT;
+        }
+
+        i = 0;
+        m = 0;
+        while (0xFFFFFFFF != easycap_control[i].id) {
+                value = easycap_control[i].default_value;
+                if (V4L2_CID_BRIGHTNESS == easycap_control[i].id) {
+                        m++;
+                        for (k = 0; k < INPUT_MANY; k++)
+                                peasycap->inputset[k].brightness = value;
+                } else if (V4L2_CID_CONTRAST == easycap_control[i].id) {
+                        m++;
+                        for (k = 0; k < INPUT_MANY; k++)
+                                peasycap->inputset[k].contrast = value;
+                } else if (V4L2_CID_SATURATION == easycap_control[i].id) {
+                        m++;
+                        for (k = 0; k < INPUT_MANY; k++)
+                                peasycap->inputset[k].saturation = value;
+                } else if (V4L2_CID_HUE == easycap_control[i].id) {
+                        m++;
+                        for (k = 0; k < INPUT_MANY; k++)
+                                peasycap->inputset[k].hue = value;
+                }
+                i++;
+        }
+        if (4 != m) {
+                SAM("MISTAKE: easycap.inputset[].brightness,... " \
+                                                "underpopulated\n");
+                return -ENOENT;
+        }
+        for (k = 0; k < INPUT_MANY; k++)
+                peasycap->inputset[k].input = k;
+        JOM(4, "populated easycap.inputset[]\n");
+        JOM(4, "finished initialization\n");
+} else {
+/*---------------------------------------------------------------------------*/
+        /*
+         *  FOR INTERFACES 1 AND 2 THE POINTER peasycap IS OBTAINED BY ASSUMING
+         *  THAT dongle_this HAS NOT CHANGED SINCE INTERFACE 0 WAS PROBED.  IF
+         *  THIS IS NOT THE CASE, FOR EXAMPLE WHEN TWO EASYCAPs ARE PLUGGED IN
+         *  SIMULTANEOUSLY, THERE WILL BE SERIOUS TROUBLE.
+        */
+/*---------------------------------------------------------------------------*/
+        if ((0 > dongle_this) || (DONGLE_MANY <= dongle_this)) {
+                SAY("ERROR: bad dongle count\n");
+                return -EFAULT;
+        }
+        peasycap = easycap_dongle[dongle_this].peasycap;
+        JOT(8, "intf[%i]: easycap_dongle[%i].peasycap-->peasycap\n", \
+                                                bInterfaceNumber, dongle_this);
+
+        if ((struct easycap *)NULL == peasycap) {
+                SAY("ERROR: peasycap is NULL when probing interface %i\n", \
+                                                        bInterfaceNumber);
+                return -EFAULT;
+        }
 }
 /*---------------------------------------------------------------------------*/
 if ((USB_CLASS_VIDEO == bInterfaceClass) || \
-        (USB_CLASS_VENDOR_SPEC == bInterfaceClass)) {
+                (USB_CLASS_VENDOR_SPEC == bInterfaceClass)) {
         if (-1 == peasycap->video_interface) {
                 peasycap->video_interface = bInterfaceNumber;
-                JOT(4, "setting peasycap->video_interface=%i\n", \
+                JOM(4, "setting peasycap->video_interface=%i\n", \
                                                 peasycap->video_interface);
         } else {
                 if (peasycap->video_interface != bInterfaceNumber) {
-                        SAY("ERROR: attempting to reset " \
+                        SAM("ERROR: attempting to reset " \
                                         "peasycap->video_interface\n");
-                        SAY("...... continuing with " \
+                        SAM("...... continuing with " \
                                         "%i=peasycap->video_interface\n", \
                                         peasycap->video_interface);
                 }
@@ -3225,13 +3819,13 @@ if ((USB_CLASS_VIDEO == bInterfaceClass) || \
                                                 (0x02 == bInterfaceSubClass)) {
         if (-1 == peasycap->audio_interface) {
                 peasycap->audio_interface = bInterfaceNumber;
-                JOT(4, "setting peasycap->audio_interface=%i\n", \
+                JOM(4, "setting peasycap->audio_interface=%i\n", \
                                                  peasycap->audio_interface);
         } else {
                 if (peasycap->audio_interface != bInterfaceNumber) {
-                        SAY("ERROR: attempting to reset " \
+                        SAM("ERROR: attempting to reset " \
                                         "peasycap->audio_interface\n");
-                        SAY("...... continuing with " \
+                        SAM("...... continuing with " \
                                         "%i=peasycap->audio_interface\n", \
                                         peasycap->audio_interface);
                 }
@@ -3244,37 +3838,35 @@ if ((USB_CLASS_VIDEO == bInterfaceClass) || \
  */
 /*---------------------------------------------------------------------------*/
 isokalt = 0;
-isokepn = 0;
-isokmps = 0;
 
 for (i = 0; i < pusb_interface->num_altsetting; i++) {
         pusb_host_interface = &(pusb_interface->altsetting[i]);
         if ((struct usb_host_interface *)NULL == pusb_host_interface) {
-                SAY("ERROR: pusb_host_interface is NULL\n");
+                SAM("ERROR: pusb_host_interface is NULL\n");
                 return -EFAULT;
         }
         pusb_interface_descriptor = &(pusb_host_interface->desc);
         if ((struct usb_interface_descriptor *)NULL == \
                                                 pusb_interface_descriptor) {
-                SAY("ERROR: pusb_interface_descriptor is NULL\n");
+                SAM("ERROR: pusb_interface_descriptor is NULL\n");
                 return -EFAULT;
         }
 
-        JOT(4, "intf[%i]alt[%i]: desc.bDescriptorType=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bDescriptorType=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bDescriptorType);
-        JOT(4, "intf[%i]alt[%i]: desc.bInterfaceNumber=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bInterfaceNumber=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bInterfaceNumber);
-        JOT(4, "intf[%i]alt[%i]: desc.bAlternateSetting=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bAlternateSetting=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bAlternateSetting);
-        JOT(4, "intf[%i]alt[%i]: desc.bNumEndpoints=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bNumEndpoints=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bNumEndpoints);
-        JOT(4, "intf[%i]alt[%i]: desc.bInterfaceClass=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bInterfaceClass=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bInterfaceClass);
-        JOT(4, "intf[%i]alt[%i]: desc.bInterfaceSubClass=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bInterfaceSubClass=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bInterfaceSubClass);
-        JOT(4, "intf[%i]alt[%i]: desc.bInterfaceProtocol=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.bInterfaceProtocol=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->bInterfaceProtocol);
-        JOT(4, "intf[%i]alt[%i]: desc.iInterface=0x%02X\n", \
+        JOM(4, "intf[%i]alt[%i]: desc.iInterface=0x%02X\n", \
         bInterfaceNumber, i, pusb_interface_descriptor->iInterface);
 
         ISOCwMaxPacketSize = -1;
@@ -3285,86 +3877,80 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
         INTbEndpointAddress = 0;
 
         if (0 == pusb_interface_descriptor->bNumEndpoints)
-                                JOT(4, "intf[%i]alt[%i] has no endpoints\n", \
+                                JOM(4, "intf[%i]alt[%i] has no endpoints\n", \
                                                         bInterfaceNumber, i);
 /*---------------------------------------------------------------------------*/
         for (j = 0; j < pusb_interface_descriptor->bNumEndpoints; j++) {
                 pepd = &(pusb_host_interface->endpoint[j].desc);
                 if ((struct usb_endpoint_descriptor *)NULL == pepd) {
-                        SAY("ERROR:  pepd is NULL.\n");
-                        SAY("...... skipping\n");
+                        SAM("ERROR:  pepd is NULL.\n");
+                        SAM("...... skipping\n");
                         continue;
                 }
                 wMaxPacketSize = le16_to_cpu(pepd->wMaxPacketSize);
                 bEndpointAddress = pepd->bEndpointAddress;
 
-                JOT(4, "intf[%i]alt[%i]end[%i]: bEndpointAddress=0x%X\n", \
+                JOM(4, "intf[%i]alt[%i]end[%i]: bEndpointAddress=0x%X\n", \
                                 bInterfaceNumber, i, j, \
                                 pepd->bEndpointAddress);
-                JOT(4, "intf[%i]alt[%i]end[%i]: bmAttributes=0x%X\n", \
+                JOM(4, "intf[%i]alt[%i]end[%i]: bmAttributes=0x%X\n", \
                                 bInterfaceNumber, i, j, \
                                 pepd->bmAttributes);
-                JOT(4, "intf[%i]alt[%i]end[%i]: wMaxPacketSize=%i\n", \
+                JOM(4, "intf[%i]alt[%i]end[%i]: wMaxPacketSize=%i\n", \
                                 bInterfaceNumber, i, j, \
                                 pepd->wMaxPacketSize);
-                JOT(4, "intf[%i]alt[%i]end[%i]: bInterval=%i\n",
+                JOM(4, "intf[%i]alt[%i]end[%i]: bInterval=%i\n",
                                 bInterfaceNumber, i, j, \
                                 pepd->bInterval);
 
                 if (pepd->bEndpointAddress & USB_DIR_IN) {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is an  IN  endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is an  IN  endpoint\n",\
                                                 bInterfaceNumber, i, j);
                         isin = 1;
                 } else {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is an  OUT endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is an  OUT endpoint\n",\
                                                 bInterfaceNumber, i, j);
-                        SAY("ERROR: OUT endpoint unexpected\n");
-                        SAY("...... continuing\n");
+                        SAM("ERROR: OUT endpoint unexpected\n");
+                        SAM("...... continuing\n");
                         isin = 0;
                 }
                 if ((pepd->bmAttributes & \
                                 USB_ENDPOINT_XFERTYPE_MASK) == \
                                 USB_ENDPOINT_XFER_ISOC) {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is an ISOC endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is an ISOC endpoint\n",\
                                                 bInterfaceNumber, i, j);
                         if (isin) {
                                 switch (bInterfaceClass) {
                                 case USB_CLASS_VIDEO:
                                 case USB_CLASS_VENDOR_SPEC: {
                                         if (!peasycap) {
-                                                SAY("MISTAKE: " \
+                                                SAM("MISTAKE: " \
                                                         "peasycap is NULL\n");
                                                 return -EFAULT;
                                         }
                                         if (pepd->wMaxPacketSize) {
                                                 if (8 > isokalt) {
                                                         okalt[isokalt] = i;
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okalt[%i]\n", \
                                                         okalt[isokalt], \
                                                         isokalt);
-                                                        isokalt++;
-                                                }
-                                                if (8 > isokepn) {
-                                                        okepn[isokepn] = \
+                                                        okepn[isokalt] = \
                                                         pepd->\
                                                         bEndpointAddress & \
                                                         0x0F;
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okepn[%i]\n", \
-                                                        okepn[isokepn], \
-                                                        isokepn);
-                                                        isokepn++;
-                                                }
-                                                if (8 > isokmps) {
-                                                        okmps[isokmps] = \
+                                                        okepn[isokalt], \
+                                                        isokalt);
+                                                        okmps[isokalt] = \
                                                         le16_to_cpu(pepd->\
                                                         wMaxPacketSize);
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okmps[%i]\n", \
-                                                        okmps[isokmps], \
-                                                        isokmps);
-                                                        isokmps++;
+                                                        okmps[isokalt], \
+                                                        isokalt);
+                                                        isokalt++;
                                                 }
                                         } else {
                                                 if (-1 == peasycap->\
@@ -3372,16 +3958,16 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
                                                         peasycap->\
                                                         video_altsetting_off =\
                                                                          i;
-                                                        JOT(4, "%i=video_" \
+                                                        JOM(4, "%i=video_" \
                                                         "altsetting_off " \
                                                                 "<====\n", \
                                                         peasycap->\
                                                         video_altsetting_off);
                                                 } else {
-                                                        SAY("ERROR: peasycap" \
+                                                        SAM("ERROR: peasycap" \
                                                         "->video_altsetting_" \
                                                         "off already set\n");
-                                                        SAY("...... " \
+                                                        SAM("...... " \
                                                         "continuing with " \
                                                         "%i=peasycap->video_" \
                                                         "altsetting_off\n", \
@@ -3395,39 +3981,33 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
                                         if (0x02 != bInterfaceSubClass)
                                                 break;
                                         if (!peasycap) {
-                                                SAY("MISTAKE: " \
+                                                SAM("MISTAKE: " \
                                                 "peasycap is NULL\n");
                                                 return -EFAULT;
                                         }
                                         if (pepd->wMaxPacketSize) {
                                                 if (8 > isokalt) {
                                                         okalt[isokalt] = i ;
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okalt[%i]\n", \
                                                         okalt[isokalt], \
                                                         isokalt);
-                                                        isokalt++;
-                                                }
-                                                if (8 > isokepn) {
-                                                        okepn[isokepn] = \
+                                                        okepn[isokalt] = \
                                                         pepd->\
                                                         bEndpointAddress & \
                                                         0x0F;
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okepn[%i]\n", \
-                                                        okepn[isokepn], \
-                                                        isokepn);
-                                                        isokepn++;
-                                                }
-                                                if (8 > isokmps) {
-                                                        okmps[isokmps] = \
+                                                        okepn[isokalt], \
+                                                        isokalt);
+                                                        okmps[isokalt] = \
                                                         le16_to_cpu(pepd->\
                                                         wMaxPacketSize);
-                                                        JOT(4,\
+                                                        JOM(4,\
                                                         "%i=okmps[%i]\n",\
-                                                        okmps[isokmps], \
-                                                        isokmps);
-                                                        isokmps++;
+                                                        okmps[isokalt], \
+                                                        isokalt);
+                                                        isokalt++;
                                                 }
                                         } else {
                                                 if (-1 == peasycap->\
@@ -3435,16 +4015,16 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
                                                         peasycap->\
                                                         audio_altsetting_off =\
                                                                          i;
-                                                        JOT(4, "%i=audio_" \
+                                                        JOM(4, "%i=audio_" \
                                                         "altsetting_off " \
                                                         "<====\n", \
                                                         peasycap->\
                                                         audio_altsetting_off);
                                                 } else {
-                                                        SAY("ERROR: peasycap" \
+                                                        SAM("ERROR: peasycap" \
                                                         "->audio_altsetting_" \
                                                         "off already set\n");
-                                                        SAY("...... " \
+                                                        SAM("...... " \
                                                         "continuing with " \
                                                         "%i=peasycap->\
                                                         audio_altsetting_" \
@@ -3462,19 +4042,19 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
                 } else if ((pepd->bmAttributes & \
                                                 USB_ENDPOINT_XFERTYPE_MASK) ==\
                                                 USB_ENDPOINT_XFER_BULK) {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is a  BULK endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is a  BULK endpoint\n",\
                                                 bInterfaceNumber, i, j);
                 } else if ((pepd->bmAttributes & \
                                                 USB_ENDPOINT_XFERTYPE_MASK) ==\
                                                 USB_ENDPOINT_XFER_INT) {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is an  INT endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is an  INT endpoint\n",\
                                                 bInterfaceNumber, i, j);
                 } else {
-                        JOT(4, "intf[%i]alt[%i]end[%i] is a  CTRL endpoint\n",\
+                        JOM(4, "intf[%i]alt[%i]end[%i] is a  CTRL endpoint\n",\
                                                 bInterfaceNumber, i, j);
                 }
                 if (0 == pepd->wMaxPacketSize) {
-                        JOT(4, "intf[%i]alt[%i]end[%i] " \
+                        JOM(4, "intf[%i]alt[%i]end[%i] " \
                                                 "has zero packet size\n", \
                                                 bInterfaceNumber, i, j);
                 }
@@ -3485,7 +4065,7 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
  *  PERFORM INITIALIZATION OF THE PROBED INTERFACE
  */
 /*---------------------------------------------------------------------------*/
-JOT(4, "initialization begins for interface %i\n", \
+JOM(4, "initialization begins for interface %i\n", \
                                 pusb_interface_descriptor->bInterfaceNumber);
 switch (bInterfaceNumber) {
 /*---------------------------------------------------------------------------*/
@@ -3495,89 +4075,78 @@ switch (bInterfaceNumber) {
 /*---------------------------------------------------------------------------*/
 case 0: {
         if (!peasycap) {
-                SAY("MISTAKE: peasycap is NULL\n");
+                SAM("MISTAKE: peasycap is NULL\n");
                 return -EFAULT;
         }
         if (!isokalt) {
-                SAY("ERROR:  no viable video_altsetting_on\n");
+                SAM("ERROR:  no viable video_altsetting_on\n");
                 return -ENOENT;
         } else {
                 peasycap->video_altsetting_on = okalt[isokalt - 1];
-                JOT(4, "%i=video_altsetting_on <====\n", \
+                JOM(4, "%i=video_altsetting_on <====\n", \
                                         peasycap->video_altsetting_on);
         }
-        if (!isokepn) {
-                SAY("ERROR:  no viable video_endpointnumber\n");
-                return -ENOENT;
-        } else {
-                peasycap->video_endpointnumber = okepn[isokepn - 1];
-                JOT(4, "%i=video_endpointnumber\n", \
-                                        peasycap->video_endpointnumber);
-                }
-        if (!isokmps) {
-                SAY("ERROR:  no viable video_maxpacketsize\n");
-                return -ENOENT;
 /*---------------------------------------------------------------------------*/
 /*
  *  DECIDE THE VIDEO STREAMING PARAMETERS
  */
 /*---------------------------------------------------------------------------*/
+        peasycap->video_endpointnumber = okepn[isokalt - 1];
+        JOM(4, "%i=video_endpointnumber\n", peasycap->video_endpointnumber);
+        maxpacketsize = okmps[isokalt - 1];
+        if (USB_2_0_MAXPACKETSIZE > maxpacketsize) {
+                peasycap->video_isoc_maxframesize = maxpacketsize;
         } else {
-                maxpacketsize = okmps[isokmps - 1] - 1024;
-                if (USB_2_0_MAXPACKETSIZE > maxpacketsize) {
-                        peasycap->video_isoc_maxframesize = maxpacketsize;
-                } else {
-                        peasycap->video_isoc_maxframesize = \
-                                                        USB_2_0_MAXPACKETSIZE;
-                }
-                JOT(4, "%i=video_isoc_maxframesize\n", \
-                                        peasycap->video_isoc_maxframesize);
-                if (0 >= peasycap->video_isoc_maxframesize) {
-                        SAY("ERROR:  bad video_isoc_maxframesize\n");
-                        return -ENOENT;
-                }
-                peasycap->video_isoc_framesperdesc = VIDEO_ISOC_FRAMESPERDESC;
-                JOT(4, "%i=video_isoc_framesperdesc\n", \
-                                        peasycap->video_isoc_framesperdesc);
-                if (0 >= peasycap->video_isoc_framesperdesc) {
-                        SAY("ERROR:  bad video_isoc_framesperdesc\n");
-                        return -ENOENT;
-                }
-                peasycap->video_isoc_buffer_size = \
-                                        peasycap->video_isoc_maxframesize * \
-                                        peasycap->video_isoc_framesperdesc;
-                JOT(4, "%i=video_isoc_buffer_size\n", \
-                                        peasycap->video_isoc_buffer_size);
-                if ((PAGE_SIZE << VIDEO_ISOC_ORDER) < \
-                                        peasycap->video_isoc_buffer_size) {
-                        SAY("MISTAKE: " \
-                                "peasycap->video_isoc_buffer_size too big\n");
-                        return -EFAULT;
-                }
+                peasycap->video_isoc_maxframesize = \
+                                                USB_2_0_MAXPACKETSIZE;
+        }
+        JOM(4, "%i=video_isoc_maxframesize\n", \
+                                peasycap->video_isoc_maxframesize);
+        if (0 >= peasycap->video_isoc_maxframesize) {
+                SAM("ERROR:  bad video_isoc_maxframesize\n");
+                SAM("        possibly because port is USB 1.1\n");
+                return -ENOENT;
+        }
+        peasycap->video_isoc_framesperdesc = VIDEO_ISOC_FRAMESPERDESC;
+        JOM(4, "%i=video_isoc_framesperdesc\n", \
+                                peasycap->video_isoc_framesperdesc);
+        if (0 >= peasycap->video_isoc_framesperdesc) {
+                SAM("ERROR:  bad video_isoc_framesperdesc\n");
+                return -ENOENT;
+        }
+        peasycap->video_isoc_buffer_size = \
+                                peasycap->video_isoc_maxframesize * \
+                                peasycap->video_isoc_framesperdesc;
+        JOM(4, "%i=video_isoc_buffer_size\n", \
+                                peasycap->video_isoc_buffer_size);
+        if ((PAGE_SIZE << VIDEO_ISOC_ORDER) < \
+                                peasycap->video_isoc_buffer_size) {
+                SAM("MISTAKE: peasycap->video_isoc_buffer_size too big\n");
+                return -EFAULT;
         }
 /*---------------------------------------------------------------------------*/
         if (-1 == peasycap->video_interface) {
-                SAY("MISTAKE:  video_interface is unset\n");
+                SAM("MISTAKE:  video_interface is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->video_altsetting_on) {
-                SAY("MISTAKE:  video_altsetting_on is unset\n");
+                SAM("MISTAKE:  video_altsetting_on is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->video_altsetting_off) {
-                SAY("MISTAKE:  video_interface_off is unset\n");
+                SAM("MISTAKE:  video_interface_off is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->video_endpointnumber) {
-                SAY("MISTAKE:  video_endpointnumber is unset\n");
+                SAM("MISTAKE:  video_endpointnumber is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->video_isoc_maxframesize) {
-                SAY("MISTAKE:  video_isoc_maxframesize is unset\n");
+                SAM("MISTAKE:  video_isoc_maxframesize is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->video_isoc_buffer_size) {
-                SAY("MISTAKE:  video_isoc_buffer_size is unset\n");
+                SAM("MISTAKE:  video_isoc_buffer_size is unset\n");
                 return -EFAULT;
         }
 /*---------------------------------------------------------------------------*/
@@ -3588,20 +4157,20 @@ case 0: {
         INIT_LIST_HEAD(&(peasycap->urb_video_head));
         peasycap->purb_video_head = &(peasycap->urb_video_head);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i frame buffers of size %li\n",  \
+        JOM(4, "allocating %i frame buffers of size %li\n",  \
                         FRAME_BUFFER_MANY, (long int)FRAME_BUFFER_SIZE);
-        JOT(4, ".... each scattered over %li pages\n", \
+        JOM(4, ".... each scattered over %li pages\n", \
                                                 FRAME_BUFFER_SIZE/PAGE_SIZE);
 
         for (k = 0;  k < FRAME_BUFFER_MANY;  k++) {
                 for (m = 0;  m < FRAME_BUFFER_SIZE/PAGE_SIZE;  m++) {
                         if ((void *)NULL != peasycap->frame_buffer[k][m].pgo)
-                                SAY("attempting to reallocate frame " \
+                                SAM("attempting to reallocate frame " \
                                                                 " buffers\n");
                         else {
                                 pbuf = (void *)__get_free_page(GFP_KERNEL);
                                 if ((void *)NULL == pbuf) {
-                                        SAY("ERROR: Could not allocate frame "\
+                                        SAM("ERROR: Could not allocate frame "\
                                                 "buffer %i page %i\n", k, m);
                                         return -ENOMEM;
                                 } else
@@ -3615,23 +4184,23 @@ case 0: {
 
         peasycap->frame_fill = 0;
         peasycap->frame_read = 0;
-        JOT(4, "allocation of frame buffers done:  %i pages\n", k * \
+        JOM(4, "allocation of frame buffers done:  %i pages\n", k * \
                                                                 m);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i field buffers of size %li\n",  \
+        JOM(4, "allocating %i field buffers of size %li\n",  \
                         FIELD_BUFFER_MANY, (long int)FIELD_BUFFER_SIZE);
-        JOT(4, ".... each scattered over %li pages\n", \
+        JOM(4, ".... each scattered over %li pages\n", \
                                         FIELD_BUFFER_SIZE/PAGE_SIZE);
 
         for (k = 0;  k < FIELD_BUFFER_MANY;  k++) {
                 for (m = 0;  m < FIELD_BUFFER_SIZE/PAGE_SIZE;  m++) {
                         if ((void *)NULL != peasycap->field_buffer[k][m].pgo) {
-                                SAY("ERROR: attempting to reallocate " \
+                                SAM("ERROR: attempting to reallocate " \
                                                         "field buffers\n");
                         } else {
                                 pbuf = (void *) __get_free_page(GFP_KERNEL);
                                 if ((void *)NULL == pbuf) {
-                                        SAY("ERROR: Could not allocate field" \
+                                        SAM("ERROR: Could not allocate field" \
                                                 " buffer %i page %i\n", k, m);
                                         return -ENOMEM;
                                         }
@@ -3647,18 +4216,18 @@ case 0: {
         peasycap->field_fill = 0;
         peasycap->field_page = 0;
         peasycap->field_read = 0;
-        JOT(4, "allocation of field buffers done:  %i pages\n", k * \
+        JOM(4, "allocation of field buffers done:  %i pages\n", k * \
                                                                 m);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i isoc video buffers of size %i\n",  \
+        JOM(4, "allocating %i isoc video buffers of size %i\n",  \
                                         VIDEO_ISOC_BUFFER_MANY, \
                                         peasycap->video_isoc_buffer_size);
-        JOT(4, ".... each occupying contiguous memory pages\n");
+        JOM(4, ".... each occupying contiguous memory pages\n");
 
         for (k = 0;  k < VIDEO_ISOC_BUFFER_MANY; k++) {
                 pbuf = (void *)__get_free_pages(GFP_KERNEL, VIDEO_ISOC_ORDER);
                 if (NULL == pbuf) {
-                        SAY("ERROR: Could not allocate isoc video buffer " \
+                        SAM("ERROR: Could not allocate isoc video buffer " \
                                                                 "%i\n", k);
                         return -ENOMEM;
                 } else
@@ -3670,26 +4239,26 @@ case 0: {
                                         peasycap->video_isoc_buffer_size;
                 peasycap->video_isoc_buffer[k].kount = k;
         }
-        JOT(4, "allocation of isoc video buffers done: %i pages\n", \
+        JOM(4, "allocation of isoc video buffers done: %i pages\n", \
                                         k * (0x01 << VIDEO_ISOC_ORDER));
 /*---------------------------------------------------------------------------*/
 /*
  *  ALLOCATE AND INITIALIZE MULTIPLE struct urb ...
  */
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i struct urb.\n", VIDEO_ISOC_BUFFER_MANY);
-        JOT(4, "using %i=peasycap->video_isoc_framesperdesc\n", \
+        JOM(4, "allocating %i struct urb.\n", VIDEO_ISOC_BUFFER_MANY);
+        JOM(4, "using %i=peasycap->video_isoc_framesperdesc\n", \
                                         peasycap->video_isoc_framesperdesc);
-        JOT(4, "using %i=peasycap->video_isoc_maxframesize\n", \
+        JOM(4, "using %i=peasycap->video_isoc_maxframesize\n", \
                                         peasycap->video_isoc_maxframesize);
-        JOT(4, "using %i=peasycap->video_isoc_buffer_sizen", \
+        JOM(4, "using %i=peasycap->video_isoc_buffer_sizen", \
                                         peasycap->video_isoc_buffer_size);
 
         for (k = 0;  k < VIDEO_ISOC_BUFFER_MANY; k++) {
                 purb = usb_alloc_urb(peasycap->video_isoc_framesperdesc, \
                                                                 GFP_KERNEL);
                 if (NULL == purb) {
-                        SAY("ERROR: usb_alloc_urb returned NULL for buffer " \
+                        SAM("ERROR: usb_alloc_urb returned NULL for buffer " \
                                                                 "%i\n", k);
                         return -ENOMEM;
                 } else
@@ -3697,7 +4266,7 @@ case 0: {
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                 pdata_urb = kzalloc(sizeof(struct data_urb), GFP_KERNEL);
                 if (NULL == pdata_urb) {
-                        SAY("ERROR: Could not allocate struct data_urb.\n");
+                        SAM("ERROR: Could not allocate struct data_urb.\n");
                         return -ENOMEM;
                 } else
                         peasycap->allocation_video_struct += \
@@ -3714,30 +4283,30 @@ case 0: {
  */
 /*---------------------------------------------------------------------------*/
                 if (!k) {
-                        JOT(4, "initializing video urbs thus:\n");
-                        JOT(4, "  purb->interval = 1;\n");
-                        JOT(4, "  purb->dev = peasycap->pusb_device;\n");
-                        JOT(4, "  purb->pipe = usb_rcvisocpipe" \
+                        JOM(4, "initializing video urbs thus:\n");
+                        JOM(4, "  purb->interval = 1;\n");
+                        JOM(4, "  purb->dev = peasycap->pusb_device;\n");
+                        JOM(4, "  purb->pipe = usb_rcvisocpipe" \
                                         "(peasycap->pusb_device,%i);\n", \
                                         peasycap->video_endpointnumber);
-                        JOT(4, "  purb->transfer_flags = URB_ISO_ASAP;\n");
-                        JOT(4, "  purb->transfer_buffer = peasycap->" \
+                        JOM(4, "  purb->transfer_flags = URB_ISO_ASAP;\n");
+                        JOM(4, "  purb->transfer_buffer = peasycap->" \
                                         "video_isoc_buffer[.].pgo;\n");
-                        JOT(4, "  purb->transfer_buffer_length = %i;\n", \
+                        JOM(4, "  purb->transfer_buffer_length = %i;\n", \
                                         peasycap->video_isoc_buffer_size);
-                        JOT(4, "  purb->complete = easycap_complete;\n");
-                        JOT(4, "  purb->context = peasycap;\n");
-                        JOT(4, "  purb->start_frame = 0;\n");
-                        JOT(4, "  purb->number_of_packets = %i;\n", \
+                        JOM(4, "  purb->complete = easycap_complete;\n");
+                        JOM(4, "  purb->context = peasycap;\n");
+                        JOM(4, "  purb->start_frame = 0;\n");
+                        JOM(4, "  purb->number_of_packets = %i;\n", \
                                         peasycap->video_isoc_framesperdesc);
-                        JOT(4, "  for (j = 0; j < %i; j++)\n", \
+                        JOM(4, "  for (j = 0; j < %i; j++)\n", \
                                         peasycap->video_isoc_framesperdesc);
-                        JOT(4, "    {\n");
-                        JOT(4, "    purb->iso_frame_desc[j].offset = j*%i;\n",\
+                        JOM(4, "    {\n");
+                        JOM(4, "    purb->iso_frame_desc[j].offset = j*%i;\n",\
                                         peasycap->video_isoc_maxframesize);
-                        JOT(4, "    purb->iso_frame_desc[j].length = %i;\n", \
+                        JOM(4, "    purb->iso_frame_desc[j].length = %i;\n", \
                                         peasycap->video_isoc_maxframesize);
-                        JOT(4, "    }\n");
+                        JOM(4, "    }\n");
                 }
 
                 purb->interval = 1;
@@ -3759,13 +4328,33 @@ case 0: {
                                         peasycap->video_isoc_maxframesize;
                 }
         }
-        JOT(4, "allocation of %i struct urb done.\n", k);
+        JOM(4, "allocation of %i struct urb done.\n", k);
 /*--------------------------------------------------------------------------*/
 /*
  *  SAVE POINTER peasycap IN THIS INTERFACE.
  */
 /*--------------------------------------------------------------------------*/
         usb_set_intfdata(pusb_interface, peasycap);
+/*---------------------------------------------------------------------------*/
+/*
+ *  IT IS ESSENTIAL TO INITIALIZE THE HARDWARE BEFORE, RATHER THAN AFTER,
+ *  THE DEVICE IS REGISTERED, BECAUSE SOME VERSIONS OF THE videodev MODULE
+ *  CALL easycap_open() IMMEDIATELY AFTER REGISTRATION, CAUSING A CLASH.
+ *  BEWARE.
+*/
+/*---------------------------------------------------------------------------*/
+#if defined(PREFER_NTSC)
+        peasycap->ntsc = true;
+        JOM(8, "defaulting initially to NTSC\n");
+#else
+        peasycap->ntsc = false;
+        JOM(8, "defaulting initially to PAL\n");
+#endif /*PREFER_NTSC*/
+        rc = reset(peasycap);
+        if (0 != rc) {
+                SAM("ERROR: reset() returned %i\n", rc);
+                return -EFAULT;
+        }
 /*--------------------------------------------------------------------------*/
 /*
  *  THE VIDEO DEVICE CAN BE REGISTERED NOW, AS IT IS READY.
@@ -3776,48 +4365,58 @@ case 0: {
                 err("Not able to get a minor for this device");
                 usb_set_intfdata(pusb_interface, NULL);
                 return -ENODEV;
-        } else
+        } else {
                 (peasycap->registered_video)++;
-        SAY("easycap attached to minor #%d\n", pusb_interface->minor);
-        break;
-/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
-#else
-        pvideo_device = (struct video_device *)\
-                        kzalloc(sizeof(struct video_device), GFP_KERNEL);
-        if ((struct video_device *)NULL == pvideo_device) {
-                SAY("ERROR: Could not allocate structure video_device\n");
-                return -ENOMEM;
+                SAM("easycap attached to minor #%d\n", pusb_interface->minor);
+                break;
         }
-        if (VIDEO_DEVICE_MANY <= video_device_many) {
-                SAY("ERROR: Too many /dev/videos\n");
-                return -ENOMEM;
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#else
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+        if (0 != (v4l2_device_register(&(pusb_interface->dev), \
+                                                &(peasycap->v4l2_device)))) {
+                SAM("v4l2_device_register() failed\n");
+                return -ENODEV;
+        } else {
+                JOM(4, "registered device instance: %s\n", \
+                                        &(peasycap->v4l2_device.name[0]));
         }
-        pvideo_array[video_device_many] = pvideo_device;  video_device_many++;
+/*---------------------------------------------------------------------------*/
+/*
+ *                                   FIXME
+ *
+ *
+ *  THIS IS BELIEVED TO BE HARMLESS, BUT MAY WELL BE UNNECESSARY OR WRONG:
+*/
+/*---------------------------------------------------------------------------*/
+        peasycap->video_device.v4l2_dev = (struct v4l2_device *)NULL;
+/*---------------------------------------------------------------------------*/
+
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
 
-        strcpy(&pvideo_device->name[0], "easycapdc60");
+        strcpy(&peasycap->video_device.name[0], "easycapdc60");
 #if defined(EASYCAP_NEEDS_V4L2_FOPS)
-        pvideo_device->fops = &v4l2_fops;
+        peasycap->video_device.fops = &v4l2_fops;
 #else
-        pvideo_device->fops = &easycap_fops;
+        peasycap->video_device.fops = &easycap_fops;
 #endif /*EASYCAP_NEEDS_V4L2_FOPS*/
-        pvideo_device->minor = -1;
-        pvideo_device->release = (void *)(&videodev_release);
+        peasycap->video_device.minor = -1;
+        peasycap->video_device.release = (void *)(&videodev_release);
 
-        video_set_drvdata(pvideo_device, (void *)peasycap);
+        video_set_drvdata(&(peasycap->video_device), (void *)peasycap);
 
-        rc = video_register_device(pvideo_device, VFL_TYPE_GRABBER, -1);
-        if (0 != rc) {
+        if (0 != (video_register_device(&(peasycap->video_device), \
+                                                VFL_TYPE_GRABBER, -1))) {
                 err("Not able to register with videodev");
-                videodev_release(pvideo_device);
+                videodev_release(&(peasycap->video_device));
                 return -ENODEV;
         } else {
-                peasycap->pvideo_device = pvideo_device;
                 (peasycap->registered_video)++;
-                JOT(4, "registered with videodev: %i=minor\n", \
-                                                        pvideo_device->minor);
+                SAM("registered with videodev: %i=minor\n", \
+                                                peasycap->video_device.minor);
         }
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
         break;
 }
 /*--------------------------------------------------------------------------*/
@@ -3827,125 +4426,118 @@ case 0: {
  */
 /*--------------------------------------------------------------------------*/
 case 1: {
+        if (!peasycap) {
+                SAM("ERROR: peasycap is NULL\n");
+                return -EFAULT;
+        }
 /*--------------------------------------------------------------------------*/
 /*
  *  SAVE POINTER peasycap IN INTERFACE 1
  */
 /*--------------------------------------------------------------------------*/
         usb_set_intfdata(pusb_interface, peasycap);
-        JOT(4, "no initialization required for interface %i\n", \
+        JOM(4, "no initialization required for interface %i\n", \
                                 pusb_interface_descriptor->bInterfaceNumber);
         break;
 }
 /*--------------------------------------------------------------------------*/
 case 2: {
         if (!peasycap) {
-                SAY("MISTAKE: peasycap is NULL\n");
+                SAM("MISTAKE: peasycap is NULL\n");
                 return -EFAULT;
         }
         if (!isokalt) {
-                SAY("ERROR:  no viable audio_altsetting_on\n");
+                SAM("ERROR:  no viable audio_altsetting_on\n");
                 return -ENOENT;
         } else {
                 peasycap->audio_altsetting_on = okalt[isokalt - 1];
-                JOT(4, "%i=audio_altsetting_on <====\n", \
+                JOM(4, "%i=audio_altsetting_on <====\n", \
                                                 peasycap->audio_altsetting_on);
         }
-        if (!isokepn) {
-                SAY("ERROR:  no viable audio_endpointnumber\n");
+
+        peasycap->audio_endpointnumber = okepn[isokalt - 1];
+        JOM(4, "%i=audio_endpointnumber\n", peasycap->audio_endpointnumber);
+
+        peasycap->audio_isoc_maxframesize = okmps[isokalt - 1];
+        JOM(4, "%i=audio_isoc_maxframesize\n", \
+                                        peasycap->audio_isoc_maxframesize);
+        if (0 >= peasycap->audio_isoc_maxframesize) {
+                SAM("ERROR:  bad audio_isoc_maxframesize\n");
                 return -ENOENT;
-        } else {
-                peasycap->audio_endpointnumber = okepn[isokepn - 1];
-                JOT(4, "%i=audio_endpointnumber\n", \
-                                        peasycap->audio_endpointnumber);
         }
-        if (!isokmps) {
-                SAY("ERROR:  no viable audio_maxpacketsize\n");
-                return -ENOENT;
+        if (9 == peasycap->audio_isoc_maxframesize) {
+                peasycap->ilk |= 0x02;
+                SAM("hardware is FOUR-CVBS\n");
+                peasycap->microphone = true;
+                peasycap->audio_pages_per_fragment = 4;
+        } else if (256 == peasycap->audio_isoc_maxframesize) {
+                peasycap->ilk &= ~0x02;
+                SAM("hardware is CVBS+S-VIDEO\n");
+                peasycap->microphone = false;
+                peasycap->audio_pages_per_fragment = 4;
         } else {
-                peasycap->audio_isoc_maxframesize = okmps[isokmps - 1];
-                JOT(4, "%i=audio_isoc_maxframesize\n", \
-                                        peasycap->audio_isoc_maxframesize);
-                if (0 >= peasycap->audio_isoc_maxframesize) {
-                        SAY("ERROR:  bad audio_isoc_maxframesize\n");
-                        return -ENOENT;
-                }
-                if (9 == peasycap->audio_isoc_maxframesize) {
-                        peasycap->ilk |= 0x02;
-                        SAY("hardware is FOUR-CVBS\n");
-                        peasycap->microphone = true;
-                        peasycap->audio_pages_per_fragment = 4;
-                } else if (256 == peasycap->audio_isoc_maxframesize) {
-                        peasycap->ilk &= ~0x02;
-                        SAY("hardware is CVBS+S-VIDEO\n");
-                        peasycap->microphone = false;
-                        peasycap->audio_pages_per_fragment = 4;
-                } else {
-                        SAY("hardware is unidentified:\n");
-                        SAY("%i=audio_isoc_maxframesize\n", \
+                SAM("hardware is unidentified:\n");
+                SAM("%i=audio_isoc_maxframesize\n", \
                                         peasycap->audio_isoc_maxframesize);
-                        return -ENOENT;
-                }
+                return -ENOENT;
+        }
 
-                peasycap->audio_bytes_per_fragment = \
+        peasycap->audio_bytes_per_fragment = \
                                         peasycap->audio_pages_per_fragment * \
                                                                 PAGE_SIZE ;
-                peasycap->audio_buffer_page_many = (AUDIO_FRAGMENT_MANY * \
+        peasycap->audio_buffer_page_many = (AUDIO_FRAGMENT_MANY * \
                                         peasycap->audio_pages_per_fragment);
 
-                JOT(4, "%6i=AUDIO_FRAGMENT_MANY\n", AUDIO_FRAGMENT_MANY);
-                JOT(4, "%6i=audio_pages_per_fragment\n", \
+        JOM(4, "%6i=AUDIO_FRAGMENT_MANY\n", AUDIO_FRAGMENT_MANY);
+        JOM(4, "%6i=audio_pages_per_fragment\n", \
                                         peasycap->audio_pages_per_fragment);
-                JOT(4, "%6i=audio_bytes_per_fragment\n", \
+        JOM(4, "%6i=audio_bytes_per_fragment\n", \
                                         peasycap->audio_bytes_per_fragment);
-                JOT(4, "%6i=audio_buffer_page_many\n", \
+        JOM(4, "%6i=audio_buffer_page_many\n", \
                                         peasycap->audio_buffer_page_many);
 
-                peasycap->audio_isoc_framesperdesc = 128;
+        peasycap->audio_isoc_framesperdesc = 128;
 
-                JOT(4, "%i=audio_isoc_framesperdesc\n", \
+        JOM(4, "%i=audio_isoc_framesperdesc\n", \
                                         peasycap->audio_isoc_framesperdesc);
-                if (0 >= peasycap->audio_isoc_framesperdesc) {
-                        SAY("ERROR:  bad audio_isoc_framesperdesc\n");
-                        return -ENOENT;
-                }
+        if (0 >= peasycap->audio_isoc_framesperdesc) {
+                SAM("ERROR:  bad audio_isoc_framesperdesc\n");
+                return -ENOENT;
+        }
 
-                peasycap->audio_isoc_buffer_size = \
+        peasycap->audio_isoc_buffer_size = \
                                 peasycap->audio_isoc_maxframesize * \
                                 peasycap->audio_isoc_framesperdesc;
-                JOT(4, "%i=audio_isoc_buffer_size\n", \
+        JOM(4, "%i=audio_isoc_buffer_size\n", \
                                         peasycap->audio_isoc_buffer_size);
-                if (AUDIO_ISOC_BUFFER_SIZE < \
-                                        peasycap->audio_isoc_buffer_size) {
-                        SAY("MISTAKE:  audio_isoc_buffer_size bigger "
+        if (AUDIO_ISOC_BUFFER_SIZE < peasycap->audio_isoc_buffer_size) {
+                        SAM("MISTAKE:  audio_isoc_buffer_size bigger "
                         "than %li=AUDIO_ISOC_BUFFER_SIZE\n", \
                                                 AUDIO_ISOC_BUFFER_SIZE);
-                        return -EFAULT;
-                }
+                return -EFAULT;
         }
-
         if (-1 == peasycap->audio_interface) {
-                SAY("MISTAKE:  audio_interface is unset\n");
+                SAM("MISTAKE:  audio_interface is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->audio_altsetting_on) {
-                SAY("MISTAKE:  audio_altsetting_on is unset\n");
+                SAM("MISTAKE:  audio_altsetting_on is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->audio_altsetting_off) {
-                SAY("MISTAKE:  audio_interface_off is unset\n");
+                SAM("MISTAKE:  audio_interface_off is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->audio_endpointnumber) {
-                SAY("MISTAKE:  audio_endpointnumber is unset\n");
+                SAM("MISTAKE:  audio_endpointnumber is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->audio_isoc_maxframesize) {
-                SAY("MISTAKE:  audio_isoc_maxframesize is unset\n");
+                SAM("MISTAKE:  audio_isoc_maxframesize is unset\n");
                 return -EFAULT;
         }
         if (-1 == peasycap->audio_isoc_buffer_size) {
-                SAY("MISTAKE:  audio_isoc_buffer_size is unset\n");
+                SAM("MISTAKE:  audio_isoc_buffer_size is unset\n");
                 return -EFAULT;
         }
 /*---------------------------------------------------------------------------*/
@@ -3956,17 +4548,17 @@ case 2: {
         INIT_LIST_HEAD(&(peasycap->urb_audio_head));
         peasycap->purb_audio_head = &(peasycap->urb_audio_head);
 
-        JOT(4, "allocating an audio buffer\n");
-        JOT(4, ".... scattered over %i pages\n", \
+        JOM(4, "allocating an audio buffer\n");
+        JOM(4, ".... scattered over %i pages\n", \
                                         peasycap->audio_buffer_page_many);
 
         for (k = 0;  k < peasycap->audio_buffer_page_many;  k++) {
                 if ((void *)NULL != peasycap->audio_buffer[k].pgo) {
-                        SAY("ERROR: attempting to reallocate audio buffers\n");
+                        SAM("ERROR: attempting to reallocate audio buffers\n");
                 } else {
                         pbuf = (void *) __get_free_page(GFP_KERNEL);
                         if ((void *)NULL == pbuf) {
-                                SAY("ERROR: Could not allocate audio " \
+                                SAM("ERROR: Could not allocate audio " \
                                                         "buffer page %i\n", k);
                                 return -ENOMEM;
                         } else
@@ -3979,16 +4571,16 @@ case 2: {
 
         peasycap->audio_fill = 0;
         peasycap->audio_read = 0;
-        JOT(4, "allocation of audio buffer done:  %i pages\n", k);
+        JOM(4, "allocation of audio buffer done:  %i pages\n", k);
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i isoc audio buffers of size %i\n",  \
+        JOM(4, "allocating %i isoc audio buffers of size %i\n",  \
                 AUDIO_ISOC_BUFFER_MANY, peasycap->audio_isoc_buffer_size);
-        JOT(4, ".... each occupying contiguous memory pages\n");
+        JOM(4, ".... each occupying contiguous memory pages\n");
 
         for (k = 0;  k < AUDIO_ISOC_BUFFER_MANY;  k++) {
                 pbuf = (void *)__get_free_pages(GFP_KERNEL, AUDIO_ISOC_ORDER);
                 if (NULL == pbuf) {
-                        SAY("ERROR: Could not allocate isoc audio buffer " \
+                        SAM("ERROR: Could not allocate isoc audio buffer " \
                                                         "%i\n", k);
                         return -ENOMEM;
                 } else
@@ -4000,25 +4592,25 @@ case 2: {
                 peasycap->audio_isoc_buffer_size;
                 peasycap->audio_isoc_buffer[k].kount = k;
         }
-        JOT(4, "allocation of isoc audio buffers done.\n");
+        JOM(4, "allocation of isoc audio buffers done.\n");
 /*---------------------------------------------------------------------------*/
 /*
  *  ALLOCATE AND INITIALIZE MULTIPLE struct urb ...
  */
 /*---------------------------------------------------------------------------*/
-        JOT(4, "allocating %i struct urb.\n", AUDIO_ISOC_BUFFER_MANY);
-        JOT(4, "using %i=peasycap->audio_isoc_framesperdesc\n", \
+        JOM(4, "allocating %i struct urb.\n", AUDIO_ISOC_BUFFER_MANY);
+        JOM(4, "using %i=peasycap->audio_isoc_framesperdesc\n", \
                                         peasycap->audio_isoc_framesperdesc);
-        JOT(4, "using %i=peasycap->audio_isoc_maxframesize\n", \
+        JOM(4, "using %i=peasycap->audio_isoc_maxframesize\n", \
                                         peasycap->audio_isoc_maxframesize);
-        JOT(4, "using %i=peasycap->audio_isoc_buffer_size\n", \
+        JOM(4, "using %i=peasycap->audio_isoc_buffer_size\n", \
                                         peasycap->audio_isoc_buffer_size);
 
         for (k = 0;  k < AUDIO_ISOC_BUFFER_MANY; k++) {
                 purb = usb_alloc_urb(peasycap->audio_isoc_framesperdesc, \
                                                                 GFP_KERNEL);
                 if (NULL == purb) {
-                        SAY("ERROR: usb_alloc_urb returned NULL for buffer " \
+                        SAM("ERROR: usb_alloc_urb returned NULL for buffer " \
                                                         "%i\n", k);
                         return -ENOMEM;
                 } else
@@ -4026,7 +4618,7 @@ case 2: {
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                 pdata_urb = kzalloc(sizeof(struct data_urb), GFP_KERNEL);
                 if (NULL == pdata_urb) {
-                        SAY("ERROR: Could not allocate struct data_urb.\n");
+                        SAM("ERROR: Could not allocate struct data_urb.\n");
                         return -ENOMEM;
                 } else
                         peasycap->allocation_audio_struct += \
@@ -4043,30 +4635,30 @@ case 2: {
  */
 /*---------------------------------------------------------------------------*/
                 if (!k) {
-                        JOT(4, "initializing audio urbs thus:\n");
-                        JOT(4, "  purb->interval = 1;\n");
-                        JOT(4, "  purb->dev = peasycap->pusb_device;\n");
-                        JOT(4, "  purb->pipe = usb_rcvisocpipe(peasycap->" \
+                        JOM(4, "initializing audio urbs thus:\n");
+                        JOM(4, "  purb->interval = 1;\n");
+                        JOM(4, "  purb->dev = peasycap->pusb_device;\n");
+                        JOM(4, "  purb->pipe = usb_rcvisocpipe(peasycap->" \
                                         "pusb_device,%i);\n", \
                                         peasycap->audio_endpointnumber);
-                        JOT(4, "  purb->transfer_flags = URB_ISO_ASAP;\n");
-                        JOT(4, "  purb->transfer_buffer = " \
+                        JOM(4, "  purb->transfer_flags = URB_ISO_ASAP;\n");
+                        JOM(4, "  purb->transfer_buffer = " \
                                 "peasycap->audio_isoc_buffer[.].pgo;\n");
-                        JOT(4, "  purb->transfer_buffer_length = %i;\n", \
+                        JOM(4, "  purb->transfer_buffer_length = %i;\n", \
                                         peasycap->audio_isoc_buffer_size);
-                        JOT(4, "  purb->complete = easysnd_complete;\n");
-                        JOT(4, "  purb->context = peasycap;\n");
-                        JOT(4, "  purb->start_frame = 0;\n");
-                        JOT(4, "  purb->number_of_packets = %i;\n", \
+                        JOM(4, "  purb->complete = easysnd_complete;\n");
+                        JOM(4, "  purb->context = peasycap;\n");
+                        JOM(4, "  purb->start_frame = 0;\n");
+                        JOM(4, "  purb->number_of_packets = %i;\n", \
                                         peasycap->audio_isoc_framesperdesc);
-                        JOT(4, "  for (j = 0; j < %i; j++)\n", \
+                        JOM(4, "  for (j = 0; j < %i; j++)\n", \
                                         peasycap->audio_isoc_framesperdesc);
-                        JOT(4, "    {\n");
-                        JOT(4, "    purb->iso_frame_desc[j].offset = j*%i;\n",\
+                        JOM(4, "    {\n");
+                        JOM(4, "    purb->iso_frame_desc[j].offset = j*%i;\n",\
                                         peasycap->audio_isoc_maxframesize);
-                        JOT(4, "    purb->iso_frame_desc[j].length = %i;\n", \
+                        JOM(4, "    purb->iso_frame_desc[j].length = %i;\n", \
                                         peasycap->audio_isoc_maxframesize);
-                        JOT(4, "    }\n");
+                        JOM(4, "    }\n");
                         }
 
                 purb->interval = 1;
@@ -4088,7 +4680,7 @@ case 2: {
                                         peasycap->audio_isoc_maxframesize;
                 }
         }
-        JOT(4, "allocation of %i struct urb done.\n", k);
+        JOM(4, "allocation of %i struct urb done.\n", k);
 /*---------------------------------------------------------------------------*/
 /*
  *  SAVE POINTER peasycap IN THIS INTERFACE.
@@ -4105,14 +4697,18 @@ case 2: {
                 err("Not able to get a minor for this device.");
                 usb_set_intfdata(pusb_interface, NULL);
                 return -ENODEV;
-        } else
+        } else {
+                JOM(8, "kref_get() with %i=peasycap->kref.refcount.counter\n",\
+                                        (int)peasycap->kref.refcount.counter);
+                kref_get(&peasycap->kref);
                 (peasycap->registered_audio)++;
+        }
 /*---------------------------------------------------------------------------*/
 /*
  *  LET THE USER KNOW WHAT NODE THE AUDIO DEVICE IS ATTACHED TO.
  */
 /*---------------------------------------------------------------------------*/
-        SAY("easysnd attached to minor #%d\n", pusb_interface->minor);
+        SAM("easysnd attached to minor #%d\n", pusb_interface->minor);
         break;
 }
 /*---------------------------------------------------------------------------*/
@@ -4121,20 +4717,19 @@ case 2: {
  */
 /*---------------------------------------------------------------------------*/
 default: {
-        JOT(4, "ERROR: unexpected interface %i\n", bInterfaceNumber);
+        JOM(4, "ERROR: unexpected interface %i\n", bInterfaceNumber);
         return -EINVAL;
 }
 }
-JOT(4, "ends successfully for interface %i\n", \
+JOM(4, "ends successfully for interface %i\n", \
                                 pusb_interface_descriptor->bInterfaceNumber);
 return 0;
 }
 /*****************************************************************************/
 /*---------------------------------------------------------------------------*/
 /*
- *  WHEN THIS FUNCTION IS CALLED THE DEVICE HAS ALREADY BEEN PHYSICALLY
- *  UNPLUGGED.
- *  HENCE peasycap->pusb_device IS NO LONGER VALID AND MUST BE SET TO NULL.
+ *  WHEN THIS FUNCTION IS CALLED THE EasyCAP HAS ALREADY BEEN PHYSICALLY
+ *  UNPLUGGED.  HENCE peasycap->pusb_device IS NO LONGER VALID.
  */
 /*---------------------------------------------------------------------------*/
 void
@@ -4147,7 +4742,14 @@ struct easycap *peasycap;
 
 struct list_head *plist_head;
 struct data_urb *pdata_urb;
-int minor, m;
+int minor, m, kd;
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if defined(EASYCAP_IS_VIDEODEV_CLIENT)
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+struct v4l2_device *pv4l2_device;
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
 
 JOT(4, "\n");
 
@@ -4169,107 +4771,188 @@ bInterfaceNumber = pusb_interface_descriptor->bInterfaceNumber;
 minor = pusb_interface->minor;
 JOT(4, "intf[%i]: minor=%i\n", bInterfaceNumber, minor);
 
+if (1 == bInterfaceNumber)
+        return;
+
 peasycap = usb_get_intfdata(pusb_interface);
-if ((struct easycap *)NULL == peasycap)
+if (NULL == peasycap) {
         SAY("ERROR: peasycap is NULL\n");
-else {
-        peasycap->pusb_device = (struct usb_device *)NULL;
-        switch (bInterfaceNumber) {
-/*---------------------------------------------------------------------------*/
-        case 0: {
-                if ((struct list_head *)NULL != peasycap->purb_video_head) {
-                        JOT(4, "killing video urbs\n");
-                        m = 0;
-                        list_for_each(plist_head, (peasycap->purb_video_head))
-                                {
-                                pdata_urb = list_entry(plist_head, \
-                                                struct data_urb, list_head);
-                                if ((struct data_urb *)NULL != pdata_urb) {
-                                        if ((struct urb *)NULL != \
-                                                        pdata_urb->purb) {
-                                                usb_kill_urb(pdata_urb->purb);
-                                                m++;
-                                        }
+        return;
+}
+/*---------------------------------------------------------------------------*/
+#if (!defined(EASYCAP_IS_VIDEODEV_CLIENT))
+#
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#else
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+/*---------------------------------------------------------------------------*/
+/*
+ *  SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS
+ *  BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(),
+ *  REPLACING IT WITH A POINTER TO THE EMBEDDED v4l2_device STRUCTURE.
+ *  TO DETECT THIS, THE STRING IN THE easycap.telltale[] BUFFER IS CHECKED.
+*/
+/*---------------------------------------------------------------------------*/
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        pv4l2_device = usb_get_intfdata(pusb_interface);
+        if ((struct v4l2_device *)NULL == pv4l2_device) {
+                SAY("ERROR: pv4l2_device is NULL\n");
+                return;
+        }
+        peasycap = (struct easycap *) \
+                container_of(pv4l2_device, struct easycap, v4l2_device);
+}
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+/*---------------------------------------------------------------------------*/
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF THE WAIT QUEUES ARE NOT CLEARED A DEADLOCK IS POSSIBLE.  BEWARE.
+*/
+/*---------------------------------------------------------------------------*/
+peasycap->video_eof = 1;
+peasycap->audio_eof = 1;
+wake_up_interruptible(&(peasycap->wq_video));
+wake_up_interruptible(&(peasycap->wq_audio));
+/*---------------------------------------------------------------------------*/
+switch (bInterfaceNumber) {
+case 0: {
+        if ((struct list_head *)NULL != peasycap->purb_video_head) {
+                JOM(4, "killing video urbs\n");
+                m = 0;
+                list_for_each(plist_head, (peasycap->purb_video_head))
+                        {
+                        pdata_urb = list_entry(plist_head, \
+                                        struct data_urb, list_head);
+                        if ((struct data_urb *)NULL != pdata_urb) {
+                                if ((struct urb *)NULL != \
+                                                pdata_urb->purb) {
+                                        usb_kill_urb(pdata_urb->purb);
+                                        m++;
                                 }
                         }
-                        JOT(4, "%i video urbs killed\n", m);
-                } else
-                        SAY("ERROR: peasycap->purb_video_head is NULL\n");
-                break;
+                }
+                JOM(4, "%i video urbs killed\n", m);
         }
+        break;
+}
 /*---------------------------------------------------------------------------*/
-        case 2: {
-                if ((struct list_head *)NULL != peasycap->purb_audio_head) {
-                        JOT(4, "killing audio urbs\n");
-                        m = 0;
-                        list_for_each(plist_head, \
-                                                (peasycap->purb_audio_head)) {
-                                pdata_urb = list_entry(plist_head, \
-                                                struct data_urb, list_head);
-                                if ((struct data_urb *)NULL != pdata_urb) {
-                                        if ((struct urb *)NULL != \
-                                                        pdata_urb->purb) {
-                                                usb_kill_urb(pdata_urb->purb);
-                                                m++;
-                                        }
+case 2: {
+        if ((struct list_head *)NULL != peasycap->purb_audio_head) {
+                JOM(4, "killing audio urbs\n");
+                m = 0;
+                list_for_each(plist_head, \
+                                        (peasycap->purb_audio_head)) {
+                        pdata_urb = list_entry(plist_head, \
+                                        struct data_urb, list_head);
+                        if ((struct data_urb *)NULL != pdata_urb) {
+                                if ((struct urb *)NULL != \
+                                                pdata_urb->purb) {
+                                        usb_kill_urb(pdata_urb->purb);
+                                        m++;
                                 }
                         }
-                        JOT(4, "%i audio urbs killed\n", m);
-                } else
-                        SAY("ERROR: peasycap->purb_audio_head is NULL\n");
-                break;
+                }
+                JOM(4, "%i audio urbs killed\n", m);
         }
+        break;
+}
 /*---------------------------------------------------------------------------*/
-        default:
-                break;
-        }
+default:
+        break;
 }
 /*--------------------------------------------------------------------------*/
 /*
  *  DEREGISTER
+ *
+ *  THIS PROCEDURE WILL BLOCK UNTIL easycap_poll(), VIDEO IOCTL AND AUDIO
+ *  IOCTL ARE ALL UNLOCKED.  IF THIS IS NOT DONE AN Oops CAN OCCUR WHEN
+ *  AN EasyCAP IS UNPLUGGED WHILE THE URBS ARE RUNNING.  BEWARE.
  */
 /*--------------------------------------------------------------------------*/
+kd = isdongle(peasycap);
 switch (bInterfaceNumber) {
 case 0: {
+        if (0 <= kd && DONGLE_MANY > kd) {
+                wake_up_interruptible(&peasycap->wq_video);
+                JOM(4, "about to lock easycap_dongle[%i].mutex_video\n", kd);
+                if (mutex_lock_interruptible(&easycap_dongle[kd].\
+                                                                mutex_video)) {
+                        SAY("ERROR: cannot lock easycap_dongle[%i]." \
+                                                        "mutex_video\n", kd);
+                        return;
+                }
+                JOM(4, "locked easycap_dongle[%i].mutex_video\n", kd);
+        } else
+                SAY("ERROR: %i=kd is bad: cannot lock dongle\n", kd);
+/*---------------------------------------------------------------------------*/
 #if (!defined(EASYCAP_IS_VIDEODEV_CLIENT))
         if ((struct easycap *)NULL == peasycap) {
-                SAY("ERROR: peasycap has become NULL\n");
+                SAM("ERROR: peasycap has become NULL\n");
         } else {
-                lock_kernel();
                 usb_deregister_dev(pusb_interface, &easycap_class);
                 (peasycap->registered_video)--;
-
-                JOT(4, "intf[%i]: usb_deregister_dev()\n", bInterfaceNumber);
-                unlock_kernel();
-                SAY("easycap detached from minor #%d\n", minor);
+                JOM(4, "intf[%i]: usb_deregister_dev()\n", bInterfaceNumber);
+                SAM("easycap detached from minor #%d\n", minor);
         }
-/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
 #else
-        if ((struct easycap *)NULL == peasycap)
-                SAY("ERROR: peasycap has become NULL\n");
-        else {
-                lock_kernel();
-                video_unregister_device(peasycap->pvideo_device);
-                (peasycap->registered_video)--;
-                unlock_kernel();
-                JOT(4, "unregistered with videodev: %i=minor\n", \
-                                                        pvideo_device->minor);
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+        if (!peasycap->v4l2_device.name[0]) {
+                SAM("ERROR: peasycap->v4l2_device.name is empty\n");
+                if (0 <= kd && DONGLE_MANY > kd)
+                        mutex_unlock(&easycap_dongle[kd].mutex_video);
+                return;
         }
-/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+        v4l2_device_disconnect(&peasycap->v4l2_device);
+        JOM(4, "v4l2_device_disconnect() OK\n");
+        v4l2_device_unregister(&peasycap->v4l2_device);
+        JOM(4, "v4l2_device_unregister() OK\n");
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+
+        video_unregister_device(&peasycap->video_device);
+        JOM(4, "intf[%i]: video_unregister_device() OK\n", bInterfaceNumber);
+        (peasycap->registered_video)--;
+        JOM(4, "unregistered with videodev: %i=minor\n", minor);
 #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+
+        if (0 <= kd && DONGLE_MANY > kd) {
+                mutex_unlock(&easycap_dongle[kd].mutex_video);
+                JOM(4, "unlocked easycap_dongle[%i].mutex_video\n", kd);
+        }
         break;
 }
 case 2: {
-        lock_kernel();
+        if (0 <= kd && DONGLE_MANY > kd) {
+                wake_up_interruptible(&peasycap->wq_audio);
+                JOM(4, "about to lock easycap_dongle[%i].mutex_audio\n", kd);
+                if (mutex_lock_interruptible(&easycap_dongle[kd].\
+                                                                mutex_audio)) {
+                        SAY("ERROR: cannot lock easycap_dongle[%i]." \
+                                                        "mutex_audio\n", kd);
+                        return;
+                }
+                JOM(4, "locked easycap_dongle[%i].mutex_audio\n", kd);
+        } else
+                SAY("ERROR: %i=kd is bad: cannot lock dongle\n", kd);
 
         usb_deregister_dev(pusb_interface, &easysnd_class);
-        if ((struct easycap *)NULL != peasycap)
-                (peasycap->registered_audio)--;
+        (peasycap->registered_audio)--;
 
-        JOT(4, "intf[%i]: usb_deregister_dev()\n", bInterfaceNumber);
-        unlock_kernel();
+        JOM(4, "intf[%i]: usb_deregister_dev()\n", bInterfaceNumber);
+        SAM("easysnd detached from minor #%d\n", minor);
 
-        SAY("easysnd detached from minor #%d\n", minor);
+        if (0 <= kd && DONGLE_MANY > kd) {
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                JOM(4, "unlocked easycap_dongle[%i].mutex_audio\n", kd);
+        }
         break;
 }
 default:
@@ -4280,25 +4963,42 @@ default:
  *  CALL easycap_delete() IF NO REMAINING REFERENCES TO peasycap
  */
 /*---------------------------------------------------------------------------*/
-if ((struct easycap *)NULL == peasycap) {
-        SAY("ERROR: peasycap has become NULL\n");
-        SAY("cannot call kref_put()\n");
-        SAY("ending unsuccessfully: may cause memory leak\n");
-        return;
-}
 if (!peasycap->kref.refcount.counter) {
-        SAY("ERROR: peasycap->kref.refcount.counter is zero " \
+        SAM("ERROR: peasycap->kref.refcount.counter is zero "
                                                 "so cannot call kref_put()\n");
-        SAY("ending unsuccessfully: may cause memory leak\n");
+        SAM("ending unsuccessfully: may cause memory leak\n");
         return;
 }
-JOT(4, "intf[%i]: kref_put() with %i=peasycap->kref.refcount.counter\n", \
+if (0 <= kd && DONGLE_MANY > kd) {
+        JOM(4, "about to lock easycap_dongle[%i].mutex_video\n", kd);
+        if (mutex_lock_interruptible(&easycap_dongle[kd].mutex_video)) {
+                SAY("ERROR: cannot down easycap_dongle[%i].mutex_video\n", kd);
+                SAM("ending unsuccessfully: may cause memory leak\n");
+        return;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_video\n", kd);
+        JOM(4, "about to lock easycap_dongle[%i].mutex_audio\n", kd);
+        if (mutex_lock_interruptible(&easycap_dongle[kd].mutex_audio)) {
+                SAY("ERROR: cannot down easycap_dongle[%i].mutex_audio\n", kd);
+                mutex_unlock(&(easycap_dongle[kd].mutex_video));
+                JOM(4, "unlocked easycap_dongle[%i].mutex_video\n", kd);
+                SAM("ending unsuccessfully: may cause memory leak\n");
+                return;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_audio\n", kd);
+}
+JOM(4, "intf[%i]: %i=peasycap->kref.refcount.counter\n", \
                 bInterfaceNumber, (int)peasycap->kref.refcount.counter);
 kref_put(&peasycap->kref, easycap_delete);
 JOT(4, "intf[%i]: kref_put() done.\n", bInterfaceNumber);
+if (0 <= kd && DONGLE_MANY > kd) {
+        mutex_unlock(&(easycap_dongle[kd].mutex_audio));
+        JOT(4, "unlocked easycap_dongle[%i].mutex_audio\n", kd);
+        mutex_unlock(&easycap_dongle[kd].mutex_video);
+        JOT(4, "unlocked easycap_dongle[%i].mutex_video\n", kd);
+}
 /*---------------------------------------------------------------------------*/
-
-JOT(4, "ends\n");
+JOM(4, "ends\n");
 return;
 }
 /*****************************************************************************/
@@ -4308,7 +5008,8 @@ easycap_module_init(void)
 int result;
 
 SAY("========easycap=======\n");
-JOT(4, "begins.  %i=debug\n", easycap_debug);
+JOT(4, "begins.  %i=debug %i=bars %i=gain\n", easycap_debug, easycap_bars, \
+                                                easycap_gain);
 SAY("version: " EASYCAP_DRIVER_VERSION "\n");
 /*---------------------------------------------------------------------------*/
 /*
@@ -4349,6 +5050,9 @@ MODULE_AUTHOR("R.M. Thomas <rmthomas@sciolus.org>");
 MODULE_DESCRIPTION(EASYCAP_DRIVER_DESCRIPTION);
 MODULE_VERSION(EASYCAP_DRIVER_VERSION);
 #if defined(EASYCAP_DEBUG)
-MODULE_PARM_DESC(easycap_debug, "debug: 0 (default), 1, 2,...");
+MODULE_PARM_DESC(debug, "Debug level: 0(default),1,2,...,9");
 #endif /*EASYCAP_DEBUG*/
+MODULE_PARM_DESC(bars, \
+        "Testcard bars on input signal failure: 0=>no, 1=>yes(default)");
+MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31");
 /*****************************************************************************/
diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/easycap/easycap_settings.c
index 38d94051241d..df3f17d361b1 100644
--- a/drivers/staging/easycap/easycap_settings.c
+++ b/drivers/staging/easycap/easycap_settings.c
@@ -33,11 +33,15 @@
  *  THE LEAST SIGNIFICANT BIT OF easycap_standard.mask HAS MEANING:
  *                         0 => 25 fps
  *                         1 => 30 fps
+ *
+ *  THE MOST  SIGNIFICANT BIT OF easycap_standard.mask HAS MEANING:
+ *                         0 => full framerate
+ *                         1 => 20%  framerate
  */
 /*---------------------------------------------------------------------------*/
 const struct easycap_standard easycap_standard[] = {
 {
-.mask = 0x000F & PAL_BGHIN ,
+.mask = 0x00FF & PAL_BGHIN ,
 .v4l2_standard = {
         .index = PAL_BGHIN,
         .id = (V4L2_STD_PAL_B | V4L2_STD_PAL_G | V4L2_STD_PAL_H | \
@@ -50,7 +54,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & NTSC_N_443 ,
+.mask = 0x00FF & NTSC_N_443 ,
 .v4l2_standard = {
         .index = NTSC_N_443,
         .id = V4L2_STD_UNKNOWN,
@@ -62,7 +66,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & PAL_Nc ,
+.mask = 0x00FF & PAL_Nc ,
 .v4l2_standard = {
         .index = PAL_Nc,
         .id = V4L2_STD_PAL_Nc,
@@ -74,7 +78,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & NTSC_N ,
+.mask = 0x00FF & NTSC_N ,
 .v4l2_standard = {
         .index = NTSC_N,
         .id = V4L2_STD_UNKNOWN,
@@ -86,7 +90,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & SECAM ,
+.mask = 0x00FF & SECAM ,
 .v4l2_standard = {
         .index = SECAM,
         .id = V4L2_STD_SECAM,
@@ -98,7 +102,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & NTSC_M ,
+.mask = 0x00FF & NTSC_M ,
 .v4l2_standard = {
         .index = NTSC_M,
         .id = V4L2_STD_NTSC_M,
@@ -110,7 +114,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & NTSC_M_JP ,
+.mask = 0x00FF & NTSC_M_JP ,
 .v4l2_standard = {
         .index = NTSC_M_JP,
         .id = V4L2_STD_NTSC_M_JP,
@@ -122,7 +126,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & PAL_60 ,
+.mask = 0x00FF & PAL_60 ,
 .v4l2_standard = {
         .index = PAL_60,
         .id = V4L2_STD_PAL_60,
@@ -134,7 +138,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & NTSC_443 ,
+.mask = 0x00FF & NTSC_443 ,
 .v4l2_standard = {
         .index = NTSC_443,
         .id = V4L2_STD_NTSC_443,
@@ -146,7 +150,7 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
-.mask = 0x000F & PAL_M ,
+.mask = 0x00FF & PAL_M ,
 .v4l2_standard = {
         .index = PAL_M,
         .id = V4L2_STD_PAL_M,
@@ -158,6 +162,128 @@ const struct easycap_standard easycap_standard[] = {
 },
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 {
+.mask = 0x8000 | (0x00FF & PAL_BGHIN_SLOW),
+.v4l2_standard = {
+        .index = PAL_BGHIN_SLOW,
+        .id = (V4L2_STD_PAL_B | V4L2_STD_PAL_G | V4L2_STD_PAL_H | \
+                                V4L2_STD_PAL_I | V4L2_STD_PAL_N | \
+                                        (((v4l2_std_id)0x01) << 32)),
+        .name = "PAL_BGHIN_SLOW",
+        .frameperiod = {1, 5},
+        .framelines = 625,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & NTSC_N_443_SLOW),
+.v4l2_standard = {
+        .index = NTSC_N_443_SLOW,
+        .id = (V4L2_STD_UNKNOWN | (((v4l2_std_id)0x11) << 32)),
+        .name = "NTSC_N_443_SLOW",
+        .frameperiod = {1, 5},
+        .framelines = 480,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & PAL_Nc_SLOW),
+.v4l2_standard = {
+        .index = PAL_Nc_SLOW,
+        .id = (V4L2_STD_PAL_Nc | (((v4l2_std_id)0x01) << 32)),
+        .name = "PAL_Nc_SLOW",
+        .frameperiod = {1, 5},
+        .framelines = 625,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & NTSC_N_SLOW),
+.v4l2_standard = {
+        .index = NTSC_N_SLOW,
+        .id = (V4L2_STD_UNKNOWN | (((v4l2_std_id)0x21) << 32)),
+        .name = "NTSC_N_SLOW",
+        .frameperiod = {1, 5},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & SECAM_SLOW),
+.v4l2_standard = {
+        .index = SECAM_SLOW,
+        .id = (V4L2_STD_SECAM | (((v4l2_std_id)0x01) << 32)),
+        .name = "SECAM_SLOW",
+        .frameperiod = {1, 5},
+        .framelines = 625,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & NTSC_M_SLOW),
+.v4l2_standard = {
+        .index = NTSC_M_SLOW,
+        .id = (V4L2_STD_NTSC_M | (((v4l2_std_id)0x01) << 32)),
+        .name = "NTSC_M_SLOW",
+        .frameperiod = {1, 6},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & NTSC_M_JP_SLOW),
+.v4l2_standard = {
+        .index = NTSC_M_JP_SLOW,
+        .id = (V4L2_STD_NTSC_M_JP | (((v4l2_std_id)0x01) << 32)),
+        .name = "NTSC_M_JP_SLOW",
+        .frameperiod = {1, 6},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & PAL_60_SLOW),
+.v4l2_standard = {
+        .index = PAL_60_SLOW,
+        .id = (V4L2_STD_PAL_60 | (((v4l2_std_id)0x01) << 32)),
+        .name = "PAL_60_SLOW",
+        .frameperiod = {1, 6},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & NTSC_443_SLOW),
+.v4l2_standard = {
+        .index = NTSC_443_SLOW,
+        .id = (V4L2_STD_NTSC_443 | (((v4l2_std_id)0x01) << 32)),
+        .name = "NTSC_443_SLOW",
+        .frameperiod = {1, 6},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
+.mask = 0x8000 | (0x00FF & PAL_M_SLOW),
+.v4l2_standard = {
+        .index = PAL_M_SLOW,
+        .id = (V4L2_STD_PAL_M | (((v4l2_std_id)0x01) << 32)),
+        .name = "PAL_M_SLOW",
+        .frameperiod = {1, 6},
+        .framelines = 525,
+        .reserved = {0, 0, 0, 0}
+}
+},
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+{
 .mask = 0xFFFF
 }
 };
@@ -165,15 +291,16 @@ const struct easycap_standard easycap_standard[] = {
 /*
  *  THE 16-BIT easycap_format.mask HAS MEANING:
  *    (least significant) BIT  0:     0 => PAL, 25 FPS;   1 => NTSC, 30 FPS
- *                        BITS 1-3:   RESERVED FOR DIFFERENTIATING STANDARDS
- *                        BITS 4-7:   NUMBER OF BYTES PER PIXEL
+ *                        BITS 2-4:   RESERVED FOR DIFFERENTIATING STANDARDS
+ *                        BITS 5-7:   NUMBER OF BYTES PER PIXEL
  *                        BIT  8:     0 => NATIVE BYTE ORDER;  1 => SWAPPED
  *                        BITS 9-10:  RESERVED FOR OTHER BYTE PERMUTATIONS
- *                        BIT 11:     0 => UNDECIMATED;  1 => DECIMATED
- *                        BIT 12:     0 => OFFER FRAMES; 1 => OFFER FIELDS
- *     (most significant) BITS 13-15: RESERVED FOR OTHER FIELD ORDER OPTIONS
+ *                        BIT 11:     0 => UNDECIMATED;    1 => DECIMATED
+ *                        BIT 12:     0 => OFFER FRAMES;   1 => OFFER FIELDS
+ *                        BIT 13:     0 => FULL FRAMERATE; 1 => REDUCED
+ *     (most significant) BITS 14-15: RESERVED FOR OTHER FIELD/FRAME OPTIONS
  *  IT FOLLOWS THAT:
- *     bytesperpixel IS         ((0x00F0 & easycap_format.mask) >> 4)
+ *     bytesperpixel IS         ((0x00E0 & easycap_format.mask) >> 5)
  *     byteswaporder IS true IF (0 != (0x0100 & easycap_format.mask))
  *
  *     decimatepixel IS true IF (0 != (0x0800 & easycap_format.mask))
@@ -197,65 +324,135 @@ for (i = 0, n = 0; i < STANDARD_MANY; i++) {
         mask1 = 0x0000;
         switch (i) {
         case PAL_BGHIN: {
-                mask1 = PAL_BGHIN;
+                mask1 = 0x1F & PAL_BGHIN;
                 strcpy(&name1[0], "PAL_BGHIN");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
                 break;
         }
         case SECAM: {
-                mask1 = SECAM;
+                mask1 = 0x1F & SECAM;
                 strcpy(&name1[0], "SECAM");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
                 break;
         }
         case PAL_Nc: {
-                mask1 = PAL_Nc;
+                mask1 = 0x1F & PAL_Nc;
                 strcpy(&name1[0], "PAL_Nc");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
                 break;
         }
         case PAL_60: {
-                mask1 = PAL_60;
+                mask1 = 0x1F & PAL_60;
                 strcpy(&name1[0], "PAL_60");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
                 break;
         }
         case PAL_M: {
-                mask1 = PAL_M;
+                mask1 = 0x1F & PAL_M;
                 strcpy(&name1[0], "PAL_M");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
                 break;
         }
         case NTSC_M: {
-                mask1 = NTSC_M;
+                mask1 = 0x1F & NTSC_M;
                 strcpy(&name1[0], "NTSC_M");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
                 break;
         }
         case NTSC_443: {
-                mask1 = NTSC_443;
+                mask1 = 0x1F & NTSC_443;
                 strcpy(&name1[0], "NTSC_443");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
                 break;
         }
         case NTSC_M_JP: {
-                mask1 = NTSC_M_JP;
+                mask1 = 0x1F & NTSC_M_JP;
                 strcpy(&name1[0], "NTSC_M_JP");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
                 break;
         }
         case NTSC_N: {
-                mask1 = NTSC_M;
+                mask1 = 0x1F & NTSC_M;
                 strcpy(&name1[0], "NTSC_N");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
                 break;
         }
         case NTSC_N_443: {
-                mask1 = NTSC_N_443;
+                mask1 = 0x1F & NTSC_N_443;
                 strcpy(&name1[0], "NTSC_N_443");
                 colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
                 break;
         }
+        case PAL_BGHIN_SLOW: {
+                mask1 = 0x001F & PAL_BGHIN_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "PAL_BGHIN_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
+                break;
+        }
+        case SECAM_SLOW: {
+                mask1 = 0x001F & SECAM_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "SECAM_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
+                break;
+        }
+        case PAL_Nc_SLOW: {
+                mask1 = 0x001F & PAL_Nc_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "PAL_Nc_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
+                break;
+        }
+        case PAL_60_SLOW: {
+                mask1 = 0x001F & PAL_60_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "PAL_60_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
+                break;
+        }
+        case PAL_M_SLOW: {
+                mask1 = 0x001F & PAL_M_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "PAL_M_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_BG;
+                break;
+        }
+        case NTSC_M_SLOW: {
+                mask1 = 0x001F & NTSC_M_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "NTSC_M_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
+                break;
+        }
+        case NTSC_443_SLOW: {
+                mask1 = 0x001F & NTSC_443_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "NTSC_443_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
+                break;
+        }
+        case NTSC_M_JP_SLOW: {
+                mask1 = 0x001F & NTSC_M_JP_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "NTSC_M_JP_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
+                break;
+        }
+        case NTSC_N_SLOW: {
+                mask1 = 0x001F & NTSC_N_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "NTSC_N_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
+                break;
+        }
+        case NTSC_N_443_SLOW: {
+                mask1 = 0x001F & NTSC_N_443_SLOW;
+                mask1 |= 0x0200;
+                strcpy(&name1[0], "NTSC_N_443_SLOW");
+                colorspace = V4L2_COLORSPACE_470_SYSTEM_M;
+                break;
+        }
         default:
                 return -1;
         }
@@ -311,39 +508,39 @@ for (i = 0, n = 0; i < STANDARD_MANY; i++) {
                         case FMT_UYVY: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_UYVY));
                                 pixelformat = V4L2_PIX_FMT_UYVY;
-                                mask3 |= (0x02 << 4);
+                                mask3 |= (0x02 << 5);
                                 break;
                         }
                         case FMT_YUY2: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_YUY2));
                                 pixelformat = V4L2_PIX_FMT_YUYV;
-                                mask3 |= (0x02 << 4);
+                                mask3 |= (0x02 << 5);
                                 mask3 |= 0x0100;
                                 break;
                         }
                         case FMT_RGB24: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_RGB24));
                                 pixelformat = V4L2_PIX_FMT_RGB24;
-                                mask3 |= (0x03 << 4);
+                                mask3 |= (0x03 << 5);
                                 break;
                         }
                         case FMT_RGB32: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_RGB32));
                                 pixelformat = V4L2_PIX_FMT_RGB32;
-                                mask3 |= (0x04 << 4);
+                                mask3 |= (0x04 << 5);
                                 break;
                         }
                         case FMT_BGR24: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_BGR24));
                                 pixelformat = V4L2_PIX_FMT_BGR24;
-                                mask3 |= (0x03 << 4);
+                                mask3 |= (0x03 << 5);
                                 mask3 |= 0x0100;
                                 break;
                         }
                         case FMT_BGR32: {
                                 strcpy(&name3[0], "_" STRINGIZE(FMT_BGR32));
                                 pixelformat = V4L2_PIX_FMT_BGR32;
-                                mask3 |= (0x04 << 4);
+                                mask3 |= (0x04 << 5);
                                 mask3 |= 0x0100;
                                 break;
                         }
@@ -363,13 +560,8 @@ for (i = 0, n = 0; i < STANDARD_MANY; i++) {
                                 }
                                 case FIELD_INTERLACED: {
                                         strcpy(&name4[0], "-i");
-                                        field = V4L2_FIELD_INTERLACED;
-                                        break;
-                                }
-                                case FIELD_ALTERNATE: {
-                                        strcpy(&name4[0], "-a");
                                         mask4 |= 0x1000;
-                                        field = V4L2_FIELD_ALTERNATE;
+                                        field = V4L2_FIELD_INTERLACED;
                                         break;
                                 }
                                 default:
@@ -413,7 +605,7 @@ return n;
 }
 /*---------------------------------------------------------------------------*/
 struct v4l2_queryctrl easycap_control[] = \
- {{
+{{
 .id       = V4L2_CID_BRIGHTNESS,
 .type     = V4L2_CTRL_TYPE_INTEGER,
 .name     = "Brightness",
@@ -485,5 +677,5 @@ struct v4l2_queryctrl easycap_control[] = \
 {
 .id = 0xFFFFFFFF
 }
- };
+};
 /*****************************************************************************/
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c
index 63562bda738e..24d8bb4e449e 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/easycap/easycap_sound.c
@@ -36,17 +36,15 @@
 /*---------------------------------------------------------------------------*/
 /*
  *  ON COMPLETION OF AN AUDIO URB ITS DATA IS COPIED TO THE AUDIO BUFFERS
- *  PROVIDED peasycap->audio_idle IS ZER0.  REGARDLESS OF THIS BEING TRUE,
+ *  PROVIDED peasycap->audio_idle IS ZERO.  REGARDLESS OF THIS BEING TRUE,
  *  IT IS RESUBMITTED PROVIDED peasycap->audio_isoc_streaming IS NOT ZERO.
  */
 /*---------------------------------------------------------------------------*/
 void
 easysnd_complete(struct urb *purb)
 {
-static int mt;
 struct easycap *peasycap;
 struct data_buffer *paudio_buffer;
-char errbuf[16];
 __u8 *p1, *p2;
 __s16 s16;
 int i, j, more, much, leap, rc;
@@ -66,48 +64,62 @@ if (NULL == peasycap) {
         SAY("ERROR: peasycap is NULL\n");
         return;
 }
-much = 0;
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap\n");
+        return;
+}
 
+much = 0;
 
 if (peasycap->audio_idle) {
-        JOT(16, "%i=audio_idle  %i=audio_isoc_streaming\n", \
+        JOM(16, "%i=audio_idle  %i=audio_isoc_streaming\n", \
                         peasycap->audio_idle, peasycap->audio_isoc_streaming);
         if (peasycap->audio_isoc_streaming) {
                 rc = usb_submit_urb(purb, GFP_ATOMIC);
                 if (0 != rc) {
-                        SAY("ERROR: while %i=audio_idle, " \
+                        if (-ENODEV != rc)
+                                SAM("ERROR: while %i=audio_idle, " \
                                         "usb_submit_urb() failed with rc:\n", \
                                                         peasycap->audio_idle);
                         switch (rc) {
                         case -ENOMEM: {
-                                SAY("ENOMEM\n");    break;
+                                SAM("-ENOMEM\n");
+                                break;
                         }
                         case -ENODEV: {
-                                SAY("ENODEV\n");    break;
+                                break;
                         }
                         case -ENXIO: {
-                                SAY("ENXIO\n");     break;
+                                SAM("-ENXIO\n");
+                                break;
                         }
                         case -EINVAL: {
-                                SAY("EINVAL\n");    break;
+                                SAM("-EINVAL\n");
+                                break;
                         }
                         case -EAGAIN: {
-                                SAY("EAGAIN\n");    break;
+                                SAM("-EAGAIN\n");
+                                break;
                         }
                         case -EFBIG: {
-                                SAY("EFBIG\n");     break;
+                                SAM("-EFBIG\n");
+                                break;
                         }
                         case -EPIPE: {
-                                SAY("EPIPE\n");     break;
+                                SAM("-EPIPE\n");
+                                break;
                         }
                         case -EMSGSIZE: {
-                                SAY("EMSGSIZE\n");  break;
+                                SAM("-EMSGSIZE\n");
+                                break;
                         }
                         case -ENOSPC: {
-                                SAY("ENOSPC\n");  break;
+                                SAM("-ENOSPC\n");
+                                break;
                         }
                         default: {
-                                SAY("0x%08X\n", rc); break;
+                                SAM("unknown error: 0x%08X\n", rc);
+                                break;
                         }
                         }
                 }
@@ -116,74 +128,95 @@ return;
 }
 /*---------------------------------------------------------------------------*/
 if (purb->status) {
-        if (-ESHUTDOWN == purb->status) {
-                JOT(16, "immediate return because -ESHUTDOWN=purb->status\n");
+        if ((-ESHUTDOWN == purb->status) || (-ENOENT == purb->status)) {
+                JOM(16, "urb status -ESHUTDOWN or -ENOENT\n");
                 return;
         }
-        SAY("ERROR: non-zero urb status:\n");
+        SAM("ERROR: non-zero urb status:\n");
         switch (purb->status) {
         case -EINPROGRESS: {
-                SAY("-EINPROGRESS\n"); break;
+                SAM("-EINPROGRESS\n");
+                break;
         }
         case -ENOSR: {
-                SAY("-ENOSR\n"); break;
+                SAM("-ENOSR\n");
+                break;
         }
         case -EPIPE: {
-                SAY("-EPIPE\n"); break;
+                SAM("-EPIPE\n");
+                break;
         }
         case -EOVERFLOW: {
-                SAY("-EOVERFLOW\n"); break;
+                SAM("-EOVERFLOW\n");
+                break;
         }
         case -EPROTO: {
-                SAY("-EPROTO\n"); break;
+                SAM("-EPROTO\n");
+                break;
         }
         case -EILSEQ: {
-                SAY("-EILSEQ\n"); break;
+                SAM("-EILSEQ\n");
+                break;
         }
         case -ETIMEDOUT: {
-                SAY("-ETIMEDOUT\n"); break;
+                SAM("-ETIMEDOUT\n");
+                break;
         }
         case -EMSGSIZE: {
-                SAY("-EMSGSIZE\n"); break;
+                SAM("-EMSGSIZE\n");
+                break;
         }
         case -EOPNOTSUPP: {
-                SAY("-EOPNOTSUPP\n"); break;
+                SAM("-EOPNOTSUPP\n");
+                break;
         }
         case -EPFNOSUPPORT: {
-                SAY("-EPFNOSUPPORT\n"); break;
+                SAM("-EPFNOSUPPORT\n");
+                break;
         }
         case -EAFNOSUPPORT: {
-                SAY("-EAFNOSUPPORT\n"); break;
+                SAM("-EAFNOSUPPORT\n");
+                break;
         }
         case -EADDRINUSE: {
-                SAY("-EADDRINUSE\n"); break;
+                SAM("-EADDRINUSE\n");
+                break;
         }
         case -EADDRNOTAVAIL: {
-                SAY("-EADDRNOTAVAIL\n"); break;
+                SAM("-EADDRNOTAVAIL\n");
+                break;
         }
         case -ENOBUFS: {
-                SAY("-ENOBUFS\n"); break;
+                SAM("-ENOBUFS\n");
+                break;
         }
         case -EISCONN: {
-                SAY("-EISCONN\n"); break;
+                SAM("-EISCONN\n");
+                break;
         }
         case -ENOTCONN: {
-                SAY("-ENOTCONN\n"); break;
+                SAM("-ENOTCONN\n");
+                break;
         }
         case -ESHUTDOWN: {
-                SAY("-ESHUTDOWN\n"); break;
+                SAM("-ESHUTDOWN\n");
+                break;
         }
         case -ENOENT: {
-                SAY("-ENOENT\n"); break;
+                SAM("-ENOENT\n");
+                break;
         }
         case -ECONNRESET: {
-                SAY("-ECONNRESET\n"); break;
+                SAM("-ECONNRESET\n");
+                break;
         }
         case -ENOSPC: {
-                SAY("ENOSPC\n");  break;
+                SAM("ENOSPC\n");
+                break;
         }
         default: {
-                SAY("unknown error code 0x%08X\n", purb->status); break;
+                SAM("unknown error code 0x%08X\n", purb->status);
+                break;
         }
         }
 /*---------------------------------------------------------------------------*/
@@ -196,35 +229,43 @@ if (purb->status) {
         if (peasycap->audio_isoc_streaming) {
                 rc = usb_submit_urb(purb, GFP_ATOMIC);
                 if (0 != rc) {
-                        SAY("ERROR: while %i=audio_idle, usb_submit_urb() "
+                        SAM("ERROR: while %i=audio_idle, usb_submit_urb() "
                                 "failed with rc:\n", peasycap->audio_idle);
                         switch (rc) {
                         case -ENOMEM: {
-                                SAY("ENOMEM\n");    break;
+                                SAM("-ENOMEM\n");
+                                break;
                         }
                         case -ENODEV: {
-                                SAY("ENODEV\n");    break;
+                                SAM("-ENODEV\n");
+                                break;
                         }
                         case -ENXIO: {
-                                SAY("ENXIO\n");     break;
+                                SAM("-ENXIO\n");
+                                break;
                         }
                         case -EINVAL: {
-                                SAY("EINVAL\n");    break;
+                                SAM("-EINVAL\n");
+                                break;
                         }
                         case -EAGAIN: {
-                                SAY("EAGAIN\n");    break;
+                                SAM("-EAGAIN\n");
+                                break;
                         }
                         case -EFBIG: {
-                                SAY("EFBIG\n");     break;
+                                SAM("-EFBIG\n");
+                                break;
                         }
                         case -EPIPE: {
-                                SAY("EPIPE\n");     break;
+                                SAM("-EPIPE\n");
+                                break;
                         }
                         case -EMSGSIZE: {
-                                SAY("EMSGSIZE\n");  break;
+                                SAM("-EMSGSIZE\n");
+                                break;
                         }
                         default: {
-                                SAY("0x%08X\n", rc); break;
+                                SAM("0x%08X\n", rc); break;
                         }
                         }
                 }
@@ -243,72 +284,80 @@ oldaudio = peasycap->oldaudio;
 for (i = 0;  i < purb->number_of_packets; i++) {
         switch (purb->iso_frame_desc[i].status) {
         case  0: {
-                strcpy(&errbuf[0], "OK"); break;
+                break;
         }
         case -ENOENT: {
-                strcpy(&errbuf[0], "-ENOENT"); break;
+                SAM("-ENOENT\n");
+                break;
         }
         case -EINPROGRESS: {
-                strcpy(&errbuf[0], "-EINPROGRESS"); break;
+                SAM("-EINPROGRESS\n");
+                break;
         }
         case -EPROTO: {
-                strcpy(&errbuf[0], "-EPROTO"); break;
+                SAM("-EPROTO\n");
+                break;
         }
         case -EILSEQ: {
-                strcpy(&errbuf[0], "-EILSEQ"); break;
+                SAM("-EILSEQ\n");
+                break;
         }
         case -ETIME: {
-                strcpy(&errbuf[0], "-ETIME"); break;
+                SAM("-ETIME\n");
+                break;
         }
         case -ETIMEDOUT: {
-                strcpy(&errbuf[0], "-ETIMEDOUT"); break;
+                SAM("-ETIMEDOUT\n");
+                break;
         }
         case -EPIPE: {
-                strcpy(&errbuf[0], "-EPIPE"); break;
+                SAM("-EPIPE\n");
+                break;
         }
         case -ECOMM: {
-                strcpy(&errbuf[0], "-ECOMM"); break;
+                SAM("-ECOMM\n");
+                break;
         }
         case -ENOSR: {
-                strcpy(&errbuf[0], "-ENOSR"); break;
+                SAM("-ENOSR\n");
+                break;
         }
         case -EOVERFLOW: {
-                strcpy(&errbuf[0], "-EOVERFLOW"); break;
+                SAM("-EOVERFLOW\n");
+                break;
         }
         case -EREMOTEIO: {
-                strcpy(&errbuf[0], "-EREMOTEIO"); break;
+                SAM("-EREMOTEIO\n");
+                break;
         }
         case -ENODEV: {
-                strcpy(&errbuf[0], "-ENODEV"); break;
+                SAM("-ENODEV\n");
+                break;
         }
         case -EXDEV: {
-                strcpy(&errbuf[0], "-EXDEV"); break;
+                SAM("-EXDEV\n");
+                break;
         }
         case -EINVAL: {
-                strcpy(&errbuf[0], "-EINVAL"); break;
+                SAM("-EINVAL\n");
+                break;
         }
         case -ECONNRESET: {
-                strcpy(&errbuf[0], "-ECONNRESET"); break;
+                SAM("-ECONNRESET\n");
+                break;
         }
         case -ENOSPC: {
-                strcpy(&errbuf[0], "-ENOSPC"); break;
+                SAM("-ENOSPC\n");
+                break;
         }
         case -ESHUTDOWN: {
-                strcpy(&errbuf[0], "-ESHUTDOWN"); break;
+                SAM("-ESHUTDOWN\n");
+                break;
         }
         default: {
-                strcpy(&errbuf[0], "UNKNOWN"); break;
-        }
+                SAM("unknown error:0x%08X\n", purb->iso_frame_desc[i].status);
+                break;
         }
-        if ((!purb->iso_frame_desc[i].status) && 0) {
-                JOT(16, "frame[%2i]: %i=status{=%16s}  "  \
-                                                "%5i=actual  "  \
-                                                "%5i=length  "  \
-                                                "%3i=offset\n", \
-                                i, purb->iso_frame_desc[i].status, &errbuf[0],
-                                purb->iso_frame_desc[i].actual_length,
-                                purb->iso_frame_desc[i].length,
-                                purb->iso_frame_desc[i].offset);
         }
         if (!purb->iso_frame_desc[i].status) {
                 more = purb->iso_frame_desc[i].actual_length;
@@ -319,11 +368,12 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 #endif
 
                 if (!more)
-                        mt++;
+                        peasycap->audio_mt++;
                 else {
-                        if (mt) {
-                                JOT(16, "%4i empty audio urb frames\n", mt);
-                                mt = 0;
+                        if (peasycap->audio_mt) {
+                                JOM(16, "%4i empty audio urb frames\n", \
+                                                        peasycap->audio_mt);
+                                peasycap->audio_mt = 0;
                         }
 
                         p1 = (__u8 *)(purb->transfer_buffer + \
@@ -340,13 +390,13 @@ for (i = 0;  i < purb->number_of_packets; i++) {
 /*---------------------------------------------------------------------------*/
                         while (more) {
                                 if (0 > more) {
-                                        SAY("easysnd_complete: MISTAKE: " \
+                                        SAM("easysnd_complete: MISTAKE: " \
                                                         "more is negative\n");
                                         return;
                                 }
                                 if (peasycap->audio_buffer_page_many <= \
                                                         peasycap->audio_fill) {
-                                        SAY("ERROR: bad " \
+                                        SAM("ERROR: bad " \
                                                 "peasycap->audio_fill\n");
                                         return;
                                 }
@@ -355,7 +405,7 @@ for (i = 0;  i < purb->number_of_packets; i++) {
                                                         [peasycap->audio_fill];
                                 if (PAGE_SIZE < (paudio_buffer->pto - \
                                                 paudio_buffer->pgo)) {
-                                        SAY("ERROR: bad paudio_buffer->pto\n");
+                                        SAM("ERROR: bad paudio_buffer->pto\n");
                                         return;
                                 }
                                 if (PAGE_SIZE == (paudio_buffer->pto - \
@@ -374,7 +424,7 @@ for (i = 0;  i < purb->number_of_packets; i++) {
                                                         peasycap->audio_fill)
                                                 peasycap->audio_fill = 0;
 
-                                        JOT(12, "bumped peasycap->" \
+                                        JOM(12, "bumped peasycap->" \
                                                         "audio_fill to %i\n", \
                                                         peasycap->audio_fill);
 
@@ -387,7 +437,7 @@ for (i = 0;  i < purb->number_of_packets; i++) {
                                         if (!(peasycap->audio_fill % \
                                                 peasycap->\
                                                 audio_pages_per_fragment)) {
-                                                JOT(12, "wakeup call on wq_" \
+                                                JOM(12, "wakeup call on wq_" \
                                                 "audio, %i=frag reading  %i" \
                                                 "=fragment fill\n", \
                                                 (peasycap->audio_read / \
@@ -414,7 +464,7 @@ for (i = 0;  i < purb->number_of_packets; i++) {
                                 } else {
 #if defined(UPSAMPLE)
                                         if (much % 16)
-                                                JOT(8, "MISTAKE? much" \
+                                                JOM(8, "MISTAKE? much" \
                                                 " is not divisible by 16\n");
                                         if (much > (16 * \
                                                         more))
@@ -468,7 +518,7 @@ for (i = 0;  i < purb->number_of_packets; i++) {
                         }
                 }
         } else {
-                JOT(12, "discarding audio samples because " \
+                JOM(12, "discarding audio samples because " \
                         "%i=purb->iso_frame_desc[i].status\n", \
                                 purb->iso_frame_desc[i].status);
         }
@@ -486,38 +536,50 @@ peasycap->oldaudio = oldaudio;
 if (peasycap->audio_isoc_streaming) {
         rc = usb_submit_urb(purb, GFP_ATOMIC);
         if (0 != rc) {
-                SAY("ERROR: while %i=audio_idle, usb_submit_urb() failed " \
+                if (-ENODEV != rc) {
+                        SAM("ERROR: while %i=audio_idle, " \
+                                        "usb_submit_urb() failed " \
                                         "with rc:\n", peasycap->audio_idle);
+                }
                 switch (rc) {
                 case -ENOMEM: {
-                        SAY("ENOMEM\n");    break;
+                        SAM("-ENOMEM\n");
+                        break;
                 }
                 case -ENODEV: {
-                        SAY("ENODEV\n");    break;
+                        break;
                 }
                 case -ENXIO: {
-                        SAY("ENXIO\n");     break;
+                        SAM("-ENXIO\n");
+                        break;
                 }
                 case -EINVAL: {
-                        SAY("EINVAL\n");    break;
+                        SAM("-EINVAL\n");
+                        break;
                 }
                 case -EAGAIN: {
-                        SAY("EAGAIN\n");    break;
+                        SAM("-EAGAIN\n");
+                        break;
                 }
                 case -EFBIG: {
-                        SAY("EFBIG\n");     break;
+                        SAM("-EFBIG\n");
+                        break;
                 }
                 case -EPIPE: {
-                        SAY("EPIPE\n");     break;
+                        SAM("-EPIPE\n");
+                        break;
                 }
                 case -EMSGSIZE: {
-                        SAY("EMSGSIZE\n");  break;
+                        SAM("-EMSGSIZE\n");
+                        break;
                 }
                 case -ENOSPC: {
-                        SAY("ENOSPC\n");  break;
+                        SAM("-ENOSPC\n");
+                        break;
                 }
                 default: {
-                        SAY("0x%08X\n", rc); break;
+                        SAM("unknown error: 0x%08X\n", rc);
+                        break;
                 }
                 }
         }
@@ -529,8 +591,7 @@ return;
 /*
  *  THE AUDIO URBS ARE SUBMITTED AT THIS EARLY STAGE SO THAT IT IS POSSIBLE TO
  *  STREAM FROM /dev/easysnd1 WITH SIMPLE PROGRAMS SUCH AS cat WHICH DO NOT
- *  HAVE AN IOCTL INTERFACE.  THE VIDEO URBS, BY CONTRAST, MUST BE SUBMITTED
- *  MUCH LATER: SEE COMMENTS IN FILE easycap_main.c.
+ *  HAVE AN IOCTL INTERFACE.
  */
 /*---------------------------------------------------------------------------*/
 int
@@ -539,8 +600,15 @@ easysnd_open(struct inode *inode, struct file *file)
 struct usb_interface *pusb_interface;
 struct easycap *peasycap;
 int subminor, rc;
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#if defined(EASYCAP_IS_VIDEODEV_CLIENT)
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+struct v4l2_device *pv4l2_device;
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
 
-JOT(4, "begins.\n");
+JOT(4, "begins\n");
 
 subminor = iminor(inode);
 
@@ -556,70 +624,90 @@ if (NULL == peasycap) {
         SAY("ending unsuccessfully\n");
         return -1;
 }
+/*---------------------------------------------------------------------------*/
+#if (!defined(EASYCAP_IS_VIDEODEV_CLIENT))
+#
+/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
+#else
+#if defined(EASYCAP_NEEDS_V4L2_DEVICE_H)
+/*---------------------------------------------------------------------------*/
+/*
+ *  SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS
+ *  BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(),
+ *  REPLACING IT WITH A POINTER TO THE EMBEDDED v4l2_device STRUCTURE.
+ *  TO DETECT THIS, THE STRING IN THE easycap.telltale[] BUFFER IS CHECKED.
+*/
+/*---------------------------------------------------------------------------*/
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        pv4l2_device = usb_get_intfdata(pusb_interface);
+        if ((struct v4l2_device *)NULL == pv4l2_device) {
+                SAY("ERROR: pv4l2_device is NULL\n");
+                return -EFAULT;
+        }
+        peasycap = (struct easycap *) \
+                container_of(pv4l2_device, struct easycap, v4l2_device);
+}
+#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/
+#
+#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
+/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
+/*---------------------------------------------------------------------------*/
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
+/*---------------------------------------------------------------------------*/
 
 file->private_data = peasycap;
 
 /*---------------------------------------------------------------------------*/
 /*
- *  INITIALIZATION.
+ *  INITIALIZATION
  */
 /*---------------------------------------------------------------------------*/
-JOT(4, "starting initialization\n");
+JOM(4, "starting initialization\n");
 
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
-        return -EFAULT;
-} else {
-        JOT(16, "0x%08lX=peasycap->pusb_device\n", \
-                                        (long int)peasycap->pusb_device);
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
+        return -ENODEV;
 }
+JOM(16, "0x%08lX=peasycap->pusb_device\n", (long int)peasycap->pusb_device);
 
 rc = audio_setup(peasycap);
 if (0 <= rc)
-        JOT(8, "audio_setup() returned %i\n", rc);
+        JOM(8, "audio_setup() returned %i\n", rc);
 else
-        JOT(8, "easysnd open(): ERROR: audio_setup() returned %i\n", rc);
+        JOM(8, "easysnd open(): ERROR: audio_setup() returned %i\n", rc);
 
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device has become NULL\n");
-        return -EFAULT;
-}
-rc = adjust_volume(peasycap, -8192);
-if (0 != rc) {
-        SAY("ERROR: adjust_volume(default) returned %i\n", rc);
-        return -EFAULT;
+        SAM("ERROR: peasycap->pusb_device has become NULL\n");
+        return -ENODEV;
 }
 /*---------------------------------------------------------------------------*/
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device has become NULL\n");
-        return -EFAULT;
+        SAM("ERROR: peasycap->pusb_device has become NULL\n");
+        return -ENODEV;
 }
 rc = usb_set_interface(peasycap->pusb_device, peasycap->audio_interface, \
                                         peasycap->audio_altsetting_on);
-JOT(8, "usb_set_interface(.,%i,%i) returned %i\n", peasycap->audio_interface, \
+JOM(8, "usb_set_interface(.,%i,%i) returned %i\n", peasycap->audio_interface, \
                                         peasycap->audio_altsetting_on, rc);
 
-if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device has become NULL\n");
-        return -EFAULT;
-}
 rc = wakeup_device(peasycap->pusb_device);
 if (0 == rc)
-        JOT(8, "wakeup_device() returned %i\n", rc);
+        JOM(8, "wakeup_device() returned %i\n", rc);
 else
-        JOT(8, "easysnd open(): ERROR: wakeup_device() returned %i\n", rc);
+        JOM(8, "ERROR: wakeup_device() returned %i\n", rc);
 
-if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device has become NULL\n");
-        return -EFAULT;
-}
-submit_audio_urbs(peasycap);
+peasycap->audio_eof = 0;
 peasycap->audio_idle = 0;
 
 peasycap->timeval1.tv_sec  = 0;
 peasycap->timeval1.tv_usec = 0;
 
-JOT(4, "finished initialization\n");
+submit_audio_urbs(peasycap);
+
+JOM(4, "finished initialization\n");
 return 0;
 }
 /*****************************************************************************/
@@ -635,11 +723,15 @@ if (NULL == peasycap) {
         SAY("ERROR:  peasycap is NULL.\n");
         return -EFAULT;
 }
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
 if (0 != kill_audio_urbs(peasycap)) {
-        SAY("ERROR: kill_audio_urbs() failed\n");
+        SAM("ERROR: kill_audio_urbs() failed\n");
         return -EFAULT;
 }
-JOT(4, "ending successfully\n");
+JOM(4, "ending successfully\n");
 return 0;
 }
 /*****************************************************************************/
@@ -648,12 +740,11 @@ easysnd_read(struct file *file, char __user *puserspacebuffer, \
                                                 size_t kount, loff_t *poff)
 {
 struct timeval timeval;
-static struct timeval timeval1;
-static long long int audio_bytes, above, below, mean;
+long long int above, below, mean;
 struct signed_div_result sdr;
 unsigned char *p0;
 long int kount1, more, rc, l0, lm;
-int fragment;
+int fragment, kd;
 struct easycap *peasycap;
 struct data_buffer *pdata_buffer;
 size_t szret;
@@ -671,23 +762,89 @@ size_t szret;
 
 JOT(8, "===== easysnd_read(): kount=%i, *poff=%i\n", (int)kount, (int)(*poff));
 
-peasycap = (struct easycap *)(file->private_data);
+if (NULL == file) {
+        SAY("ERROR:  file is NULL\n");
+        return -ERESTARTSYS;
+}
+peasycap = file->private_data;
 if (NULL == peasycap) {
         SAY("ERROR in easysnd_read(): peasycap is NULL\n");
         return -EFAULT;
 }
+if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+        SAY("ERROR: bad peasycap: 0x%08lX\n", (unsigned long int) peasycap);
+        return -EFAULT;
+}
+if (NULL == peasycap->pusb_device) {
+        SAY("ERROR in easysnd_read(): peasycap->pusb_device is NULL\n");
+        return -EFAULT;
+}
+kd = isdongle(peasycap);
+if (0 <= kd && DONGLE_MANY > kd) {
+        if (mutex_lock_interruptible(&(easycap_dongle[kd].mutex_audio))) {
+                SAY("ERROR: cannot lock easycap_dongle[%i].mutex_audio\n", kd);
+                return -ERESTARTSYS;
+        }
+        JOM(4, "locked easycap_dongle[%i].mutex_audio\n", kd);
 /*---------------------------------------------------------------------------*/
+/*
+ *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,
+ *  IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
+ *  IF NECESSARY, BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        if (kd != isdongle(peasycap))
+                return -ERESTARTSYS;
+        if (NULL == file) {
+                SAY("ERROR:  file is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+        peasycap = file->private_data;
+        if (NULL == peasycap) {
+                SAY("ERROR:  peasycap is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+        if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
+                SAY("ERROR: bad peasycap: 0x%08lX\n", \
+                                                (unsigned long int) peasycap);
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+        if (NULL == peasycap->pusb_device) {
+                SAM("ERROR: peasycap->pusb_device is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
+                return -ERESTARTSYS;
+        }
+} else {
+/*---------------------------------------------------------------------------*/
+/*
+ *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE
+ *  ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED.  BAIL OUT.
+*/
+/*---------------------------------------------------------------------------*/
+        return -ERESTARTSYS;
+}
+/*---------------------------------------------------------------------------*/
+if (file->f_flags & O_NONBLOCK)
+        JOT(16, "NONBLOCK  kount=%i, *poff=%i\n", (int)kount, (int)(*poff));
+else
+        JOT(8, "BLOCKING  kount=%i, *poff=%i\n", (int)kount, (int)(*poff));
+
 if ((0 > peasycap->audio_read) || \
                 (peasycap->audio_buffer_page_many <= peasycap->audio_read)) {
-        SAY("ERROR: peasycap->audio_read out of range\n");
+        SAM("ERROR: peasycap->audio_read out of range\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_audio);
         return -EFAULT;
 }
 pdata_buffer = &peasycap->audio_buffer[peasycap->audio_read];
 if ((struct data_buffer *)NULL == pdata_buffer) {
-        SAY("ERROR: pdata_buffer is NULL\n");
+        SAM("ERROR: pdata_buffer is NULL\n");
+        mutex_unlock(&easycap_dongle[kd].mutex_audio);
         return -EFAULT;
 }
-JOT(12, "before wait, %i=frag read  %i=frag fill\n", \
+JOM(12, "before wait, %i=frag read  %i=frag fill\n", \
                 (peasycap->audio_read / peasycap->audio_pages_per_fragment), \
                 (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
 fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment);
@@ -695,7 +852,8 @@ while ((fragment == (peasycap->audio_fill / \
                                 peasycap->audio_pages_per_fragment)) || \
                 (0 == (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo)))) {
         if (file->f_flags & O_NONBLOCK) {
-                JOT(16, "returning -EAGAIN as instructed\n");
+                JOM(16, "returning -EAGAIN as instructed\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EAGAIN;
         }
         rc = wait_event_interruptible(peasycap->wq_audio, \
@@ -704,50 +862,56 @@ while ((fragment == (peasycap->audio_fill / \
                                 peasycap->audio_pages_per_fragment)) && \
                 (0 < (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo))))));
         if (0 != rc) {
-                SAY("aborted by signal\n");
+                SAM("aborted by signal\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -ERESTARTSYS;
         }
         if (peasycap->audio_eof) {
-                JOT(8, "returning 0 because  %i=audio_eof\n", \
+                JOM(8, "returning 0 because  %i=audio_eof\n", \
                                                         peasycap->audio_eof);
                 kill_audio_urbs(peasycap);
-                msleep(500);
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return 0;
         }
         if (peasycap->audio_idle) {
-                JOT(16, "returning 0 because  %i=audio_idle\n", \
+                JOM(16, "returning 0 because  %i=audio_idle\n", \
                                                         peasycap->audio_idle);
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return 0;
         }
         if (!peasycap->audio_isoc_streaming) {
-                JOT(16, "returning 0 because audio urbs not streaming\n");
+                JOM(16, "returning 0 because audio urbs not streaming\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return 0;
         }
 }
-JOT(12, "after  wait, %i=frag read  %i=frag fill\n", \
+JOM(12, "after  wait, %i=frag read  %i=frag fill\n", \
                 (peasycap->audio_read / peasycap->audio_pages_per_fragment), \
                 (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
 szret = (size_t)0;
 while (fragment == (peasycap->audio_read / \
                                 peasycap->audio_pages_per_fragment)) {
         if (NULL == pdata_buffer->pgo) {
-                SAY("ERROR: pdata_buffer->pgo is NULL\n");
+                SAM("ERROR: pdata_buffer->pgo is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
         }
         if (NULL == pdata_buffer->pto) {
-                SAY("ERROR: pdata_buffer->pto is NULL\n");
+                SAM("ERROR: pdata_buffer->pto is NULL\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
         }
         kount1 = PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo);
         if (0 > kount1) {
-                SAY("easysnd_read: MISTAKE: kount1 is negative\n");
+                SAM("easysnd_read: MISTAKE: kount1 is negative\n");
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -ERESTARTSYS;
         }
         if (!kount1) {
                 (peasycap->audio_read)++;
                 if (peasycap->audio_buffer_page_many <= peasycap->audio_read)
                         peasycap->audio_read = 0;
-                JOT(12, "bumped peasycap->audio_read to %i\n", \
+                JOM(12, "bumped peasycap->audio_read to %i\n", \
                                                 peasycap->audio_read);
 
                 if (fragment != (peasycap->audio_read / \
@@ -757,30 +921,34 @@ while (fragment == (peasycap->audio_read / \
                 if ((0 > peasycap->audio_read) || \
                         (peasycap->audio_buffer_page_many <= \
                                         peasycap->audio_read)) {
-                        SAY("ERROR: peasycap->audio_read out of range\n");
+                        SAM("ERROR: peasycap->audio_read out of range\n");
+                        mutex_unlock(&easycap_dongle[kd].mutex_audio);
                         return -EFAULT;
                 }
                 pdata_buffer = &peasycap->audio_buffer[peasycap->audio_read];
                 if ((struct data_buffer *)NULL == pdata_buffer) {
-                        SAY("ERROR: pdata_buffer is NULL\n");
+                        SAM("ERROR: pdata_buffer is NULL\n");
+                        mutex_unlock(&easycap_dongle[kd].mutex_audio);
                         return -EFAULT;
                 }
                 if (NULL == pdata_buffer->pgo) {
-                        SAY("ERROR: pdata_buffer->pgo is NULL\n");
+                        SAM("ERROR: pdata_buffer->pgo is NULL\n");
+                        mutex_unlock(&easycap_dongle[kd].mutex_audio);
                         return -EFAULT;
                 }
                 if (NULL == pdata_buffer->pto) {
-                        SAY("ERROR: pdata_buffer->pto is NULL\n");
+                        SAM("ERROR: pdata_buffer->pto is NULL\n");
+                        mutex_unlock(&easycap_dongle[kd].mutex_audio);
                         return -EFAULT;
                 }
                 kount1 = PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo);
         }
-        JOT(12, "ready  to send %li bytes\n", (long int) kount1);
-        JOT(12, "still  to send %li bytes\n", (long int) kount);
+        JOM(12, "ready  to send %li bytes\n", (long int) kount1);
+        JOM(12, "still  to send %li bytes\n", (long int) kount);
         more = kount1;
         if (more > kount)
                 more = kount;
-        JOT(12, "agreed to send %li bytes from page %i\n", \
+        JOM(12, "agreed to send %li bytes from page %i\n", \
                                                 more, peasycap->audio_read);
         if (!more)
                 break;
@@ -798,7 +966,8 @@ while (fragment == (peasycap->audio_read / \
 /*---------------------------------------------------------------------------*/
         rc = copy_to_user(puserspacebuffer, pdata_buffer->pto, more);
         if (0 != rc) {
-                SAY("ERROR: copy_to_user() returned %li\n", rc);
+                SAM("ERROR: copy_to_user() returned %li\n", rc);
+                mutex_unlock(&easycap_dongle[kd].mutex_audio);
                 return -EFAULT;
         }
         *poff += (loff_t)more;
@@ -807,11 +976,11 @@ while (fragment == (peasycap->audio_read / \
         puserspacebuffer += more;
         kount -= (size_t)more;
 }
-JOT(12, "after  read, %i=frag read  %i=frag fill\n", \
+JOM(12, "after  read, %i=frag read  %i=frag fill\n", \
                 (peasycap->audio_read / peasycap->audio_pages_per_fragment), \
                 (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
 if (kount < 0) {
-        SAY("MISTAKE:  %li=kount  %li=szret\n", \
+        SAM("MISTAKE:  %li=kount  %li=szret\n", \
                                         (long int)kount, (long int)szret);
 }
 /*---------------------------------------------------------------------------*/
@@ -827,11 +996,11 @@ if (peasycap->audio_sample) {
         mean = peasycap->audio_niveau;
         sdr = signed_div(mean, peasycap->audio_sample);
 
-        JOT(8, "%8lli=mean  %8lli=meansquare after %lli samples, =>\n", \
+        JOM(8, "%8lli=mean  %8lli=meansquare after %lli samples, =>\n", \
                                 sdr.quotient, above, peasycap->audio_sample);
 
         sdr = signed_div(above, 32768);
-        JOT(8, "audio dynamic range is roughly %lli\n", sdr.quotient);
+        JOM(8, "audio dynamic range is roughly %lli\n", sdr.quotient);
 }
 /*---------------------------------------------------------------------------*/
 /*
@@ -840,33 +1009,28 @@ if (peasycap->audio_sample) {
 /*---------------------------------------------------------------------------*/
 do_gettimeofday(&timeval);
 if (!peasycap->timeval1.tv_sec) {
-        audio_bytes = 0;
-        timeval1 = timeval;
-
-        if (mutex_lock_interruptible(&(peasycap->mutex_timeval1)))
-                return -ERESTARTSYS;
-        peasycap->timeval1 = timeval1;
-        mutex_unlock(&(peasycap->mutex_timeval1));
+        peasycap->audio_bytes = 0;
+        peasycap->timeval3 = timeval;
+        peasycap->timeval1 = peasycap->timeval3;
         sdr.quotient = 192000;
 } else {
-        audio_bytes += (long long int) szret;
+        peasycap->audio_bytes += (long long int) szret;
         below = ((long long int)(1000000)) * \
-                ((long long int)(timeval.tv_sec  - timeval1.tv_sec)) + \
-                (long long int)(timeval.tv_usec - timeval1.tv_usec);
-        above = 1000000 * ((long long int) audio_bytes);
+                ((long long int)(timeval.tv_sec  - \
+                                                peasycap->timeval3.tv_sec)) + \
+                (long long int)(timeval.tv_usec - peasycap->timeval3.tv_usec);
+        above = 1000000 * ((long long int) peasycap->audio_bytes);
 
         if (below)
                 sdr = signed_div(above, below);
         else
                 sdr.quotient = 192000;
 }
-JOT(8, "audio streaming at %lli bytes/second\n", sdr.quotient);
-if (mutex_lock_interruptible(&(peasycap->mutex_timeval1)))
-        return -ERESTARTSYS;
+JOM(8, "audio streaming at %lli bytes/second\n", sdr.quotient);
 peasycap->dnbydt = sdr.quotient;
-mutex_unlock(&(peasycap->mutex_timeval1));
 
-JOT(8, "returning %li\n", (long int)szret);
+JOM(8, "returning %li\n", (long int)szret);
+mutex_unlock(&easycap_dongle[kd].mutex_audio);
 return szret;
 }
 /*****************************************************************************/
@@ -881,27 +1045,31 @@ submit_audio_urbs(struct easycap *peasycap)
 struct data_urb *pdata_urb;
 struct urb *purb;
 struct list_head *plist_head;
-int j, isbad, m, rc;
+int j, isbad, nospc, m, rc;
 int isbuf;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if ((struct list_head *)NULL == peasycap->purb_audio_head) {
-        SAY("ERROR: peasycap->urb_audio_head uninitialized\n");
+        SAM("ERROR: peasycap->urb_audio_head uninitialized\n");
         return -EFAULT;
 }
 if ((struct usb_device *)NULL == peasycap->pusb_device) {
-        SAY("ERROR: peasycap->pusb_device is NULL\n");
+        SAM("ERROR: peasycap->pusb_device is NULL\n");
         return -EFAULT;
 }
 if (!peasycap->audio_isoc_streaming) {
-        JOT(4, "initial submission of all audio urbs\n");
+        JOM(4, "initial submission of all audio urbs\n");
         rc = usb_set_interface(peasycap->pusb_device,
                                         peasycap->audio_interface, \
                                         peasycap->audio_altsetting_on);
-        JOT(8, "usb_set_interface(.,%i,%i) returned %i\n", \
+        JOM(8, "usb_set_interface(.,%i,%i) returned %i\n", \
                                         peasycap->audio_interface, \
                                         peasycap->audio_altsetting_on, rc);
 
-        isbad = 0;  m = 0;
+        isbad = 0;  nospc = 0;  m = 0;
         list_for_each(plist_head, (peasycap->purb_audio_head)) {
                 pdata_urb = list_entry(plist_head, struct data_urb, list_head);
                 if (NULL != pdata_urb) {
@@ -938,39 +1106,49 @@ if (!peasycap->audio_isoc_streaming) {
                                 rc = usb_submit_urb(purb, GFP_KERNEL);
                                 if (0 != rc) {
                                         isbad++;
-                                        SAY("ERROR: usb_submit_urb() failed" \
+                                        SAM("ERROR: usb_submit_urb() failed" \
                                                         " for urb with rc:\n");
                                         switch (rc) {
                                         case -ENOMEM: {
-                                                SAY("ENOMEM\n"); break;
+                                                SAM("-ENOMEM\n");
+                                                break;
                                         }
                                         case -ENODEV: {
-                                                SAY("ENODEV\n"); break;
+                                                SAM("-ENODEV\n");
+                                                break;
                                         }
                                         case -ENXIO: {
-                                                SAY("ENXIO\n"); break;
+                                                SAM("-ENXIO\n");
+                                                break;
                                         }
                                         case -EINVAL: {
-                                                SAY("EINVAL\n"); break;
+                                                SAM("-EINVAL\n");
+                                                break;
                                         }
                                         case -EAGAIN: {
-                                                SAY("EAGAIN\n"); break;
+                                                SAM("-EAGAIN\n");
+                                                break;
                                         }
                                         case -EFBIG: {
-                                                SAY("EFBIG\n"); break;
+                                                SAM("-EFBIG\n");
+                                                break;
                                         }
                                         case -EPIPE: {
-                                                SAY("EPIPE\n"); break;
+                                                SAM("-EPIPE\n");
+                                                break;
                                         }
                                         case -EMSGSIZE: {
-                                                SAY("EMSGSIZE\n"); break;
+                                                SAM("-EMSGSIZE\n");
+                                                break;
                                         }
                                         case -ENOSPC: {
-                                                SAY("ENOSPC\n"); break;
+                                                nospc++;
+                                                break;
                                         }
                                         default: {
-                                                SAY("unknown error code %i\n",\
-                                                                 rc); break;
+                                                SAM("unknown error code %i\n",\
+                                                                 rc);
+                                                break;
                                         }
                                         }
                                 } else {
@@ -983,8 +1161,13 @@ if (!peasycap->audio_isoc_streaming) {
                         isbad++;
                 }
         }
+        if (nospc) {
+                SAM("-ENOSPC=usb_submit_urb() for %i urbs\n", nospc);
+                SAM(".....  possibly inadequate USB bandwidth\n");
+                peasycap->audio_eof = 1;
+        }
         if (isbad) {
-                JOT(4, "attempting cleanup instead of submitting\n");
+                JOM(4, "attempting cleanup instead of submitting\n");
                 list_for_each(plist_head, (peasycap->purb_audio_head)) {
                         pdata_urb = list_entry(plist_head, struct data_urb, \
                                                                 list_head);
@@ -997,10 +1180,10 @@ if (!peasycap->audio_isoc_streaming) {
                 peasycap->audio_isoc_streaming = 0;
         } else {
                 peasycap->audio_isoc_streaming = 1;
-                JOT(4, "submitted %i audio urbs\n", m);
+                JOM(4, "submitted %i audio urbs\n", m);
         }
 } else
-        JOT(4, "already streaming audio urbs\n");
+        JOM(4, "already streaming audio urbs\n");
 
 return 0;
 }
@@ -1017,10 +1200,14 @@ int m;
 struct list_head *plist_head;
 struct data_urb *pdata_urb;
 
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return -EFAULT;
+}
 if (peasycap->audio_isoc_streaming) {
         if ((struct list_head *)NULL != peasycap->purb_audio_head) {
                 peasycap->audio_isoc_streaming = 0;
-                JOT(4, "killing audio urbs\n");
+                JOM(4, "killing audio urbs\n");
                 m = 0;
                 list_for_each(plist_head, (peasycap->purb_audio_head)) {
                         pdata_urb = list_entry(plist_head, struct data_urb,
@@ -1032,13 +1219,13 @@ if (peasycap->audio_isoc_streaming) {
                                 }
                         }
                 }
-                JOT(4, "%i audio urbs killed\n", m);
+                JOM(4, "%i audio urbs killed\n", m);
         } else {
-                SAY("ERROR: peasycap->purb_audio_head is NULL\n");
+                SAM("ERROR: peasycap->purb_audio_head is NULL\n");
                 return -EFAULT;
         }
 } else {
-        JOT(8, "%i=audio_isoc_streaming, no audio urbs killed\n", \
+        JOM(8, "%i=audio_isoc_streaming, no audio urbs killed\n", \
                                         peasycap->audio_isoc_streaming);
 }
 return 0;
diff --git a/drivers/staging/easycap/easycap_testcard.c b/drivers/staging/easycap/easycap_testcard.c
index 3c2ce28fab95..e27dfe9a9ba3 100644
--- a/drivers/staging/easycap/easycap_testcard.c
+++ b/drivers/staging/easycap/easycap_testcard.c
@@ -29,37 +29,69 @@
 #include "easycap_debug.h"
 
 /*****************************************************************************/
-#define TESTCARD_BYTESPERLINE (2 * 1440)
+#define TESTCARD_BYTESPERLINE (2 * 720)
 void
-easycap_testcard(struct easycap *peasycap, int field_fill)
+easycap_testcard(struct easycap *peasycap, int field)
 {
 int total;
 int y, u, v, r, g, b;
 unsigned char uyvy[4];
-
-int i1, line, k, m, n, more, much, barwidth;
+int i1, line, k, m, n, more, much, barwidth, barheight;
 unsigned char bfbar[TESTCARD_BYTESPERLINE / 8], *p1, *p2;
 struct data_buffer *pfield_buffer;
 
-JOT(8, "%i=field_fill\n", field_fill);
-
-if ((TESTCARD_BYTESPERLINE / 2) < peasycap->width) {
-        SAY("ERROR: image is too wide\n");
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return;
+}
+JOM(8, "%i=field\n", field);
+switch (peasycap->width) {
+case 720:
+case 360: {
+        barwidth = (2 * 720) / 8;
+        break;
+}
+case 704:
+case 352: {
+        barwidth = (2 * 704) / 8;
+        break;
+}
+case 640:
+case 320: {
+        barwidth = (2 * 640) / 8;
+        break;
+}
+default: {
+        SAM("ERROR:  cannot set barwidth\n");
         return;
 }
-if (peasycap->width % 16) {
-        SAY("ERROR: indivisible image width\n");
+}
+if (TESTCARD_BYTESPERLINE < barwidth) {
+        SAM("ERROR: barwidth is too large\n");
         return;
 }
-
+switch (peasycap->height) {
+case 576:
+case 288: {
+        barheight = 576;
+        break;
+}
+case 480:
+case 240: {
+        barheight = 480;
+        break;
+}
+default: {
+        SAM("ERROR: cannot set barheight\n");
+        return;
+}
+}
 total = 0;
-barwidth = (2 * peasycap->width) / 8;
-
-k = field_fill;
+k = field;
 m = 0;
 n = 0;
 
-for (line = 0;  line < (peasycap->height / 2);  line++) {
+for (line = 0;  line < (barheight / 2);  line++) {
         for (i1 = 0;  i1 < 8;  i1++) {
                 r = (i1 * 256)/8;
                 g = (i1 * 256)/8;
@@ -88,15 +120,15 @@ for (line = 0;  line < (peasycap->height / 2);  line++) {
 
                 while (more) {
                         if ((FIELD_BUFFER_SIZE/PAGE_SIZE) <= m) {
-                                SAY("ERROR:  bad m reached\n");
+                                SAM("ERROR:  bad m reached\n");
                                 return;
                         }
                 if (PAGE_SIZE < n) {
-                        SAY("ERROR:  bad n reached\n"); return;
+                        SAM("ERROR:  bad n reached\n"); return;
                 }
 
                 if (0 > more) {
-                        SAY("ERROR:  internal fault\n");
+                        SAM("ERROR:  internal fault\n");
                         return;
                 }
 
@@ -117,10 +149,6 @@ for (line = 0;  line < (peasycap->height / 2);  line++) {
                 }
         }
 }
-
-JOT(8, "%i=total\n", total);
-if (total != peasycap->width * peasycap->height)
-        SAY("ERROR: wrong number of bytes written:  %i\n", total);
 return;
 }
 /*****************************************************************************/
@@ -157,35 +185,35 @@ for (i1 = 0;  i1 <= last;  i1++)
                 printf("%6i, ", i2);  printf("%6i\n};\n", i2);
                 }
         }
-return(0);
+return 0;
 }
 -----------------------------------------------------------------------------*/
 int tones[2048] = {
-     0,     0,   502,   502,  1004,  1004,  1505,  1505,  2005,  2005,
-  2503,  2503,  2998,  2998,  3491,  3491,  3980,  3980,  4466,  4466,
-  4948,  4948,  5424,  5424,  5896,  5896,  6362,  6362,  6822,  6822,
-  7276,  7276,  7723,  7723,  8162,  8162,  8594,  8594,  9018,  9018,
-  9434,  9434,  9840,  9840, 10237, 10237, 10625, 10625, 11002, 11002,
- 11370, 11370, 11726, 11726, 12072, 12072, 12406, 12406, 12728, 12728,
- 13038, 13038, 13337, 13337, 13622, 13622, 13895, 13895, 14155, 14155,
- 14401, 14401, 14634, 14634, 14853, 14853, 15058, 15058, 15249, 15249,
- 15426, 15426, 15588, 15588, 15735, 15735, 15868, 15868, 15985, 15985,
- 16088, 16088, 16175, 16175, 16248, 16248, 16305, 16305, 16346, 16346,
- 16372, 16372, 16383, 16383, 16379, 16379, 16359, 16359, 16323, 16323,
- 16272, 16272, 16206, 16206, 16125, 16125, 16028, 16028, 15917, 15917,
- 15790, 15790, 15649, 15649, 15492, 15492, 15322, 15322, 15136, 15136,
- 14937, 14937, 14723, 14723, 14496, 14496, 14255, 14255, 14001, 14001,
- 13733, 13733, 13452, 13452, 13159, 13159, 12854, 12854, 12536, 12536,
- 12207, 12207, 11866, 11866, 11513, 11513, 11150, 11150, 10777, 10777,
- 10393, 10393, 10000, 10000,  9597,  9597,  9185,  9185,  8765,  8765,
-  8336,  8336,  7900,  7900,  7456,  7456,  7005,  7005,  6547,  6547,
-  6083,  6083,  5614,  5614,  5139,  5139,  4659,  4659,  4175,  4175,
-  3687,  3687,  3196,  3196,  2701,  2701,  2204,  2204,  1705,  1705,
-  1205,  1205,   703,   703,   201,   201,  -301,  -301,  -803,  -803,
- -1305, -1305, -1805, -1805, -2304, -2304, -2801, -2801, -3294, -3294,
- -3785, -3785, -4272, -4272, -4756, -4756, -5234, -5234, -5708, -5708,
- -6176, -6176, -6639, -6639, -7095, -7095, -7545, -7545, -7988, -7988,
- -8423, -8423, -8850, -8850, -9268, -9268, -9679, -9679, -10079, -10079,
+0,     0,   502,   502,  1004,  1004,  1505,  1505,  2005,  2005,
+2503,  2503,  2998,  2998,  3491,  3491,  3980,  3980,  4466,  4466,
+4948,  4948,  5424,  5424,  5896,  5896,  6362,  6362,  6822,  6822,
+7276,  7276,  7723,  7723,  8162,  8162,  8594,  8594,  9018,  9018,
+9434,  9434,  9840,  9840, 10237, 10237, 10625, 10625, 11002, 11002,
+11370, 11370, 11726, 11726, 12072, 12072, 12406, 12406, 12728, 12728,
+13038, 13038, 13337, 13337, 13622, 13622, 13895, 13895, 14155, 14155,
+14401, 14401, 14634, 14634, 14853, 14853, 15058, 15058, 15249, 15249,
+15426, 15426, 15588, 15588, 15735, 15735, 15868, 15868, 15985, 15985,
+16088, 16088, 16175, 16175, 16248, 16248, 16305, 16305, 16346, 16346,
+16372, 16372, 16383, 16383, 16379, 16379, 16359, 16359, 16323, 16323,
+16272, 16272, 16206, 16206, 16125, 16125, 16028, 16028, 15917, 15917,
+15790, 15790, 15649, 15649, 15492, 15492, 15322, 15322, 15136, 15136,
+14937, 14937, 14723, 14723, 14496, 14496, 14255, 14255, 14001, 14001,
+13733, 13733, 13452, 13452, 13159, 13159, 12854, 12854, 12536, 12536,
+12207, 12207, 11866, 11866, 11513, 11513, 11150, 11150, 10777, 10777,
+10393, 10393, 10000, 10000,  9597,  9597,  9185,  9185,  8765,  8765,
+8336,  8336,  7900,  7900,  7456,  7456,  7005,  7005,  6547,  6547,
+6083,  6083,  5614,  5614,  5139,  5139,  4659,  4659,  4175,  4175,
+3687,  3687,  3196,  3196,  2701,  2701,  2204,  2204,  1705,  1705,
+1205,  1205,   703,   703,   201,   201,  -301,  -301,  -803,  -803,
+-1305, -1305, -1805, -1805, -2304, -2304, -2801, -2801, -3294, -3294,
+-3785, -3785, -4272, -4272, -4756, -4756, -5234, -5234, -5708, -5708,
+-6176, -6176, -6639, -6639, -7095, -7095, -7545, -7545, -7988, -7988,
+-8423, -8423, -8850, -8850, -9268, -9268, -9679, -9679, -10079, -10079,
 -10471, -10471, -10853, -10853, -11224, -11224, -11585, -11585, -11935, -11935,
 -12273, -12273, -12600, -12600, -12916, -12916, -13219, -13219, -13510, -13510,
 -13788, -13788, -14053, -14053, -14304, -14304, -14543, -14543, -14767, -14767,
@@ -198,35 +226,35 @@ int tones[2048] = {
 -14353, -14353, -14104, -14104, -13842, -13842, -13566, -13566, -13278, -13278,
 -12977, -12977, -12665, -12665, -12340, -12340, -12003, -12003, -11656, -11656,
 -11297, -11297, -10928, -10928, -10548, -10548, -10159, -10159, -9759, -9759,
- -9351, -9351, -8934, -8934, -8509, -8509, -8075, -8075, -7634, -7634,
- -7186, -7186, -6731, -6731, -6269, -6269, -5802, -5802, -5329, -5329,
- -4852, -4852, -4369, -4369, -3883, -3883, -3393, -3393, -2900, -2900,
- -2404, -2404, -1905, -1905, -1405, -1405,  -904,  -904,  -402,  -402,
-   100,   100,   603,   603,  1105,  1105,  1605,  1605,  2105,  2105,
-  2602,  2602,  3097,  3097,  3589,  3589,  4078,  4078,  4563,  4563,
-  5043,  5043,  5519,  5519,  5990,  5990,  6455,  6455,  6914,  6914,
-  7366,  7366,  7811,  7811,  8249,  8249,  8680,  8680,  9102,  9102,
-  9516,  9516,  9920,  9920, 10315, 10315, 10701, 10701, 11077, 11077,
- 11442, 11442, 11796, 11796, 12139, 12139, 12471, 12471, 12791, 12791,
- 13099, 13099, 13395, 13395, 13678, 13678, 13948, 13948, 14205, 14205,
- 14449, 14449, 14679, 14679, 14895, 14895, 15098, 15098, 15286, 15286,
- 15459, 15459, 15618, 15618, 15763, 15763, 15892, 15892, 16007, 16007,
- 16107, 16107, 16191, 16191, 16260, 16260, 16314, 16314, 16353, 16353,
- 16376, 16376, 16384, 16384, 16376, 16376, 16353, 16353, 16314, 16314,
- 16260, 16260, 16191, 16191, 16107, 16107, 16007, 16007, 15892, 15892,
- 15763, 15763, 15618, 15618, 15459, 15459, 15286, 15286, 15098, 15098,
- 14895, 14895, 14679, 14679, 14449, 14449, 14205, 14205, 13948, 13948,
- 13678, 13678, 13395, 13395, 13099, 13099, 12791, 12791, 12471, 12471,
- 12139, 12139, 11796, 11796, 11442, 11442, 11077, 11077, 10701, 10701,
- 10315, 10315,  9920,  9920,  9516,  9516,  9102,  9102,  8680,  8680,
-  8249,  8249,  7811,  7811,  7366,  7366,  6914,  6914,  6455,  6455,
-  5990,  5990,  5519,  5519,  5043,  5043,  4563,  4563,  4078,  4078,
-  3589,  3589,  3097,  3097,  2602,  2602,  2105,  2105,  1605,  1605,
-  1105,  1105,   603,   603,   100,   100,  -402,  -402,  -904,  -904,
- -1405, -1405, -1905, -1905, -2404, -2404, -2900, -2900, -3393, -3393,
- -3883, -3883, -4369, -4369, -4852, -4852, -5329, -5329, -5802, -5802,
- -6269, -6269, -6731, -6731, -7186, -7186, -7634, -7634, -8075, -8075,
- -8509, -8509, -8934, -8934, -9351, -9351, -9759, -9759, -10159, -10159,
+-9351, -9351, -8934, -8934, -8509, -8509, -8075, -8075, -7634, -7634,
+-7186, -7186, -6731, -6731, -6269, -6269, -5802, -5802, -5329, -5329,
+-4852, -4852, -4369, -4369, -3883, -3883, -3393, -3393, -2900, -2900,
+-2404, -2404, -1905, -1905, -1405, -1405,  -904,  -904,  -402,  -402,
+100,   100,   603,   603,  1105,  1105,  1605,  1605,  2105,  2105,
+2602,  2602,  3097,  3097,  3589,  3589,  4078,  4078,  4563,  4563,
+5043,  5043,  5519,  5519,  5990,  5990,  6455,  6455,  6914,  6914,
+7366,  7366,  7811,  7811,  8249,  8249,  8680,  8680,  9102,  9102,
+9516,  9516,  9920,  9920, 10315, 10315, 10701, 10701, 11077, 11077,
+11442, 11442, 11796, 11796, 12139, 12139, 12471, 12471, 12791, 12791,
+13099, 13099, 13395, 13395, 13678, 13678, 13948, 13948, 14205, 14205,
+14449, 14449, 14679, 14679, 14895, 14895, 15098, 15098, 15286, 15286,
+15459, 15459, 15618, 15618, 15763, 15763, 15892, 15892, 16007, 16007,
+16107, 16107, 16191, 16191, 16260, 16260, 16314, 16314, 16353, 16353,
+16376, 16376, 16384, 16384, 16376, 16376, 16353, 16353, 16314, 16314,
+16260, 16260, 16191, 16191, 16107, 16107, 16007, 16007, 15892, 15892,
+15763, 15763, 15618, 15618, 15459, 15459, 15286, 15286, 15098, 15098,
+14895, 14895, 14679, 14679, 14449, 14449, 14205, 14205, 13948, 13948,
+13678, 13678, 13395, 13395, 13099, 13099, 12791, 12791, 12471, 12471,
+12139, 12139, 11796, 11796, 11442, 11442, 11077, 11077, 10701, 10701,
+10315, 10315,  9920,  9920,  9516,  9516,  9102,  9102,  8680,  8680,
+8249,  8249,  7811,  7811,  7366,  7366,  6914,  6914,  6455,  6455,
+5990,  5990,  5519,  5519,  5043,  5043,  4563,  4563,  4078,  4078,
+3589,  3589,  3097,  3097,  2602,  2602,  2105,  2105,  1605,  1605,
+1105,  1105,   603,   603,   100,   100,  -402,  -402,  -904,  -904,
+-1405, -1405, -1905, -1905, -2404, -2404, -2900, -2900, -3393, -3393,
+-3883, -3883, -4369, -4369, -4852, -4852, -5329, -5329, -5802, -5802,
+-6269, -6269, -6731, -6731, -7186, -7186, -7634, -7634, -8075, -8075,
+-8509, -8509, -8934, -8934, -9351, -9351, -9759, -9759, -10159, -10159,
 -10548, -10548, -10928, -10928, -11297, -11297, -11656, -11656, -12003, -12003,
 -12340, -12340, -12665, -12665, -12977, -12977, -13278, -13278, -13566, -13566,
 -13842, -13842, -14104, -14104, -14353, -14353, -14589, -14589, -14810, -14810,
@@ -239,35 +267,35 @@ int tones[2048] = {
 -14304, -14304, -14053, -14053, -13788, -13788, -13510, -13510, -13219, -13219,
 -12916, -12916, -12600, -12600, -12273, -12273, -11935, -11935, -11585, -11585,
 -11224, -11224, -10853, -10853, -10471, -10471, -10079, -10079, -9679, -9679,
- -9268, -9268, -8850, -8850, -8423, -8423, -7988, -7988, -7545, -7545,
- -7095, -7095, -6639, -6639, -6176, -6176, -5708, -5708, -5234, -5234,
- -4756, -4756, -4272, -4272, -3785, -3785, -3294, -3294, -2801, -2801,
- -2304, -2304, -1805, -1805, -1305, -1305,  -803,  -803,  -301,  -301,
-   201,   201,   703,   703,  1205,  1205,  1705,  1705,  2204,  2204,
-  2701,  2701,  3196,  3196,  3687,  3687,  4175,  4175,  4659,  4659,
-  5139,  5139,  5614,  5614,  6083,  6083,  6547,  6547,  7005,  7005,
-  7456,  7456,  7900,  7900,  8336,  8336,  8765,  8765,  9185,  9185,
-  9597,  9597, 10000, 10000, 10393, 10393, 10777, 10777, 11150, 11150,
- 11513, 11513, 11866, 11866, 12207, 12207, 12536, 12536, 12854, 12854,
- 13159, 13159, 13452, 13452, 13733, 13733, 14001, 14001, 14255, 14255,
- 14496, 14496, 14723, 14723, 14937, 14937, 15136, 15136, 15322, 15322,
- 15492, 15492, 15649, 15649, 15790, 15790, 15917, 15917, 16028, 16028,
- 16125, 16125, 16206, 16206, 16272, 16272, 16323, 16323, 16359, 16359,
- 16379, 16379, 16383, 16383, 16372, 16372, 16346, 16346, 16305, 16305,
- 16248, 16248, 16175, 16175, 16088, 16088, 15985, 15985, 15868, 15868,
- 15735, 15735, 15588, 15588, 15426, 15426, 15249, 15249, 15058, 15058,
- 14853, 14853, 14634, 14634, 14401, 14401, 14155, 14155, 13895, 13895,
- 13622, 13622, 13337, 13337, 13038, 13038, 12728, 12728, 12406, 12406,
- 12072, 12072, 11726, 11726, 11370, 11370, 11002, 11002, 10625, 10625,
- 10237, 10237,  9840,  9840,  9434,  9434,  9018,  9018,  8594,  8594,
-  8162,  8162,  7723,  7723,  7276,  7276,  6822,  6822,  6362,  6362,
-  5896,  5896,  5424,  5424,  4948,  4948,  4466,  4466,  3980,  3980,
-  3491,  3491,  2998,  2998,  2503,  2503,  2005,  2005,  1505,  1505,
-  1004,  1004,   502,   502,     0,     0,  -502,  -502, -1004, -1004,
- -1505, -1505, -2005, -2005, -2503, -2503, -2998, -2998, -3491, -3491,
- -3980, -3980, -4466, -4466, -4948, -4948, -5424, -5424, -5896, -5896,
- -6362, -6362, -6822, -6822, -7276, -7276, -7723, -7723, -8162, -8162,
- -8594, -8594, -9018, -9018, -9434, -9434, -9840, -9840, -10237, -10237,
+-9268, -9268, -8850, -8850, -8423, -8423, -7988, -7988, -7545, -7545,
+-7095, -7095, -6639, -6639, -6176, -6176, -5708, -5708, -5234, -5234,
+-4756, -4756, -4272, -4272, -3785, -3785, -3294, -3294, -2801, -2801,
+-2304, -2304, -1805, -1805, -1305, -1305,  -803,  -803,  -301,  -301,
+201,   201,   703,   703,  1205,  1205,  1705,  1705,  2204,  2204,
+2701,  2701,  3196,  3196,  3687,  3687,  4175,  4175,  4659,  4659,
+5139,  5139,  5614,  5614,  6083,  6083,  6547,  6547,  7005,  7005,
+7456,  7456,  7900,  7900,  8336,  8336,  8765,  8765,  9185,  9185,
+9597,  9597, 10000, 10000, 10393, 10393, 10777, 10777, 11150, 11150,
+11513, 11513, 11866, 11866, 12207, 12207, 12536, 12536, 12854, 12854,
+13159, 13159, 13452, 13452, 13733, 13733, 14001, 14001, 14255, 14255,
+14496, 14496, 14723, 14723, 14937, 14937, 15136, 15136, 15322, 15322,
+15492, 15492, 15649, 15649, 15790, 15790, 15917, 15917, 16028, 16028,
+16125, 16125, 16206, 16206, 16272, 16272, 16323, 16323, 16359, 16359,
+16379, 16379, 16383, 16383, 16372, 16372, 16346, 16346, 16305, 16305,
+16248, 16248, 16175, 16175, 16088, 16088, 15985, 15985, 15868, 15868,
+15735, 15735, 15588, 15588, 15426, 15426, 15249, 15249, 15058, 15058,
+14853, 14853, 14634, 14634, 14401, 14401, 14155, 14155, 13895, 13895,
+13622, 13622, 13337, 13337, 13038, 13038, 12728, 12728, 12406, 12406,
+12072, 12072, 11726, 11726, 11370, 11370, 11002, 11002, 10625, 10625,
+10237, 10237,  9840,  9840,  9434,  9434,  9018,  9018,  8594,  8594,
+8162,  8162,  7723,  7723,  7276,  7276,  6822,  6822,  6362,  6362,
+5896,  5896,  5424,  5424,  4948,  4948,  4466,  4466,  3980,  3980,
+3491,  3491,  2998,  2998,  2503,  2503,  2005,  2005,  1505,  1505,
+1004,  1004,   502,   502,     0,     0,  -502,  -502, -1004, -1004,
+-1505, -1505, -2005, -2005, -2503, -2503, -2998, -2998, -3491, -3491,
+-3980, -3980, -4466, -4466, -4948, -4948, -5424, -5424, -5896, -5896,
+-6362, -6362, -6822, -6822, -7276, -7276, -7723, -7723, -8162, -8162,
+-8594, -8594, -9018, -9018, -9434, -9434, -9840, -9840, -10237, -10237,
 -10625, -10625, -11002, -11002, -11370, -11370, -11726, -11726, -12072, -12072,
 -12406, -12406, -12728, -12728, -13038, -13038, -13337, -13337, -13622, -13622,
 -13895, -13895, -14155, -14155, -14401, -14401, -14634, -14634, -14853, -14853,
@@ -280,35 +308,35 @@ int tones[2048] = {
 -14255, -14255, -14001, -14001, -13733, -13733, -13452, -13452, -13159, -13159,
 -12854, -12854, -12536, -12536, -12207, -12207, -11866, -11866, -11513, -11513,
 -11150, -11150, -10777, -10777, -10393, -10393, -10000, -10000, -9597, -9597,
- -9185, -9185, -8765, -8765, -8336, -8336, -7900, -7900, -7456, -7456,
- -7005, -7005, -6547, -6547, -6083, -6083, -5614, -5614, -5139, -5139,
- -4659, -4659, -4175, -4175, -3687, -3687, -3196, -3196, -2701, -2701,
- -2204, -2204, -1705, -1705, -1205, -1205,  -703,  -703,  -201,  -201,
-   301,   301,   803,   803,  1305,  1305,  1805,  1805,  2304,  2304,
-  2801,  2801,  3294,  3294,  3785,  3785,  4272,  4272,  4756,  4756,
-  5234,  5234,  5708,  5708,  6176,  6176,  6639,  6639,  7095,  7095,
-  7545,  7545,  7988,  7988,  8423,  8423,  8850,  8850,  9268,  9268,
-  9679,  9679, 10079, 10079, 10471, 10471, 10853, 10853, 11224, 11224,
- 11585, 11585, 11935, 11935, 12273, 12273, 12600, 12600, 12916, 12916,
- 13219, 13219, 13510, 13510, 13788, 13788, 14053, 14053, 14304, 14304,
- 14543, 14543, 14767, 14767, 14978, 14978, 15175, 15175, 15357, 15357,
- 15525, 15525, 15678, 15678, 15817, 15817, 15940, 15940, 16049, 16049,
- 16142, 16142, 16221, 16221, 16284, 16284, 16331, 16331, 16364, 16364,
- 16381, 16381, 16382, 16382, 16368, 16368, 16339, 16339, 16294, 16294,
- 16234, 16234, 16159, 16159, 16069, 16069, 15963, 15963, 15842, 15842,
- 15707, 15707, 15557, 15557, 15392, 15392, 15212, 15212, 15018, 15018,
- 14810, 14810, 14589, 14589, 14353, 14353, 14104, 14104, 13842, 13842,
- 13566, 13566, 13278, 13278, 12977, 12977, 12665, 12665, 12340, 12340,
- 12003, 12003, 11656, 11656, 11297, 11297, 10928, 10928, 10548, 10548,
- 10159, 10159,  9759,  9759,  9351,  9351,  8934,  8934,  8509,  8509,
-  8075,  8075,  7634,  7634,  7186,  7186,  6731,  6731,  6269,  6269,
-  5802,  5802,  5329,  5329,  4852,  4852,  4369,  4369,  3883,  3883,
-  3393,  3393,  2900,  2900,  2404,  2404,  1905,  1905,  1405,  1405,
-   904,   904,   402,   402,  -100,  -100,  -603,  -603, -1105, -1105,
- -1605, -1605, -2105, -2105, -2602, -2602, -3097, -3097, -3589, -3589,
- -4078, -4078, -4563, -4563, -5043, -5043, -5519, -5519, -5990, -5990,
- -6455, -6455, -6914, -6914, -7366, -7366, -7811, -7811, -8249, -8249,
- -8680, -8680, -9102, -9102, -9516, -9516, -9920, -9920, -10315, -10315,
+-9185, -9185, -8765, -8765, -8336, -8336, -7900, -7900, -7456, -7456,
+-7005, -7005, -6547, -6547, -6083, -6083, -5614, -5614, -5139, -5139,
+-4659, -4659, -4175, -4175, -3687, -3687, -3196, -3196, -2701, -2701,
+-2204, -2204, -1705, -1705, -1205, -1205,  -703,  -703,  -201,  -201,
+301,   301,   803,   803,  1305,  1305,  1805,  1805,  2304,  2304,
+2801,  2801,  3294,  3294,  3785,  3785,  4272,  4272,  4756,  4756,
+5234,  5234,  5708,  5708,  6176,  6176,  6639,  6639,  7095,  7095,
+7545,  7545,  7988,  7988,  8423,  8423,  8850,  8850,  9268,  9268,
+9679,  9679, 10079, 10079, 10471, 10471, 10853, 10853, 11224, 11224,
+11585, 11585, 11935, 11935, 12273, 12273, 12600, 12600, 12916, 12916,
+13219, 13219, 13510, 13510, 13788, 13788, 14053, 14053, 14304, 14304,
+14543, 14543, 14767, 14767, 14978, 14978, 15175, 15175, 15357, 15357,
+15525, 15525, 15678, 15678, 15817, 15817, 15940, 15940, 16049, 16049,
+16142, 16142, 16221, 16221, 16284, 16284, 16331, 16331, 16364, 16364,
+16381, 16381, 16382, 16382, 16368, 16368, 16339, 16339, 16294, 16294,
+16234, 16234, 16159, 16159, 16069, 16069, 15963, 15963, 15842, 15842,
+15707, 15707, 15557, 15557, 15392, 15392, 15212, 15212, 15018, 15018,
+14810, 14810, 14589, 14589, 14353, 14353, 14104, 14104, 13842, 13842,
+13566, 13566, 13278, 13278, 12977, 12977, 12665, 12665, 12340, 12340,
+12003, 12003, 11656, 11656, 11297, 11297, 10928, 10928, 10548, 10548,
+10159, 10159,  9759,  9759,  9351,  9351,  8934,  8934,  8509,  8509,
+8075,  8075,  7634,  7634,  7186,  7186,  6731,  6731,  6269,  6269,
+5802,  5802,  5329,  5329,  4852,  4852,  4369,  4369,  3883,  3883,
+3393,  3393,  2900,  2900,  2404,  2404,  1905,  1905,  1405,  1405,
+904,   904,   402,   402,  -100,  -100,  -603,  -603, -1105, -1105,
+-1605, -1605, -2105, -2105, -2602, -2602, -3097, -3097, -3589, -3589,
+-4078, -4078, -4563, -4563, -5043, -5043, -5519, -5519, -5990, -5990,
+-6455, -6455, -6914, -6914, -7366, -7366, -7811, -7811, -8249, -8249,
+-8680, -8680, -9102, -9102, -9516, -9516, -9920, -9920, -10315, -10315,
 -10701, -10701, -11077, -11077, -11442, -11442, -11796, -11796, -12139, -12139,
 -12471, -12471, -12791, -12791, -13099, -13099, -13395, -13395, -13678, -13678,
 -13948, -13948, -14205, -14205, -14449, -14449, -14679, -14679, -14895, -14895,
@@ -321,35 +349,35 @@ int tones[2048] = {
 -14205, -14205, -13948, -13948, -13678, -13678, -13395, -13395, -13099, -13099,
 -12791, -12791, -12471, -12471, -12139, -12139, -11796, -11796, -11442, -11442,
 -11077, -11077, -10701, -10701, -10315, -10315, -9920, -9920, -9516, -9516,
- -9102, -9102, -8680, -8680, -8249, -8249, -7811, -7811, -7366, -7366,
- -6914, -6914, -6455, -6455, -5990, -5990, -5519, -5519, -5043, -5043,
- -4563, -4563, -4078, -4078, -3589, -3589, -3097, -3097, -2602, -2602,
- -2105, -2105, -1605, -1605, -1105, -1105,  -603,  -603,  -100,  -100,
-   402,   402,   904,   904,  1405,  1405,  1905,  1905,  2404,  2404,
-  2900,  2900,  3393,  3393,  3883,  3883,  4369,  4369,  4852,  4852,
-  5329,  5329,  5802,  5802,  6269,  6269,  6731,  6731,  7186,  7186,
-  7634,  7634,  8075,  8075,  8509,  8509,  8934,  8934,  9351,  9351,
-  9759,  9759, 10159, 10159, 10548, 10548, 10928, 10928, 11297, 11297,
- 11656, 11656, 12003, 12003, 12340, 12340, 12665, 12665, 12977, 12977,
- 13278, 13278, 13566, 13566, 13842, 13842, 14104, 14104, 14353, 14353,
- 14589, 14589, 14810, 14810, 15018, 15018, 15212, 15212, 15392, 15392,
- 15557, 15557, 15707, 15707, 15842, 15842, 15963, 15963, 16069, 16069,
- 16159, 16159, 16234, 16234, 16294, 16294, 16339, 16339, 16368, 16368,
- 16382, 16382, 16381, 16381, 16364, 16364, 16331, 16331, 16284, 16284,
- 16221, 16221, 16142, 16142, 16049, 16049, 15940, 15940, 15817, 15817,
- 15678, 15678, 15525, 15525, 15357, 15357, 15175, 15175, 14978, 14978,
- 14767, 14767, 14543, 14543, 14304, 14304, 14053, 14053, 13788, 13788,
- 13510, 13510, 13219, 13219, 12916, 12916, 12600, 12600, 12273, 12273,
- 11935, 11935, 11585, 11585, 11224, 11224, 10853, 10853, 10471, 10471,
- 10079, 10079,  9679,  9679,  9268,  9268,  8850,  8850,  8423,  8423,
-  7988,  7988,  7545,  7545,  7095,  7095,  6639,  6639,  6176,  6176,
-  5708,  5708,  5234,  5234,  4756,  4756,  4272,  4272,  3785,  3785,
-  3294,  3294,  2801,  2801,  2304,  2304,  1805,  1805,  1305,  1305,
-   803,   803,   301,   301,  -201,  -201,  -703,  -703, -1205, -1205,
- -1705, -1705, -2204, -2204, -2701, -2701, -3196, -3196, -3687, -3687,
- -4175, -4175, -4659, -4659, -5139, -5139, -5614, -5614, -6083, -6083,
- -6547, -6547, -7005, -7005, -7456, -7456, -7900, -7900, -8336, -8336,
- -8765, -8765, -9185, -9185, -9597, -9597, -10000, -10000, -10393, -10393,
+-9102, -9102, -8680, -8680, -8249, -8249, -7811, -7811, -7366, -7366,
+-6914, -6914, -6455, -6455, -5990, -5990, -5519, -5519, -5043, -5043,
+-4563, -4563, -4078, -4078, -3589, -3589, -3097, -3097, -2602, -2602,
+-2105, -2105, -1605, -1605, -1105, -1105,  -603,  -603,  -100,  -100,
+402,   402,   904,   904,  1405,  1405,  1905,  1905,  2404,  2404,
+2900,  2900,  3393,  3393,  3883,  3883,  4369,  4369,  4852,  4852,
+5329,  5329,  5802,  5802,  6269,  6269,  6731,  6731,  7186,  7186,
+7634,  7634,  8075,  8075,  8509,  8509,  8934,  8934,  9351,  9351,
+9759,  9759, 10159, 10159, 10548, 10548, 10928, 10928, 11297, 11297,
+11656, 11656, 12003, 12003, 12340, 12340, 12665, 12665, 12977, 12977,
+13278, 13278, 13566, 13566, 13842, 13842, 14104, 14104, 14353, 14353,
+14589, 14589, 14810, 14810, 15018, 15018, 15212, 15212, 15392, 15392,
+15557, 15557, 15707, 15707, 15842, 15842, 15963, 15963, 16069, 16069,
+16159, 16159, 16234, 16234, 16294, 16294, 16339, 16339, 16368, 16368,
+16382, 16382, 16381, 16381, 16364, 16364, 16331, 16331, 16284, 16284,
+16221, 16221, 16142, 16142, 16049, 16049, 15940, 15940, 15817, 15817,
+15678, 15678, 15525, 15525, 15357, 15357, 15175, 15175, 14978, 14978,
+14767, 14767, 14543, 14543, 14304, 14304, 14053, 14053, 13788, 13788,
+13510, 13510, 13219, 13219, 12916, 12916, 12600, 12600, 12273, 12273,
+11935, 11935, 11585, 11585, 11224, 11224, 10853, 10853, 10471, 10471,
+10079, 10079,  9679,  9679,  9268,  9268,  8850,  8850,  8423,  8423,
+7988,  7988,  7545,  7545,  7095,  7095,  6639,  6639,  6176,  6176,
+5708,  5708,  5234,  5234,  4756,  4756,  4272,  4272,  3785,  3785,
+3294,  3294,  2801,  2801,  2304,  2304,  1805,  1805,  1305,  1305,
+803,   803,   301,   301,  -201,  -201,  -703,  -703, -1205, -1205,
+-1705, -1705, -2204, -2204, -2701, -2701, -3196, -3196, -3687, -3687,
+-4175, -4175, -4659, -4659, -5139, -5139, -5614, -5614, -6083, -6083,
+-6547, -6547, -7005, -7005, -7456, -7456, -7900, -7900, -8336, -8336,
+-8765, -8765, -9185, -9185, -9597, -9597, -10000, -10000, -10393, -10393,
 -10777, -10777, -11150, -11150, -11513, -11513, -11866, -11866, -12207, -12207,
 -12536, -12536, -12854, -12854, -13159, -13159, -13452, -13452, -13733, -13733,
 -14001, -14001, -14255, -14255, -14496, -14496, -14723, -14723, -14937, -14937,
@@ -362,10 +390,10 @@ int tones[2048] = {
 -14155, -14155, -13895, -13895, -13622, -13622, -13337, -13337, -13038, -13038,
 -12728, -12728, -12406, -12406, -12072, -12072, -11726, -11726, -11370, -11370,
 -11002, -11002, -10625, -10625, -10237, -10237, -9840, -9840, -9434, -9434,
- -9018, -9018, -8594, -8594, -8162, -8162, -7723, -7723, -7276, -7276,
- -6822, -6822, -6362, -6362, -5896, -5896, -5424, -5424, -4948, -4948,
- -4466, -4466, -3980, -3980, -3491, -3491, -2998, -2998, -2503, -2503,
- -2005, -2005, -1505, -1505, -1004, -1004,  -502,  -502
+-9018, -9018, -8594, -8594, -8162, -8162, -7723, -7723, -7276, -7276,
+-6822, -6822, -6362, -6362, -5896, -5896, -5424, -5424, -4948, -4948,
+-4466, -4466, -3980, -3980, -3491, -3491, -2998, -2998, -2503, -2503,
+-2005, -2005, -1505, -1505, -1004, -1004,  -502,  -502
 };
 /*****************************************************************************/
 void
@@ -375,10 +403,12 @@ int i1;
 unsigned char *p2;
 struct data_buffer *paudio_buffer;
 
-JOT(8, "%i=audio_fill\n", audio_fill);
-
+if (NULL == peasycap) {
+        SAY("ERROR: peasycap is NULL\n");
+        return;
+}
+JOM(8, "%i=audio_fill\n", audio_fill);
 paudio_buffer = &peasycap->audio_buffer[audio_fill];
-
 p2 = (unsigned char *)(paudio_buffer->pgo);
 for (i1 = 0;  i1 < PAGE_SIZE;  i1 += 4, p2 += 4) {
         *p2       = (unsigned char) (0x00FF & tones[i1/2]);
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 10bcb45d73a3..f62ba7a68f34 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -783,7 +783,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)
         /* Retrieve the net_device pointer from the pci_dev struct, as well
          * as the private adapter struct
          */
-        netdev = (struct net_device *) pci_get_drvdata(pdev);
+        netdev = pci_get_drvdata(pdev);
         adapter = netdev_priv(netdev);
 
         /* Perform device cleanup */
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index ef7fbf8b069a..2babb034a254 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -89,7 +89,7 @@ static int debug = ALPHATRACK_DEBUG;
 
 /* Use our own dbg macro */
 #define dbg_info(dev, format, arg...) do \
-    { if (debug) dev_info(dev , format , ## arg); } while (0)
+        { if (debug) dev_info(dev , format , ## arg); } while (0)
 
 #define alphatrack_ocmd_info(dev, cmd, format, arg...)
 
@@ -769,7 +769,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
         }
 
         dev->write_buffer =
-            kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
+            kmalloc(true_size * sizeof(struct alphatrack_ocmd), GFP_KERNEL);
 
         if (!dev->write_buffer) {
                 dev_err(&intf->dev, "Couldn't allocate write_buffer\n");
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index eed7e94308db..588afd5a5ddb 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -132,7 +132,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value)
 //---------------------------------------------------------------------------
 static inline u16 ft1000_read_fifo_len(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
 
         if (info->AsicID == ELECTRABUZZ_ID) {
                 return (ft1000_read_reg(dev, FT1000_REG_UFIFO_STAT) - 16);
@@ -155,7 +155,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
 //---------------------------------------------------------------------------
 u16 ft1000_read_dpram(struct net_device * dev, int offset)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
         u16 data;
 
@@ -184,7 +184,7 @@ u16 ft1000_read_dpram(struct net_device * dev, int offset)
 static inline void ft1000_write_dpram(struct net_device *dev,
                                           int offset, u16 value)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
 
         // Provide mutual exclusive access while reading ASIC registers.
@@ -208,7 +208,7 @@ static inline void ft1000_write_dpram(struct net_device *dev,
 //---------------------------------------------------------------------------
 u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
         u16 data;
 
@@ -242,7 +242,7 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
 static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
                                                  int offset, u16 value, int Index)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
 
         // Provide mutual exclusive access while reading ASIC registers.
@@ -270,7 +270,7 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
 //---------------------------------------------------------------------------
 u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
         u32 data;
 
@@ -298,7 +298,7 @@ u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
 //---------------------------------------------------------------------------
 void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         unsigned long flags;
 
         // Provide mutual exclusive access while reading ASIC registers.
@@ -320,7 +320,7 @@ void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
 //---------------------------------------------------------------------------
 static void ft1000_enable_interrupts(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 tempword;
 
         DEBUG(1, "ft1000_hw:ft1000_enable_interrupts()\n");
@@ -345,7 +345,7 @@ static void ft1000_enable_interrupts(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_disable_interrupts(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 tempword;
 
         DEBUG(1, "ft1000_hw: ft1000_disable_interrupts()\n");
@@ -370,7 +370,7 @@ static void ft1000_disable_interrupts(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_reset_asic(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 tempword;
 
         DEBUG(1, "ft1000_hw:ft1000_reset_asic called\n");
@@ -414,7 +414,7 @@ static void ft1000_reset_asic(struct net_device *dev)
 //---------------------------------------------------------------------------
 static int ft1000_reset_card(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 tempword;
         int i;
         unsigned long flags;
@@ -618,7 +618,7 @@ static void ft1000_hbchk(u_long data)
         FT1000_INFO *info;
         USHORT tempword;
 
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         if (info->CardReady == 1) {
                 // Perform dsp heartbeat check
@@ -831,7 +831,7 @@ static void ft1000_hbchk(u_long data)
 //---------------------------------------------------------------------------
 void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qtype)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         int i;
         u16 tempword;
         unsigned long flags;
@@ -916,7 +916,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt
 //---------------------------------------------------------------------------
 BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16 *pnxtph)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 size;
         u16 *ppseudohdr;
         int i;
@@ -1009,7 +1009,7 @@ BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16
 //---------------------------------------------------------------------------
 void ft1000_proc_drvmsg(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 msgtype;
         u16 tempword;
         PMEDIAMSG pmediamsg;
@@ -1292,7 +1292,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
 //---------------------------------------------------------------------------
 int ft1000_parse_dpram_msg(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 doorbell;
         u16 portid;
         u16 nxtph;
@@ -1449,7 +1449,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 i;
         u32 templong;
         u16 tempword;
@@ -1596,7 +1596,7 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
 int ft1000_copy_up_pkt(struct net_device *dev)
 {
         u16 tempword;
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 len;
         struct sk_buff *skb;
         u16 i;
@@ -1783,7 +1783,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
 //---------------------------------------------------------------------------
 int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         union {
                 PSEUDO_HDR blk;
                 u16 buff[sizeof(PSEUDO_HDR) >> 1];
@@ -1943,7 +1943,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
 
 static struct net_device_stats *ft1000_stats(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         return (&info->stats);
 }
 
@@ -1967,7 +1967,7 @@ static int ft1000_open(struct net_device *dev)
 
 static int ft1000_close(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
 
         DEBUG(0, "ft1000_hw: ft1000_close()\n");
 
@@ -1989,7 +1989,7 @@ static int ft1000_close(struct net_device *dev)
 
 static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u8 *pdata;
 
         DEBUG(1, "ft1000_hw: ft1000_start_xmit()\n");
@@ -2026,7 +2026,7 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         u16 tempword;
         u16 inttype;
         int cnt;
@@ -2091,7 +2091,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
 
 void stop_ft1000_card(struct net_device *dev)
 {
-        FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+        FT1000_INFO *info = netdev_priv(dev);
         PPROV_RECORD ptr;
 //      int cnt;
 
@@ -2127,7 +2127,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
                                    struct ethtool_drvinfo *info)
 {
         FT1000_INFO *ft_info;
-        ft_info = (FT1000_INFO *) netdev_priv(dev);
+        ft_info = netdev_priv(dev);
 
         snprintf(info->driver, 32, "ft1000");
         snprintf(info->bus_info, ETHTOOL_BUSINFO_LEN, "PCMCIA 0x%lx",
@@ -2139,7 +2139,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
 static u32 ft1000_get_link(struct net_device *dev)
 {
         FT1000_INFO *info;
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
         return info->mediastate;
 }
 
@@ -2185,7 +2185,7 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
         }
 
         SET_NETDEV_DEV(dev, fdev);
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         memset(info, 0, sizeof(FT1000_INFO));
 
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
index b45de9bc1b20..935608e72007 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
@@ -65,7 +65,7 @@ int ft1000ReadProc(char *page, char **start, off_t off,
         time_t delta;
 
         dev = (struct net_device *)data;
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         if (off > 0) {
                 *eof = 1;
@@ -174,7 +174,7 @@ static int ft1000NotifyProc(struct notifier_block *this, unsigned long event,
         struct net_device *dev = ptr;
         FT1000_INFO *info;
 
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         switch (event) {
         case NETDEV_CHANGENAME:
@@ -195,7 +195,7 @@ void ft1000InitProc(struct net_device *dev)
 {
         FT1000_INFO *info;
 
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         info->proc_ft1000 = proc_mkdir(FT1000_PROC, init_net.proc_net);
         create_proc_read_entry(dev->name, 0644, info->proc_ft1000,
@@ -208,7 +208,7 @@ void ft1000CleanupProc(struct net_device *dev)
 {
         FT1000_INFO *info;
 
-        info = (FT1000_INFO *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
         remove_proc_entry(dev->name, info->proc_ft1000);
         remove_proc_entry(FT1000_PROC, init_net.proc_net);
diff --git a/drivers/staging/ft1000/ft1000-usb/Makefile b/drivers/staging/ft1000/ft1000-usb/Makefile
index dd87ecd7918e..f0f524015888 100644
--- a/drivers/staging/ft1000/ft1000-usb/Makefile
+++ b/drivers/staging/ft1000/ft1000-usb/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_FT1000_USB) += ft1000.o
 
-ft1000-y := ft1000_chdev.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o
+ft1000-y := ft1000_debug.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index 20d509836d9e..149ba59f96bf 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -27,33 +27,22 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/poll.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 
-#include <linux/fs.h>
-#include <linux/kmod.h>
 #include <linux/ioctl.h>
-#include <linux/unistd.h>
-
+#include <linux/debugfs.h>
 #include "ft1000_usb.h"
-//#include "ft1000_ioctl.h"
 
 static int ft1000_flarion_cnt = 0;
 
-//need to looking usage of ft1000Handle
-
-static int ft1000_ChOpen (struct inode *Inode, struct file *File);
-static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait);
-static long ft1000_ChIoctl(struct file *File, unsigned int Command,
-                           unsigned long Argument);
-static int ft1000_ChRelease (struct inode *Inode, struct file *File);
-
-// Global pointer to device object
-static struct ft1000_device *pdevobj[MAX_NUM_CARDS + 2];
-//static devfs_handle_t ft1000Handle[MAX_NUM_CARDS];
+static int ft1000_open (struct inode *inode, struct file *file);
+static unsigned int ft1000_poll_dev(struct file *file, poll_table *wait);
+static long ft1000_ioctl(struct file *file, unsigned int command,
+                           unsigned long argument);
+static int ft1000_release (struct inode *inode, struct file *file);
 
 // List to free receive command buffer pool
 struct list_head freercvpool;
@@ -63,103 +52,18 @@ spinlock_t free_buff_lock;
 
 int numofmsgbuf = 0;
 
-// Global variable to indicate that all provisioning data is sent to DSP
-//BOOLEAN fProvComplete;
-
 //
 // Table of entry-point routines for char device
 //
 static struct file_operations ft1000fops =
 {
-        .unlocked_ioctl = ft1000_ChIoctl,
-        .poll           = ft1000_ChPoll,
-        .open           = ft1000_ChOpen,
-        .release        = ft1000_ChRelease,
+        .unlocked_ioctl = ft1000_ioctl,
+        .poll           = ft1000_poll_dev,
+        .open           = ft1000_open,
+        .release        = ft1000_release,
         .llseek         = no_llseek,
 };
 
-
-
-
-//---------------------------------------------------------------------------
-// Function:    exec_mknod
-//
-// Parameters:
-//
-// Returns:
-//
-// Description:
-//
-// Notes:
-//
-//---------------------------------------------------------------------------
-static int exec_mknod (void *pdata)
-{
-        struct ft1000_info *info;
-    char mjnum[4];
-    char minornum[4];
-    char temp[32];
-    int retcode;
-//    int i;                                    //aelias [-] reason : unused variable
-    char *envp[] = { "HOME=/", "PATH=/usr/bin:/bin", NULL };
-    char *argv[]={"-m 666",temp,"c",mjnum,minornum,NULL};
-
-    info = pdata;
-    DEBUG("ft1000_chdev:exec_mknod is called with major number = %d\n", info->DeviceMajor);
-    sprintf(temp, "%s%s", "/dev/", info->DeviceName) ;
-    sprintf(mjnum, "%d", info->DeviceMajor);
-    sprintf(minornum, "%d", info->CardNumber);
-
-    //char *argv[]={"mknod","-m 666",temp,"c",mjnum,minornum,NULL};
-//    char *argv[]={"-m 666",temp,"c",mjnum,minornum,NULL};
-
-    //for (i=0; i<7;i++)
-    //    DEBUG("argv[%d]=%s\n", i, argv[i]);
-
-
-    retcode = call_usermodehelper ("/bin/mknod", argv, envp, 1);
-    if (retcode) {
-        DEBUG("ft1000_chdev:exec_mknod failed to make the node: retcode = %d\n", retcode);
-    }
-
-
-
-    return retcode;
-
-}
-
-//---------------------------------------------------------------------------
-// Function:    rm_mknod
-//
-// Description: This module removes the FT1000 device file
-//
-//---------------------------------------------------------------------------
-static int rm_mknod (void *pdata)
-{
-
-        struct ft1000_info *info;
-    //char *argv[4]={"rm", "-f", "/dev/FT1000", NULL};
-    int retcode;
-    char temp[32];
-    char *argv[]={"rm", "-f", temp, NULL};
-
-        info = (struct ft1000_info *)pdata;
-    DEBUG("ft1000_chdev:rm_mknod is called for device %s\n", info->DeviceName);
-    sprintf(temp, "%s%s", "/dev/", info->DeviceName) ;
-
-//    char *argv[]={"rm", "-f", temp, NULL};
-
-    retcode = call_usermodehelper ("/bin/rm", argv, NULL, 1);
-    if (retcode) {
-        DEBUG("ft1000_chdev:rm_mknod failed to remove the node: retcode = %d\n", retcode);
-    }
-    else
-        DEBUG("ft1000_chdev:rm_mknod done!\n");
-
-
-    return retcode;
-
-}
 //---------------------------------------------------------------------------
 // Function:    ft1000_get_buffer
 //
@@ -233,80 +137,55 @@ void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist)
 // Notes:       Only called by init_module().
 //
 //---------------------------------------------------------------------------
-int ft1000_CreateDevice(struct ft1000_device *dev)
+int ft1000_create_dev(struct ft1000_device *dev)
 {
         struct ft1000_info *info = netdev_priv(dev->net);
     int result;
     int i;
-    pid_t pid;
+        struct dentry *dir, *file;
+        struct ft1000_debug_dirs *tmp;
 
     // make a new device name
-    sprintf(info->DeviceName, "%s%d", "FT100", info->CardNumber);
-
-    // Delete any existing FT1000 node
-    pid = kernel_thread (rm_mknod,(void *)info, 0);
-    msleep(1000);
+    sprintf(info->DeviceName, "%s%d", "FT1000_", info->CardNumber);
 
-    DEBUG("ft1000_CreateDevice: number of instance = %d\n", ft1000_flarion_cnt);
+    DEBUG("%s: number of instance = %d\n", __func__, ft1000_flarion_cnt);
     DEBUG("DeviceCreated = %x\n", info->DeviceCreated);
 
-    //save the device info to global array
-    pdevobj[info->CardNumber] = dev;
-
-    DEBUG("ft1000_CreateDevice: ******SAVED pdevobj[%d]=%p\n", info->CardNumber, pdevobj[info->CardNumber]);    //aelias [+] reason:up
-
     if (info->DeviceCreated)
     {
-        DEBUG("ft1000_CreateDevice: \"%s\" already registered\n", info->DeviceName);
+        DEBUG("%s: \"%s\" already registered\n", __func__, info->DeviceName);
         return -EIO;
     }
 
 
     // register the device
-    DEBUG("ft1000_CreateDevice: \"%s\" device registration\n", info->DeviceName);
-    info->DeviceMajor = 0;
-
-    result = register_chrdev(info->DeviceMajor, info->DeviceName, &ft1000fops);
-    if (result < 0)
-    {
-        DEBUG("ft1000_CreateDevice: unable to get major %d\n", info->DeviceMajor);
-        return result;
-    }
-
-    DEBUG("ft1000_CreateDevice: registered char device \"%s\"\n", info->DeviceName);
+    DEBUG("%s: \"%s\" debugfs device registration\n", __func__, info->DeviceName);
 
-    // save a dynamic device major number
-    if (info->DeviceMajor == 0)
-    {
-        info->DeviceMajor = result;
-        DEBUG("ft1000_PcdCreateDevice: device major = %d\n", info->DeviceMajor);
-    }
+        tmp = kmalloc(sizeof(struct ft1000_debug_dirs), GFP_KERNEL);
+        if (tmp == NULL) {
+                result = -1;
+                goto fail;
+        }
 
-    // Create a thread to call user mode app to mknod
-    pid = kernel_thread (exec_mknod, (void *)info, 0);
+        dir = debugfs_create_dir(info->DeviceName, 0);
+        if (IS_ERR(dir)) {
+                result = PTR_ERR(dir);
+                goto debug_dir_fail;
+        }
 
-    // initialize application information
+        file = debugfs_create_file("device", S_IRUGO | S_IWUSR, dir,
+                                        dev, &ft1000fops);
+        if (IS_ERR(file)) {
+                result = PTR_ERR(file);
+                goto debug_file_fail;
+        }
 
-//    if (ft1000_flarion_cnt == 0) {
-//
-//        DEBUG("Initialize free_buff_lock and freercvpool\n");
-//        spin_lock_init(&free_buff_lock);
-//
-//        // initialize a list of buffers to be use for queuing up receive command data
-//        INIT_LIST_HEAD (&freercvpool);
-//
-//        // create list of free buffers
-//        for (i=0; i<NUM_OF_FREE_BUFFERS; i++) {
-//            // Get memory for DPRAM_DATA link list
-//            pdpram_blk = kmalloc ( sizeof(struct dpram_blk), GFP_KERNEL );
-//            // Get a block of memory to store command data
-//            pdpram_blk->pbuffer = kmalloc ( MAX_CMD_SQSIZE, GFP_KERNEL );
-//            // link provisioning data
-//            list_add_tail (&pdpram_blk->list, &freercvpool);
-//        }
-//        numofmsgbuf = NUM_OF_FREE_BUFFERS;
-//    }
+        tmp->dent = dir;
+        tmp->file = file;
+        tmp->int_number = info->CardNumber;
+        list_add(&(tmp->list), &(info->nodes.list));
 
+    DEBUG("%s: registered debugfs directory \"%s\"\n", __func__, info->DeviceName);
 
     // initialize application information
     info->appcnt = 0;
@@ -323,17 +202,17 @@ int ft1000_CreateDevice(struct ft1000_device *dev)
         INIT_LIST_HEAD (&info->app_info[i].app_sqlist);
     }
 
-
-
-
-//    ft1000Handle[info->CardNumber] = devfs_register(NULL, info->DeviceName, DEVFS_FL_AUTO_DEVNUM, 0, 0,
-//                                  S_IFCHR | S_IRUGO | S_IWUGO, &ft1000fops, NULL);
-
-
     info->DeviceCreated = TRUE;
     ft1000_flarion_cnt++;
 
-    return result;
+        return 0;
+
+debug_file_fail:
+        debugfs_remove(dir);
+debug_dir_fail:
+        kfree(tmp);
+fail:
+        return result;
 }
 
 //---------------------------------------------------------------------------
@@ -346,27 +225,33 @@ int ft1000_CreateDevice(struct ft1000_device *dev)
 // Notes:       Only called by cleanup_module().
 //
 //---------------------------------------------------------------------------
-void ft1000_DestroyDevice(struct net_device *dev)
+void ft1000_destroy_dev(struct net_device *dev)
 {
         struct ft1000_info *info = netdev_priv(dev);
-    int result = 0;
-    pid_t pid;
                 int i;
         struct dpram_blk *pdpram_blk;
         struct dpram_blk *ptr;
+        struct list_head *pos, *q;
+        struct ft1000_debug_dirs *dir;
 
-    DEBUG("ft1000_chdev:ft1000_DestroyDevice called\n");
+    DEBUG("%s called\n", __func__);
 
 
 
     if (info->DeviceCreated)
         {
         ft1000_flarion_cnt--;
-                unregister_chrdev(info->DeviceMajor, info->DeviceName);
-                DEBUG("ft1000_DestroyDevice: unregistered device \"%s\", result = %d\n",
-                                           info->DeviceName, result);
-
-       pid = kernel_thread (rm_mknod, (void *)info, 0);
+                list_for_each_safe(pos, q, &info->nodes.list) {
+                        dir = list_entry(pos, struct ft1000_debug_dirs, list);
+                        if (dir->int_number == info->CardNumber) {
+                                debugfs_remove(dir->file);
+                                debugfs_remove(dir->dent);
+                                list_del(pos);
+                                kfree(dir);
+                        }
+                }
+                DEBUG("%s: unregistered device \"%s\"\n", __func__,
+                                           info->DeviceName);
 
         // Make sure we free any memory reserve for slow Queue
         for (i=0; i<MAX_NUM_APP; i++) {
@@ -388,19 +273,14 @@ void ft1000_DestroyDevice(struct net_device *dev)
                 kfree(ptr);
             }
         }
-
-//        devfs_unregister(ft1000Handle[info->CardNumber]);
-
                 info->DeviceCreated = FALSE;
-
-                pdevobj[info->CardNumber] = NULL;
         }
 
 
 }
 
 //---------------------------------------------------------------------------
-// Function:    ft1000_ChOpen
+// Function:    ft1000_open
 //
 // Parameters:
 //
@@ -409,28 +289,19 @@ void ft1000_DestroyDevice(struct net_device *dev)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static int ft1000_ChOpen (struct inode *Inode, struct file *File)
+static int ft1000_open (struct inode *inode, struct file *file)
 {
         struct ft1000_info *info;
+        struct ft1000_device *dev = (struct ft1000_device *)inode->i_private;
     int i,num;
 
-    DEBUG("ft1000_ChOpen called\n");
-    num = (MINOR(Inode->i_rdev) & 0xf);
-    DEBUG("ft1000_ChOpen: minor number=%d\n", num);
+    DEBUG("%s called\n", __func__);
+    num = (MINOR(inode->i_rdev) & 0xf);
+    DEBUG("ft1000_open: minor number=%d\n", num);
 
-    for (i=0; i<5; i++)
-        DEBUG("pdevobj[%d]=%p\n", i, pdevobj[i]); //aelias [+] reason: down
+        info = file->private_data = netdev_priv(dev->net);
 
-    if ( pdevobj[num] != NULL )
-        //info = (struct ft1000_info *)(pdevobj[num]->net->priv);
-                info = (struct ft1000_info *)netdev_priv(pdevobj[num]->net);
-    else
-    {
-        DEBUG("ft1000_ChOpen: can not find device object %d\n", num);
-        return -1;
-    }
-
-    DEBUG("f_owner = %p number of application = %d\n", (&File->f_owner), info->appcnt );
+    DEBUG("f_owner = %p number of application = %d\n", (&file->f_owner), info->appcnt );
 
     // Check if maximum number of application exceeded
     if (info->appcnt > MAX_NUM_APP) {
@@ -452,21 +323,19 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File)
     }
 
     info->appcnt++;
-    info->app_info[i].fileobject = &File->f_owner;
+    info->app_info[i].fileobject = &file->f_owner;
     info->app_info[i].nTxMsg = 0;
     info->app_info[i].nRxMsg = 0;
     info->app_info[i].nTxMsgReject = 0;
     info->app_info[i].nRxMsgMiss = 0;
 
-    File->private_data = pdevobj[num]->net;
-
-        nonseekable_open(Inode, File);
+        nonseekable_open(inode, file);
     return 0;
 }
 
 
 //---------------------------------------------------------------------------
-// Function:    ft1000_ChPoll
+// Function:    ft1000_poll_dev
 //
 // Parameters:
 //
@@ -476,47 +345,47 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File)
 //
 //---------------------------------------------------------------------------
 
-static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait)
+static unsigned int ft1000_poll_dev(struct file *file, poll_table *wait)
 {
     struct net_device *dev = file->private_data;
         struct ft1000_info *info;
     int i;
 
-    //DEBUG("ft1000_ChPoll called\n");
+    //DEBUG("ft1000_poll_dev called\n");
     if (ft1000_flarion_cnt == 0) {
-        DEBUG("FT1000:ft1000_ChPoll called when ft1000_flarion_cnt is zero\n");
+        DEBUG("FT1000:ft1000_poll_dev called when ft1000_flarion_cnt is zero\n");
         return (-EBADF);
     }
 
-        info = (struct ft1000_info *) netdev_priv(dev);
+        info = netdev_priv(dev);
 
     // Search for matching file object
     for (i=0; i<MAX_NUM_APP; i++) {
         if ( info->app_info[i].fileobject == &file->f_owner) {
-            //DEBUG("FT1000:ft1000_ChIoctl: Message is for AppId = %d\n", info->app_info[i].app_id);
+            //DEBUG("FT1000:ft1000_ioctl: Message is for AppId = %d\n", info->app_info[i].app_id);
             break;
         }
     }
 
     // Could not find application info block
     if (i == MAX_NUM_APP) {
-        DEBUG("FT1000:ft1000_ChIoctl:Could not find application info block\n");
+        DEBUG("FT1000:ft1000_ioctl:Could not find application info block\n");
         return ( -EACCES );
     }
 
     if (list_empty(&info->app_info[i].app_sqlist) == 0) {
-        DEBUG("FT1000:ft1000_ChPoll:Message detected in slow queue\n");
+        DEBUG("FT1000:ft1000_poll_dev:Message detected in slow queue\n");
         return(POLLIN | POLLRDNORM | POLLPRI);
     }
 
     poll_wait (file, &info->app_info[i].wait_dpram_msg, wait);
-    //DEBUG("FT1000:ft1000_ChPoll:Polling for data from DSP\n");
+    //DEBUG("FT1000:ft1000_poll_dev:Polling for data from DSP\n");
 
     return (0);
 }
 
 //---------------------------------------------------------------------------
-// Function:    ft1000_ChIoctl
+// Function:    ft1000_ioctl
 //
 // Parameters:
 //
@@ -525,11 +394,10 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static long ft1000_ChIoctl (struct file *File, unsigned int Command,
-                           unsigned long Argument)
+static long ft1000_ioctl (struct file *file, unsigned int command,
+                           unsigned long argument)
 {
-    void __user *argp = (void __user *)Argument;
-    struct net_device *dev;
+    void __user *argp = (void __user *)argument;
         struct ft1000_info *info;
     struct ft1000_device *ft1000dev;
     int result=0;
@@ -550,25 +418,24 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
     unsigned short ledStat=0;
     unsigned short conStat=0;
 
-    //DEBUG("ft1000_ChIoctl called\n");
+    //DEBUG("ft1000_ioctl called\n");
 
     if (ft1000_flarion_cnt == 0) {
-        DEBUG("FT1000:ft1000_ChIoctl called when ft1000_flarion_cnt is zero\n");
+        DEBUG("FT1000:ft1000_ioctl called when ft1000_flarion_cnt is zero\n");
         return (-EBADF);
     }
 
-    //DEBUG("FT1000:ft1000_ChIoctl:Command = 0x%x Argument = 0x%8x\n", Command, (u32)Argument);
+    //DEBUG("FT1000:ft1000_ioctl:command = 0x%x argument = 0x%8x\n", command, (u32)argument);
 
-    dev = File->private_data;
-        info = (struct ft1000_info *) netdev_priv(dev);
-    ft1000dev = info->pFt1000Dev;
-    cmd = _IOC_NR(Command);
-    //DEBUG("FT1000:ft1000_ChIoctl:cmd = 0x%x\n", cmd);
+        info = file->private_data;
+        ft1000dev = info->pFt1000Dev;
+    cmd = _IOC_NR(command);
+    //DEBUG("FT1000:ft1000_ioctl:cmd = 0x%x\n", cmd);
 
     // process the command
     switch (cmd) {
     case IOCTL_REGISTER_CMD:
-            DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_REGISTER called\n");
+            DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_REGISTER called\n");
             result = get_user(tempword, (__u16 __user*)argp);
             if (result) {
                 DEBUG("result = %d failed to get_user\n", result);
@@ -577,9 +444,9 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
             if (tempword == DSPBCMSGID) {
                 // Search for matching file object
                 for (i=0; i<MAX_NUM_APP; i++) {
-                    if ( info->app_info[i].fileobject == &File->f_owner) {
+                    if ( info->app_info[i].fileobject == &file->f_owner) {
                         info->app_info[i].DspBCMsgFlag = 1;
-                        DEBUG("FT1000:ft1000_ChIoctl:Registered for broadcast messages\n");
+                        DEBUG("FT1000:ft1000_ioctl:Registered for broadcast messages\n");
                         break;
                     }
                 }
@@ -587,34 +454,34 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
             break;
 
     case IOCTL_GET_VER_CMD:
-        DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_GET_VER called\n");
+        DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_VER called\n");
 
         get_ver_data.drv_ver = FT1000_DRV_VER;
 
         if (copy_to_user(argp, &get_ver_data, sizeof(get_ver_data)) ) {
-            DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n");
+            DEBUG("FT1000:ft1000_ioctl: copy fault occurred\n");
             result = -EFAULT;
             break;
         }
 
-        DEBUG("FT1000:ft1000_ChIoctl:driver version = 0x%x\n",(unsigned int)get_ver_data.drv_ver);
+        DEBUG("FT1000:ft1000_ioctl:driver version = 0x%x\n",(unsigned int)get_ver_data.drv_ver);
 
         break;
     case IOCTL_CONNECT:
         // Connect Message
-        DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_CONNECT\n");
+        DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n");
         ConnectionMsg[79] = 0xfc;
                            CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
 
         break;
     case IOCTL_DISCONNECT:
         // Disconnect Message
-        DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_DISCONNECT\n");
+        DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n");
         ConnectionMsg[79] = 0xfd;
                            CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
         break;
     case IOCTL_GET_DSP_STAT_CMD:
-        //DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_GET_DSP_STAT called\n");
+        //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DSP_STAT called\n");
         memset(&get_stat_data, 0, sizeof(get_stat_data));
         memcpy(get_stat_data.DspVer, info->DspVer, DSPVERSZ);
         memcpy(get_stat_data.HwSerNum, info->HwSerNum, HWSERNUMSZ);
@@ -622,12 +489,12 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
         memcpy(get_stat_data.eui64, info->eui64, EUISZ);
 
             if (info->ProgConStat != 0xFF) {
-                ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_LED, (PUCHAR)&ledStat, FT1000_MAG_DSP_LED_INDX);
+                ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_LED, (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX);
                 get_stat_data.LedStat = ntohs(ledStat);
-                DEBUG("FT1000:ft1000_ChIoctl: LedStat = 0x%x\n", get_stat_data.LedStat);
-                ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (PUCHAR)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
+                DEBUG("FT1000:ft1000_ioctl: LedStat = 0x%x\n", get_stat_data.LedStat);
+                ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
                 get_stat_data.ConStat = ntohs(conStat);
-                DEBUG("FT1000:ft1000_ChIoctl: ConStat = 0x%x\n", get_stat_data.ConStat);
+                DEBUG("FT1000:ft1000_ioctl: ConStat = 0x%x\n", get_stat_data.ConStat);
             }
             else {
                 get_stat_data.ConStat = 0x0f;
@@ -642,7 +509,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
         get_stat_data.ConTm = (u32)(tv.tv_sec - info->ConTm);
         DEBUG("Connection Time = %d\n", (int)get_stat_data.ConTm);
         if (copy_to_user(argp, &get_stat_data, sizeof(get_stat_data)) ) {
-            DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n");
+            DEBUG("FT1000:ft1000_ioctl: copy fault occurred\n");
             result = -EFAULT;
             break;
         }
@@ -650,17 +517,17 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
         break;
     case IOCTL_SET_DPRAM_CMD:
         {
-            IOCTL_DPRAM_BLK *dpram_data;
+            IOCTL_DPRAM_BLK *dpram_data = NULL;
             //IOCTL_DPRAM_COMMAND dpram_command;
-            USHORT qtype;
-            USHORT msgsz;
+            u16 qtype;
+            u16 msgsz;
                 struct pseudo_hdr *ppseudo_hdr;
-            PUSHORT pmsg;
-            USHORT total_len;
-            USHORT app_index;
+            u16 *pmsg;
+            u16 total_len;
+            u16 app_index;
             u16 status;
 
-            //DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_SET_DPRAM called\n");
+            //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_SET_DPRAM called\n");
 
 
             if (ft1000_flarion_cnt == 0) {
@@ -679,15 +546,15 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
 
             if (info->CardReady) {
 
-               //DEBUG("FT1000:ft1000_ChIoctl: try to SET_DPRAM \n");
+               //DEBUG("FT1000:ft1000_ioctl: try to SET_DPRAM \n");
 
                 // Get the length field to see how many bytes to copy
                 result = get_user(msgsz, (__u16 __user *)argp);
                 msgsz = ntohs (msgsz);
-                //DEBUG("FT1000:ft1000_ChIoctl: length of message = %d\n", msgsz);
+                //DEBUG("FT1000:ft1000_ioctl: length of message = %d\n", msgsz);
 
                 if (msgsz > MAX_CMD_SQSIZE) {
-                    DEBUG("FT1000:ft1000_ChIoctl: bad message length = %d\n", msgsz);
+                    DEBUG("FT1000:ft1000_ioctl: bad message length = %d\n", msgsz);
                     result = -EINVAL;
                     break;
                 }
@@ -697,22 +564,14 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                 if (!dpram_data)
                         break;
 
-                //if ( copy_from_user(&(dpram_command.dpram_blk), (PIOCTL_DPRAM_BLK)Argument, msgsz+2) ) {
-                if ( copy_from_user(&dpram_data, argp, msgsz+2) ) {
+                if ( copy_from_user(dpram_data, argp, msgsz+2) ) {
                     DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n");
                     result = -EFAULT;
                 }
                 else {
-#if 0
-                    // whc - for debugging only
-                    ptr = (char *)&dpram_data;
-                    for (i=0; i<msgsz; i++) {
-                        DEBUG(1,"FT1000:ft1000_ChIoctl: data %d = 0x%x\n", i, *ptr++);
-                    }
-#endif
                     // Check if this message came from a registered application
                     for (i=0; i<MAX_NUM_APP; i++) {
-                        if ( info->app_info[i].fileobject == &File->f_owner) {
+                        if ( info->app_info[i].fileobject == &file->f_owner) {
                             break;
                         }
                     }
@@ -725,16 +584,15 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                     app_index = i;
 
                     // Check message qtype type which is the lower byte within qos_class
-                    //qtype = ntohs(dpram_command.dpram_blk.pseudohdr.qos_class) & 0xff;
                     qtype = ntohs(dpram_data->pseudohdr.qos_class) & 0xff;
-                    //DEBUG("FT1000_ft1000_ChIoctl: qtype = %d\n", qtype);
+                    //DEBUG("FT1000_ft1000_ioctl: qtype = %d\n", qtype);
                     if (qtype) {
                     }
                     else {
                         // Put message into Slow Queue
                         // Only put a message into the DPRAM if msg doorbell is available
                         status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_DOORBELL);
-                        //DEBUG("FT1000_ft1000_ChIoctl: READ REGISTER tempword=%x\n", tempword);
+                        //DEBUG("FT1000_ft1000_ioctl: READ REGISTER tempword=%x\n", tempword);
                         if (tempword & FT1000_DB_DPRAM_TX) {
                             // Suspend for 2ms and try again due to DSP doorbell busy
                             mdelay(2);
@@ -750,7 +608,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                                         mdelay(3);
                                         status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_DOORBELL);
                                         if (tempword & FT1000_DB_DPRAM_TX) {
-                                            DEBUG("FT1000:ft1000_ChIoctl:Doorbell not available\n");
+                                            DEBUG("FT1000:ft1000_ioctl:Doorbell not available\n");
                                             result = -ENOTTY;
                                                 kfree(dpram_data);
                                             break;
@@ -760,13 +618,12 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                             }
                         }
 
-                        //DEBUG("FT1000_ft1000_ChIoctl: finished reading register\n");
+                        //DEBUG("FT1000_ft1000_ioctl: finished reading register\n");
 
                         // Make sure we are within the limits of the slow queue memory limitation
                         if ( (msgsz < MAX_CMD_SQSIZE) && (msgsz > PSEUDOSZ) ) {
                             // Need to put sequence number plus new checksum for message
-                            //pmsg = (PUSHORT)&dpram_command.dpram_blk.pseudohdr;
-                            pmsg = (PUSHORT)&dpram_data->pseudohdr;
+                            pmsg = (u16 *)&dpram_data->pseudohdr;
                                 ppseudo_hdr = (struct pseudo_hdr *)pmsg;
                             total_len = msgsz+2;
                             if (total_len & 0x1) {
@@ -785,17 +642,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                             }
                             pmsg++;
                                 ppseudo_hdr = (struct pseudo_hdr *)pmsg;
-#if 0
-                            ptr = dpram_data;
-                            DEBUG("FT1000:ft1000_ChIoctl: Command Send\n");
-                            for (i=0; i<total_len; i++) {
-                                DEBUG("FT1000:ft1000_ChIoctl: data %d = 0x%x\n", i, *ptr++);
-                            }
-#endif
-                            //dpram_command.extra = 0;
-
-                            //CardSendCommand(ft1000dev,(unsigned char*)&dpram_command,total_len+2);
-                            CardSendCommand(ft1000dev,(unsigned short*)dpram_data,total_len+2);
+                           CardSendCommand(ft1000dev,(unsigned short*)dpram_data,total_len+2);
 
 
                             info->app_info[app_index].nTxMsg++;
@@ -807,7 +654,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                 }
             }
             else {
-                DEBUG("FT1000:ft1000_ChIoctl: Card not ready take messages\n");
+                DEBUG("FT1000:ft1000_ioctl: Card not ready take messages\n");
                 result = -EACCES;
             }
             kfree(dpram_data);
@@ -820,7 +667,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
             IOCTL_DPRAM_BLK __user *pioctl_dpram;
             int msglen;
 
-            //DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_GET_DPRAM called\n");
+            //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DPRAM called\n");
 
             if (ft1000_flarion_cnt == 0) {
                 return (-EBADF);
@@ -828,15 +675,15 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
 
             // Search for matching file object
             for (i=0; i<MAX_NUM_APP; i++) {
-                if ( info->app_info[i].fileobject == &File->f_owner) {
-                    //DEBUG("FT1000:ft1000_ChIoctl: Message is for AppId = %d\n", info->app_info[i].app_id);
+                if ( info->app_info[i].fileobject == &file->f_owner) {
+                    //DEBUG("FT1000:ft1000_ioctl: Message is for AppId = %d\n", info->app_info[i].app_id);
                     break;
                 }
             }
 
             // Could not find application info block
             if (i == MAX_NUM_APP) {
-                DEBUG("FT1000:ft1000_ChIoctl:Could not find application info block\n");
+                DEBUG("FT1000:ft1000_ioctl:Could not find application info block\n");
                 result = -EBADF;
                 break;
             }
@@ -844,22 +691,22 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
             result = 0;
             pioctl_dpram = argp;
             if (list_empty(&info->app_info[i].app_sqlist) == 0) {
-                //DEBUG("FT1000:ft1000_ChIoctl:Message detected in slow queue\n");
+                //DEBUG("FT1000:ft1000_ioctl:Message detected in slow queue\n");
                 spin_lock_irqsave(&free_buff_lock, flags);
                 pdpram_blk = list_entry(info->app_info[i].app_sqlist.next, struct dpram_blk, list);
                 list_del(&pdpram_blk->list);
                 info->app_info[i].NumOfMsg--;
-                //DEBUG("FT1000:ft1000_ChIoctl:NumOfMsg for app %d = %d\n", i, info->app_info[i].NumOfMsg);
+                //DEBUG("FT1000:ft1000_ioctl:NumOfMsg for app %d = %d\n", i, info->app_info[i].NumOfMsg);
                 spin_unlock_irqrestore(&free_buff_lock, flags);
                 msglen = ntohs(*(u16 *)pdpram_blk->pbuffer) + PSEUDOSZ;
                 result = get_user(msglen, &pioctl_dpram->total_len);
                 if (result)
                         break;
                 msglen = htons(msglen);
-                //DEBUG("FT1000:ft1000_ChIoctl:msg length = %x\n", msglen);
+                //DEBUG("FT1000:ft1000_ioctl:msg length = %x\n", msglen);
                 if(copy_to_user (&pioctl_dpram->pseudohdr, pdpram_blk->pbuffer, msglen))
                                 {
-                                        DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n");
+                                        DEBUG("FT1000:ft1000_ioctl: copy fault occurred\n");
                         result = -EFAULT;
                         break;
                                 }
@@ -867,12 +714,12 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
                 ft1000_free_buffer(pdpram_blk, &freercvpool);
                 result = msglen;
             }
-            //DEBUG("FT1000:ft1000_ChIoctl: IOCTL_FT1000_GET_DPRAM no message\n");
+            //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DPRAM no message\n");
         }
         break;
 
     default:
-        DEBUG("FT1000:ft1000_ChIoctl:unknown command: 0x%x\n", Command);
+        DEBUG("FT1000:ft1000_ioctl:unknown command: 0x%x\n", command);
         result = -ENOTTY;
         break;
     }
@@ -881,7 +728,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
 }
 
 //---------------------------------------------------------------------------
-// Function:    ft1000_ChRelease
+// Function:    ft1000_release
 //
 // Parameters:
 //
@@ -890,17 +737,17 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
 // Notes:
 //
 //---------------------------------------------------------------------------
-static int ft1000_ChRelease (struct inode *Inode, struct file *File)
+static int ft1000_release (struct inode *inode, struct file *file)
 {
         struct ft1000_info *info;
     struct net_device *dev;
     int i;
         struct dpram_blk *pdpram_blk;
 
-    DEBUG("ft1000_ChRelease called\n");
+    DEBUG("ft1000_release called\n");
 
-    dev = File->private_data;
-        info = (struct ft1000_info *) netdev_priv(dev);
+    dev = file->private_data;
+        info = netdev_priv(dev);
 
     if (ft1000_flarion_cnt == 0) {
         info->appcnt--;
@@ -909,8 +756,8 @@ static int ft1000_ChRelease (struct inode *Inode, struct file *File)
 
     // Search for matching file object
     for (i=0; i<MAX_NUM_APP; i++) {
-        if ( info->app_info[i].fileobject == &File->f_owner) {
-            //DEBUG("FT1000:ft1000_ChIoctl: Message is for AppId = %d\n", info->app_info[i].app_id);
+        if ( info->app_info[i].fileobject == &file->f_owner) {
+            //DEBUG("FT1000:ft1000_ioctl: Message is for AppId = %d\n", info->app_info[i].app_id);
             break;
         }
     }
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 4dd456fbab9b..17546d8ec08d 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -123,11 +123,11 @@ struct dsp_image_info {
 // Notes:
 //
 //---------------------------------------------------------------------------
-static ULONG check_usb_db (struct ft1000_device *ft1000dev)
+static u32 check_usb_db (struct ft1000_device *ft1000dev)
 {
    int               loopcnt;
-   USHORT            temp;
-   ULONG             status;
+   u16            temp;
+   u32             status;
 
    loopcnt = 0;
    while (loopcnt < 10)
@@ -190,7 +190,7 @@ static ULONG check_usb_db (struct ft1000_device *ft1000dev)
 // Function:    get_handshake
 //
 // Parameters:  struct ft1000_device  - device structure
-//              USHORT expected_value - the handshake value expected
+//              u16 expected_value - the handshake value expected
 //
 // Returns:     handshakevalue - success
 //              HANDSHAKE_TIMEOUT_VALUE - failure
@@ -200,11 +200,11 @@ static ULONG check_usb_db (struct ft1000_device *ft1000dev)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_value)
+static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value)
 {
-   USHORT            handshake;
+   u16            handshake;
    int               loopcnt;
-   ULONG             status=0;
+   u32             status=0;
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
    loopcnt = 0;
@@ -228,7 +228,7 @@ static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_val
                    status = ft1000_write_register (ft1000dev,  FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL);
                }
 
-                status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (PUCHAR)&handshake, 1);
+                status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
                 //DEBUG("get_handshake: handshake is %x\n", tempx);
                 handshake = ntohs(handshake);
                 //DEBUG("get_handshake: after swap, handshake is %x\n", handshake);
@@ -259,7 +259,7 @@ static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_val
 // Function:    put_handshake
 //
 // Parameters:  struct ft1000_device  - device structure
-//              USHORT handshake_value - handshake to be written
+//              u16 handshake_value - handshake to be written
 //
 // Returns:     none
 //
@@ -269,30 +269,30 @@ static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_val
 // Notes:
 //
 //---------------------------------------------------------------------------
-static void put_handshake(struct ft1000_device *ft1000dev,USHORT handshake_value)
+static void put_handshake(struct ft1000_device *ft1000dev,u16 handshake_value)
 {
-    ULONG tempx;
-    USHORT tempword;
-    ULONG status;
+    u32 tempx;
+    u16 tempword;
+    u32 status;
 
 
 
-        tempx = (ULONG)handshake_value;
+        tempx = (u32)handshake_value;
         tempx = ntohl(tempx);
 
-        tempword = (USHORT)(tempx & 0xffff);
+        tempword = (u16)(tempx & 0xffff);
         status = ft1000_write_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, tempword, 0);
-        tempword = (USHORT)(tempx >> 16);
+        tempword = (u16)(tempx >> 16);
         status = ft1000_write_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, tempword, 1);
         status = ft1000_write_register(ft1000dev, FT1000_DB_DNLD_TX, FT1000_REG_DOORBELL);
 }
 
-static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected_value)
+static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value)
 {
-   USHORT            handshake;
+   u16            handshake;
    int               loopcnt;
-   USHORT            temp;
-   ULONG             status=0;
+   u16            temp;
+   u32             status=0;
 
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
    loopcnt = 0;
@@ -300,10 +300,10 @@ static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected
    while (loopcnt < 100)
    {
        if (pft1000info->usbboot == 2) {
-           status = ft1000_read_dpram32 (ft1000dev, 0, (PUCHAR)&(pft1000info->tempbuf[0]), 64);
+           status = ft1000_read_dpram32 (ft1000dev, 0, (u8 *)&(pft1000info->tempbuf[0]), 64);
            for (temp=0; temp<16; temp++)
                DEBUG("tempbuf %d = 0x%x\n", temp, pft1000info->tempbuf[temp]);
-           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (PUCHAR)&handshake, 1);
+           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
            DEBUG("handshake from read_dpram16 = 0x%x\n", handshake);
            if (pft1000info->dspalive == pft1000info->tempbuf[6])
                handshake = 0;
@@ -313,7 +313,7 @@ static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected
            }
        }
        else {
-           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (PUCHAR)&handshake, 1);
+           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
        }
        loopcnt++;
        msleep(10);
@@ -327,7 +327,7 @@ static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected
    return HANDSHAKE_TIMEOUT_VALUE;
 }
 
-static void put_handshake_usb(struct ft1000_device *ft1000dev,USHORT handshake_value)
+static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_value)
 {
    int i;
 
@@ -346,44 +346,44 @@ static void put_handshake_usb(struct ft1000_device *ft1000dev,USHORT handshake_v
 // Notes:
 //
 //---------------------------------------------------------------------------
-static USHORT get_request_type(struct ft1000_device *ft1000dev)
+static u16 get_request_type(struct ft1000_device *ft1000dev)
 {
-   USHORT   request_type;
-   ULONG    status;
-   USHORT   tempword;
-   ULONG    tempx;
+   u16   request_type;
+   u32    status;
+   u16   tempword;
+   u32    tempx;
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
    if ( pft1000info->bootmode == 1)
    {
-       status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx);
+       status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
        tempx = ntohl(tempx);
    }
    else
    {
        tempx = 0;
 
-       status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempword, 1);
+       status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1);
        tempx |= (tempword << 16);
        tempx = ntohl(tempx);
    }
-   request_type = (USHORT)tempx;
+   request_type = (u16)tempx;
 
    //DEBUG("get_request_type: request_type is %x\n", request_type);
    return request_type;
 
 }
 
-static USHORT get_request_type_usb(struct ft1000_device *ft1000dev)
+static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
 {
-   USHORT   request_type;
-   ULONG    status;
-   USHORT   tempword;
-   ULONG    tempx;
+   u16   request_type;
+   u32    status;
+   u16   tempword;
+   u32    tempx;
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
    if ( pft1000info->bootmode == 1)
    {
-       status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx);
+       status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
        tempx = ntohl(tempx);
    }
    else
@@ -394,12 +394,12 @@ static USHORT get_request_type_usb(struct ft1000_device *ft1000dev)
        }
        else {
           tempx = 0;
-          status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempword, 1);
+          status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1);
        }
        tempx |= (tempword << 16);
        tempx = ntohl(tempx);
    }
-   request_type = (USHORT)tempx;
+   request_type = (u16)tempx;
 
    //DEBUG("get_request_type: request_type is %x\n", request_type);
    return request_type;
@@ -420,22 +420,22 @@ static USHORT get_request_type_usb(struct ft1000_device *ft1000dev)
 //---------------------------------------------------------------------------
 static long get_request_value(struct ft1000_device *ft1000dev)
 {
-   ULONG     value;
-   USHORT   tempword;
-   ULONG    status;
+   u32     value;
+   u16   tempword;
+   u32    status;
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
 
        if ( pft1000info->bootmode == 1)
        {
-           status = fix_ft1000_read_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (PUCHAR)&value);
+           status = fix_ft1000_read_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
            value = ntohl(value);
        }
        else
        {
-           status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (PUCHAR)&tempword, 0);
+           status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
            value = tempword;
-           status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (PUCHAR)&tempword, 1);
+           status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
            value |= (tempword << 16);
            value = ntohl(value);
        }
@@ -449,9 +449,9 @@ static long get_request_value(struct ft1000_device *ft1000dev)
 #if 0
 static long get_request_value_usb(struct ft1000_device *ft1000dev)
 {
-   ULONG     value;
-   USHORT   tempword;
-   ULONG    status;
+   u32     value;
+   u16   tempword;
+   u32    status;
    struct ft1000_info * pft1000info = netdev_priv(ft1000dev->net);
 
        if (pft1000info->usbboot == 2) {
@@ -460,7 +460,7 @@ static long get_request_value_usb(struct ft1000_device *ft1000dev)
        }
        else {
           value = 0;
-          status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (PUCHAR)&tempword, 1);
+          status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
        }
 
        value |= (tempword << 16);
@@ -490,11 +490,11 @@ static long get_request_value_usb(struct ft1000_device *ft1000dev)
 //---------------------------------------------------------------------------
 static void put_request_value(struct ft1000_device *ft1000dev, long lvalue)
 {
-   ULONG    tempx;
-   ULONG    status;
+   u32    tempx;
+   u32    status;
 
        tempx = ntohl(lvalue);
-       status = fix_ft1000_write_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (PUCHAR)&tempx);
+       status = fix_ft1000_write_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempx);
 
 
 
@@ -516,10 +516,10 @@ static void put_request_value(struct ft1000_device *ft1000dev, long lvalue)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static USHORT hdr_checksum(struct pseudo_hdr *pHdr)
+static u16 hdr_checksum(struct pseudo_hdr *pHdr)
 {
-   USHORT   *usPtr = (USHORT *)pHdr;
-   USHORT   chksum;
+   u16   *usPtr = (u16 *)pHdr;
+   u16   chksum;
 
 
   chksum = ((((((usPtr[0] ^ usPtr[1]) ^ usPtr[2]) ^ usPtr[3]) ^
@@ -533,8 +533,8 @@ static USHORT hdr_checksum(struct pseudo_hdr *pHdr)
 // Function:    write_blk
 //
 // Parameters:  struct ft1000_device  - device structure
-//              USHORT **pUsFile - DSP image file pointer in USHORT
-//              UCHAR  **pUcFile - DSP image file pointer in UCHAR
+//              u16 **pUsFile - DSP image file pointer in u16
+//              u8  **pUcFile - DSP image file pointer in u8
 //              long   word_length - lenght of the buffer to be written
 //                                   to DPRAM
 //
@@ -546,20 +546,20 @@ static USHORT hdr_checksum(struct pseudo_hdr *pHdr)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR **pUcFile, long word_length)
+static u32 write_blk (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
 {
-   ULONG Status = STATUS_SUCCESS;
-   USHORT dpram;
+   u32 Status = STATUS_SUCCESS;
+   u16 dpram;
    long temp_word_length;
    int loopcnt, i, j;
-   USHORT *pTempFile;
-   USHORT tempword;
-   USHORT tempbuffer[64];
-   USHORT resultbuffer[64];
+   u16 *pTempFile;
+   u16 tempword;
+   u16 tempbuffer[64];
+   u16 resultbuffer[64];
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
    //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length);
-   dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
+   dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;
    tempword = *(*pUsFile);
    (*pUsFile)++;
    Status = ft1000_write_dpram16(ft1000dev, dpram, tempword, 0);
@@ -569,7 +569,7 @@ static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR
 
    *pUcFile = *pUcFile + 4;
    word_length--;
-   tempword = (USHORT)word_length;
+   tempword = (u16)word_length;
    word_length = (word_length / 16) + 1;
    pTempFile = *pUsFile;
    temp_word_length = word_length;
@@ -602,24 +602,24 @@ static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR
               if (pft1000info->bootmode == 0)
               {
                  if (dpram >= 0x3F4)
-                     Status = ft1000_write_dpram32 (ft1000dev, dpram, (PUCHAR)&tempbuffer[0], 8);
+                     Status = ft1000_write_dpram32 (ft1000dev, dpram, (u8 *)&tempbuffer[0], 8);
                  else
-                    Status = ft1000_write_dpram32 (ft1000dev, dpram, (PUCHAR)&tempbuffer[0], 64);
+                    Status = ft1000_write_dpram32 (ft1000dev, dpram, (u8 *)&tempbuffer[0], 64);
               }
               else
               {
                  for (j=0; j<10; j++)
                  {
-                   Status = ft1000_write_dpram32 (ft1000dev, dpram, (PUCHAR)&tempbuffer[0], 64);
+                   Status = ft1000_write_dpram32 (ft1000dev, dpram, (u8 *)&tempbuffer[0], 64);
                    if (Status == STATUS_SUCCESS)
                    {
                        // Work around for ASIC bit stuffing problem.
                        if ( (tempbuffer[31] & 0xfe00) == 0xfe00)
                        {
-                           Status = ft1000_write_dpram32(ft1000dev, dpram+12, (PUCHAR)&tempbuffer[24], 64);
+                           Status = ft1000_write_dpram32(ft1000dev, dpram+12, (u8 *)&tempbuffer[24], 64);
                        }
                        // Let's check the data written
-                       Status = ft1000_read_dpram32 (ft1000dev, dpram, (PUCHAR)&resultbuffer[0], 64);
+                       Status = ft1000_read_dpram32 (ft1000dev, dpram, (u8 *)&resultbuffer[0], 64);
                        if ( (tempbuffer[31] & 0xfe00) == 0xfe00)
                        {
                            for (i=0; i<28; i++)
@@ -633,7 +633,7 @@ static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR
                                    break;
                                 }
                            }
-                           Status = ft1000_read_dpram32 (ft1000dev, dpram+12, (PUCHAR)&resultbuffer[0], 64);
+                           Status = ft1000_read_dpram32 (ft1000dev, dpram+12, (u8 *)&resultbuffer[0], 64);
                            for (i=0; i<16; i++)
                            {
                                if (resultbuffer[i] != tempbuffer[i+24])
@@ -689,8 +689,8 @@ static void usb_dnld_complete (struct urb *urb)
 // Function:    write_blk_fifo
 //
 // Parameters:  struct ft1000_device  - device structure
-//              USHORT **pUsFile - DSP image file pointer in USHORT
-//              UCHAR  **pUcFile - DSP image file pointer in UCHAR
+//              u16 **pUsFile - DSP image file pointer in u16
+//              u8  **pUcFile - DSP image file pointer in u8
 //              long   word_length - lenght of the buffer to be written
 //                                   to DPRAM
 //
@@ -702,9 +702,9 @@ static void usb_dnld_complete (struct urb *urb)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static ULONG write_blk_fifo (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR **pUcFile, long word_length)
+static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
 {
-   ULONG Status = STATUS_SUCCESS;
+   u32 Status = STATUS_SUCCESS;
    int byte_length;
    long aligncnt;
 
@@ -770,36 +770,36 @@ static ULONG write_blk_fifo (struct ft1000_device *ft1000dev, USHORT **pUsFile,
 //  Returns:    status                  - return code
 //---------------------------------------------------------------------------
 
-u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLength)
+u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32  FileLength)
 {
-   u16                     Status = STATUS_SUCCESS;
-   UINT                    uiState;
-   USHORT                  handshake;
-        struct pseudo_hdr *pHdr;
-   USHORT                  usHdrLength;
+   u16                     status = STATUS_SUCCESS;
+   u32                    state;
+   u16                  handshake;
+        struct pseudo_hdr *pseudo_header;
+   u16                  pseudo_header_len;
    long                    word_length;
-   USHORT                  request;
-   USHORT                  temp;
-   USHORT                  tempword;
+   u16                  request;
+   u16                  temp;
+   u16                  tempword;
 
-        struct dsp_file_hdr *pFileHdr5;
-        struct dsp_image_info *pDspImageInfoV6 = NULL;
+        struct dsp_file_hdr *file_hdr;
+        struct dsp_image_info *dsp_img_info = NULL;
    long                    requested_version;
-   BOOLEAN                 bGoodVersion;
-        struct drv_msg *pMailBoxData;
-   USHORT                  *pUsData = NULL;
-   USHORT                  *pUsFile = NULL;
-   UCHAR                   *pUcFile = NULL;
-   UCHAR                   *pBootEnd = NULL, *pCodeEnd= NULL;
-   int                     imageN;
+   bool                 correct_version;
+        struct drv_msg *mailbox_data;
+   u16                  *data = NULL;
+   u16                  *s_file = NULL;
+   u8                   *c_file = NULL;
+   u8                   *boot_end = NULL, *code_end= NULL;
+   int                     image;
    long                    loader_code_address, loader_code_size = 0;
    long                    run_address = 0, run_size = 0;
 
-   ULONG                   templong;
-   ULONG                   image_chksum = 0;
+   u32                   templong;
+   u32                   image_chksum = 0;
 
-   USHORT                  dpram = 0;
-   PUCHAR                  pbuffer;
+   u16                  dpram = 0;
+   u8 *pbuffer;
         struct prov_record *pprov_record;
         struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
@@ -814,24 +814,24 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
    // Get version id of file, at first 4 bytes of file, for newer files.
    //
 
-   uiState = STATE_START_DWNLD;
+   state = STATE_START_DWNLD;
 
-   pFileHdr5 = (struct dsp_file_hdr *)pFileStart;
+   file_hdr = (struct dsp_file_hdr *)pFileStart;
 
    ft1000_write_register (ft1000dev, 0x800, FT1000_REG_MAG_WATERMARK);
 
-      pUsFile = (USHORT *)(pFileStart + pFileHdr5->loader_offset);
-      pUcFile = (UCHAR *)(pFileStart + pFileHdr5->loader_offset);
+      s_file = (u16 *)(pFileStart + file_hdr->loader_offset);
+      c_file = (u8 *)(pFileStart + file_hdr->loader_offset);
 
-      pBootEnd = (UCHAR *)(pFileStart + pFileHdr5->loader_code_end);
+      boot_end = (u8 *)(pFileStart + file_hdr->loader_code_end);
 
-      loader_code_address = pFileHdr5->loader_code_address;
-      loader_code_size = pFileHdr5->loader_code_size;
-      bGoodVersion = FALSE;
+      loader_code_address = file_hdr->loader_code_address;
+      loader_code_size = file_hdr->loader_code_size;
+      correct_version = FALSE;
 
-   while ((Status == STATUS_SUCCESS) && (uiState != STATE_DONE_FILE))
+   while ((status == STATUS_SUCCESS) && (state != STATE_DONE_FILE))
    {
-      switch (uiState)
+      switch (state)
       {
       case  STATE_START_DWNLD:
          DEBUG("FT1000:STATE_START_DWNLD\n");
@@ -848,10 +848,10 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
          else
          {
             DEBUG("FT1000:download:Download error: Handshake failed\n");
-            Status = STATUS_FAILURE;
+            status = STATUS_FAILURE;
          }
 
-         uiState = STATE_BOOT_DWNLD;
+         state = STATE_BOOT_DWNLD;
 
          break;
 
@@ -878,11 +878,11 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
             case  REQUEST_DONE_BL:
                DEBUG("FT1000:REQUEST_DONE_BL\n");
                /* Reposition ptrs to beginning of code section */
-               pUsFile = (USHORT *)(pBootEnd);
-               pUcFile = (UCHAR *)(pBootEnd);
-               //DEBUG("FT1000:download:pUsFile = 0x%8x\n", (int)pUsFile);
-               //DEBUG("FT1000:download:pUcFile = 0x%8x\n", (int)pUcFile);
-               uiState = STATE_CODE_DWNLD;
+               s_file = (u16 *)(boot_end);
+               c_file = (u8 *)(boot_end);
+               //DEBUG("FT1000:download:s_file = 0x%8x\n", (int)s_file);
+               //DEBUG("FT1000:download:c_file = 0x%8x\n", (int)c_file);
+               state = STATE_CODE_DWNLD;
                pft1000info->fcodeldr = 1;
                break;
             case  REQUEST_CODE_SEGMENT:
@@ -893,33 +893,33 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                if (word_length > MAX_LENGTH)
                {
                   DEBUG("FT1000:download:Download error: Max length exceeded\n");
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
-               if ( (word_length*2 + pUcFile) > pBootEnd)
+               if ( (word_length*2 + c_file) > boot_end)
                {
                   /*
                    * Error, beyond boot code range.
                    */
                   DEBUG("FT1000:download:Download error: Requested len=%d exceeds BOOT code boundry.\n",
                                                             (int)word_length);
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
                /*
                 * Position ASIC DPRAM auto-increment pointer.
                 */
-                                    dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
+                                    dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;
                                         if (word_length & 0x1)
                                                 word_length++;
                                         word_length = word_length / 2;
 
-                        Status =   write_blk(ft1000dev, &pUsFile, &pUcFile, word_length);
-                        //DEBUG("write_blk returned %d\n", Status);
+                        status =   write_blk(ft1000dev, &s_file, &c_file, word_length);
+                        //DEBUG("write_blk returned %d\n", status);
                break;
             default:
                DEBUG("FT1000:download:Download error: Bad request type=%d in BOOT download state.\n",request);
-               Status = STATUS_FAILURE;
+               status = STATUS_FAILURE;
                break;
             }
             if (pft1000info->usbboot)
@@ -930,7 +930,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
          else
          {
             DEBUG("FT1000:download:Download error: Handshake failed\n");
-            Status = STATUS_FAILURE;
+            status = STATUS_FAILURE;
          }
 
          break;
@@ -959,7 +959,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                 break;
             case  REQUEST_RUN_ADDRESS:
                DEBUG("FT1000:download:  REQUEST_RUN_ADDRESS\n");
-               if (bGoodVersion)
+               if (correct_version)
                {
                   DEBUG("FT1000:download:run_address = 0x%8x\n", (int)run_address);
                   put_request_value(ft1000dev, run_address);
@@ -967,13 +967,13 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                else
                {
                   DEBUG("FT1000:download:Download error: Got Run address request before image offset request.\n");
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
                break;
             case  REQUEST_CODE_LENGTH:
                DEBUG("FT1000:download:REQUEST_CODE_LENGTH\n");
-               if (bGoodVersion)
+               if (correct_version)
                {
                   DEBUG("FT1000:download:run_size = 0x%8x\n", (int)run_size);
                   put_request_value(ft1000dev, run_size);
@@ -981,23 +981,23 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                else
                {
                   DEBUG("FT1000:download:Download error: Got Size request before image offset request.\n");
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
                break;
             case  REQUEST_DONE_CL:
                pft1000info->usbboot = 3;
                /* Reposition ptrs to beginning of provisioning section */
-                  pUsFile = (USHORT *)(pFileStart + pFileHdr5->commands_offset);
-                  pUcFile = (UCHAR *)(pFileStart + pFileHdr5->commands_offset);
-               uiState = STATE_DONE_DWNLD;
+                  s_file = (u16 *)(pFileStart + file_hdr->commands_offset);
+                  c_file = (u8 *)(pFileStart + file_hdr->commands_offset);
+               state = STATE_DONE_DWNLD;
                break;
             case  REQUEST_CODE_SEGMENT:
                //DEBUG("FT1000:download: REQUEST_CODE_SEGMENT - CODELOADER\n");
-               if (!bGoodVersion)
+               if (!correct_version)
                {
                   DEBUG("FT1000:download:Download error: Got Code Segment request before image offset request.\n");
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
 #if 0
@@ -1011,28 +1011,28 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
 #endif
                {
                   DEBUG("FT1000:download:Download error: Max length exceeded\n");
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
-               if ( (word_length*2 + pUcFile) > pCodeEnd)
+               if ( (word_length*2 + c_file) > code_end)
                {
                   /*
                    * Error, beyond boot code range.
                    */
                   DEBUG("FT1000:download:Download error: Requested len=%d exceeds DSP code boundry.\n",
                                (int)word_length);
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
                /*
                 * Position ASIC DPRAM auto-increment pointer.
                 */
-                   dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
+                   dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;
                    if (word_length & 0x1)
                         word_length++;
                    word_length = word_length / 2;
 
-               write_blk_fifo (ft1000dev, &pUsFile, &pUcFile, word_length);
+               write_blk_fifo (ft1000dev, &s_file, &c_file, word_length);
                if (pft1000info->usbboot == 0)
                    pft1000info->usbboot++;
                if (pft1000info->usbboot == 1) {
@@ -1047,14 +1047,14 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                // Convert length from byte count to word count. Make sure we round up.
                word_length = (long)(pft1000info->DSPInfoBlklen + 1)/2;
                put_request_value(ft1000dev, word_length);
-                pMailBoxData = (struct drv_msg *)&(pft1000info->DSPInfoBlk[0]);
+                mailbox_data = (struct drv_msg *)&(pft1000info->DSPInfoBlk[0]);
                /*
                 * Position ASIC DPRAM auto-increment pointer.
                 */
 
 
-                   pUsData = (USHORT *)&pMailBoxData->data[0];
-                   dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
+                   data = (u16 *)&mailbox_data->data[0];
+                   dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;
                    if (word_length & 0x1)
                        word_length++;
 
@@ -1064,25 +1064,25 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                for (; word_length > 0; word_length--) /* In words */
                {
 
-                      templong = *pUsData++;
-                                          templong |= (*pUsData++ << 16);
-                      Status = fix_ft1000_write_dpram32 (ft1000dev, dpram++, (PUCHAR)&templong);
+                      templong = *data++;
+                                          templong |= (*data++ << 16);
+                      status = fix_ft1000_write_dpram32 (ft1000dev, dpram++, (u8 *)&templong);
 
                }
                break;
 
             case  REQUEST_VERSION_INFO:
                DEBUG("FT1000:download:REQUEST_VERSION_INFO\n");
-               word_length = pFileHdr5->version_data_size;
+               word_length = file_hdr->version_data_size;
                put_request_value(ft1000dev, word_length);
                /*
                 * Position ASIC DPRAM auto-increment pointer.
                 */
 
-               pUsFile = (USHORT *)(pFileStart + pFileHdr5->version_data_offset);
+               s_file = (u16 *)(pFileStart + file_hdr->version_data_offset);
 
 
-                   dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
+                   dpram = (u16)DWNLD_MAG1_PS_HDR_LOC;
                    if (word_length & 0x1)
                        word_length++;
 
@@ -1092,59 +1092,59 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
                for (; word_length > 0; word_length--) /* In words */
                {
 
-                      templong = ntohs(*pUsFile++);
-                                          temp = ntohs(*pUsFile++);
+                      templong = ntohs(*s_file++);
+                                          temp = ntohs(*s_file++);
                                           templong |= (temp << 16);
-                      Status = fix_ft1000_write_dpram32 (ft1000dev, dpram++, (PUCHAR)&templong);
+                      status = fix_ft1000_write_dpram32 (ft1000dev, dpram++, (u8 *)&templong);
 
                }
                break;
 
             case  REQUEST_CODE_BY_VERSION:
                DEBUG("FT1000:download:REQUEST_CODE_BY_VERSION\n");
-               bGoodVersion = FALSE;
+               correct_version = FALSE;
                requested_version = get_request_value(ft1000dev);
 
-                   pDspImageInfoV6 = (struct dsp_image_info *)(pFileStart + sizeof(struct dsp_file_hdr ));
+                   dsp_img_info = (struct dsp_image_info *)(pFileStart + sizeof(struct dsp_file_hdr ));
 
-               for (imageN = 0; imageN < pFileHdr5->nDspImages; imageN++)
+               for (image = 0; image < file_hdr->nDspImages; image++)
                {
 
-                       temp = (USHORT)(pDspImageInfoV6->version);
+                       temp = (u16)(dsp_img_info->version);
                        templong = temp;
-                       temp = (USHORT)(pDspImageInfoV6->version >> 16);
+                       temp = (u16)(dsp_img_info->version >> 16);
                        templong |= (temp << 16);
-                   if (templong == (ULONG)requested_version)
+                   if (templong == (u32)requested_version)
                        {
-                           bGoodVersion = TRUE;
-                           DEBUG("FT1000:download: bGoodVersion is TRUE\n");
-                           pUsFile = (USHORT *)(pFileStart + pDspImageInfoV6->begin_offset);
-                           pUcFile = (UCHAR *)(pFileStart + pDspImageInfoV6->begin_offset);
-                           pCodeEnd = (UCHAR *)(pFileStart + pDspImageInfoV6->end_offset);
-                           run_address = pDspImageInfoV6->run_address;
-                           run_size = pDspImageInfoV6->image_size;
-                           image_chksum = (ULONG)pDspImageInfoV6->checksum;
+                           correct_version = TRUE;
+                           DEBUG("FT1000:download: correct_version is TRUE\n");
+                           s_file = (u16 *)(pFileStart + dsp_img_info->begin_offset);
+                           c_file = (u8 *)(pFileStart + dsp_img_info->begin_offset);
+                           code_end = (u8 *)(pFileStart + dsp_img_info->end_offset);
+                           run_address = dsp_img_info->run_address;
+                           run_size = dsp_img_info->image_size;
+                           image_chksum = (u32)dsp_img_info->checksum;
                            break;
                         }
-                        pDspImageInfoV6++;
+                        dsp_img_info++;
 
 
                } //end of for
 
-               if (!bGoodVersion)
+               if (!correct_version)
                {
                   /*
                    * Error, beyond boot code range.
                    */
                   DEBUG("FT1000:download:Download error: Bad Version Request = 0x%x.\n",(int)requested_version);
-                  Status = STATUS_FAILURE;
+                  status = STATUS_FAILURE;
                   break;
                }
                break;
 
             default:
                DEBUG("FT1000:download:Download error: Bad request type=%d in CODE download state.\n",request);
-               Status = STATUS_FAILURE;
+               status = STATUS_FAILURE;
                break;
             }
             if (pft1000info->usbboot)
@@ -1155,94 +1155,94 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLe
          else
          {
             DEBUG("FT1000:download:Download error: Handshake failed\n");
-            Status = STATUS_FAILURE;
+            status = STATUS_FAILURE;
          }
 
          break;
 
       case STATE_DONE_DWNLD:
          DEBUG("FT1000:download:Code loader is done...\n");
-         uiState = STATE_SECTION_PROV;
+         state = STATE_SECTION_PROV;
          break;
 
       case  STATE_SECTION_PROV:
          DEBUG("FT1000:download:STATE_SECTION_PROV\n");
-                pHdr = (struct pseudo_hdr *)pUcFile;
+                pseudo_header = (struct pseudo_hdr *)c_file;
 
-         if (pHdr->checksum == hdr_checksum(pHdr))
+         if (pseudo_header->checksum == hdr_checksum(pseudo_header))
          {
-            if (pHdr->portdest != 0x80 /* Dsp OAM */)
+            if (pseudo_header->portdest != 0x80 /* Dsp OAM */)
             {
-               uiState = STATE_DONE_PROV;
+               state = STATE_DONE_PROV;
                break;
             }
-            usHdrLength = ntohs(pHdr->length);    /* Byte length for PROV records */
+            pseudo_header_len = ntohs(pseudo_header->length);    /* Byte length for PROV records */
 
             // Get buffer for provisioning data
-                pbuffer = kmalloc((usHdrLength + sizeof(struct pseudo_hdr)), GFP_ATOMIC);
+                pbuffer = kmalloc((pseudo_header_len + sizeof(struct pseudo_hdr)), GFP_ATOMIC);
             if (pbuffer) {
-                memcpy(pbuffer, (void *)pUcFile, (UINT)(usHdrLength + sizeof(struct pseudo_hdr)));
+                memcpy(pbuffer, (void *)c_file, (u32)(pseudo_header_len + sizeof(struct pseudo_hdr)));
                 // link provisioning data
                 pprov_record = kmalloc(sizeof(struct prov_record), GFP_ATOMIC);
                 if (pprov_record) {
                     pprov_record->pprov_data = pbuffer;
                     list_add_tail (&pprov_record->list, &pft1000info->prov_list);
                     // Move to next entry if available
-                        pUcFile = (UCHAR *)((unsigned long)pUcFile + (UINT)((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(struct pseudo_hdr));
-                    if ( (unsigned long)(pUcFile) - (unsigned long)(pFileStart) >= (unsigned long)FileLength) {
-                       uiState = STATE_DONE_FILE;
+                        c_file = (u8 *)((unsigned long)c_file + (u32)((pseudo_header_len + 1) & 0xFFFFFFFE) + sizeof(struct pseudo_hdr));
+                    if ( (unsigned long)(c_file) - (unsigned long)(pFileStart) >= (unsigned long)FileLength) {
+                       state = STATE_DONE_FILE;
                     }
                 }
                 else {
                     kfree(pbuffer);
-                    Status = STATUS_FAILURE;
+                    status = STATUS_FAILURE;
                 }
             }
             else {
-                Status = STATUS_FAILURE;
+                status = STATUS_FAILURE;
             }
          }
          else
          {
             /* Checksum did not compute */
-            Status = STATUS_FAILURE;
+            status = STATUS_FAILURE;
          }
-         DEBUG("ft1000:download: after STATE_SECTION_PROV, uiState = %d, Status= %d\n", uiState, Status);
+         DEBUG("ft1000:download: after STATE_SECTION_PROV, state = %d, status= %d\n", state, status);
          break;
 
       case  STATE_DONE_PROV:
          DEBUG("FT1000:download:STATE_DONE_PROV\n");
-         uiState = STATE_DONE_FILE;
+         state = STATE_DONE_FILE;
          break;
 
 
       default:
-         Status = STATUS_FAILURE;
+         status = STATUS_FAILURE;
          break;
       } /* End Switch */
 
-      if (Status != STATUS_SUCCESS) {
+      if (status != STATUS_SUCCESS) {
           break;
       }
 
 /****
       // Check if Card is present
-      Status = Harley_Read_Register(&temp, FT1000_REG_SUP_IMASK);
-      if ( (Status != NDIS_STATUS_SUCCESS) || (temp == 0x0000) ) {
+      status = Harley_Read_Register(&temp, FT1000_REG_SUP_IMASK);
+      if ( (status != NDIS_STATUS_SUCCESS) || (temp == 0x0000) ) {
           break;
       }
 
-      Status = Harley_Read_Register(&temp, FT1000_REG_ASIC_ID);
-      if ( (Status != NDIS_STATUS_SUCCESS) || (temp == 0xffff) ) {
+      status = Harley_Read_Register(&temp, FT1000_REG_ASIC_ID);
+      if ( (status != NDIS_STATUS_SUCCESS) || (temp == 0xffff) ) {
           break;
       }
 ****/
 
    } /* End while */
 
-   DEBUG("Download exiting with status = 0x%8x\n", Status);
+   DEBUG("Download exiting with status = 0x%8x\n", status);
    ft1000_write_register(ft1000dev, FT1000_DB_DNLD_TX, FT1000_REG_DOORBELL);
 
-   return Status;
+   return status;
 }
 
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 5b89ee2a2971..643a63794ade 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -41,37 +41,9 @@ static int ft1000_chkcard (struct ft1000_device *dev);
 //Jim
 
 static u8 tempbuffer[1600];
-static unsigned long gCardIndex;
 
 #define MAX_RCV_LOOP   100
 
-/****************************************************************
- *     ft1000_control_complete
- ****************************************************************/
-static void ft1000_control_complete(struct urb *urb)
-{
-    struct ft1000_device *ft1000dev = (struct ft1000_device *)urb->context;
-
-    //DEBUG("FT1000_CONTROL_COMPLETE ENTERED\n");
-    if (ft1000dev == NULL )
-    {
-        DEBUG("NULL ft1000dev, failure\n");
-        return ;
-    }
-    else if ( ft1000dev->dev == NULL )
-    {
-        DEBUG("NULL ft1000dev->dev, failure\n");
-        return ;
-    }
-
-    if(waitqueue_active(&ft1000dev->control_wait))
-    {
-        wake_up(&ft1000dev->control_wait);
-    }
-
-    //DEBUG("FT1000_CONTROL_COMPLETE RETURNED\n");
-}
-
 //---------------------------------------------------------------------------
 // Function:    ft1000_control
 //
@@ -187,7 +159,7 @@ u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegInd
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 ft1000_write_register(struct ft1000_device *ft1000dev, USHORT value, u16 nRegIndx)
+u16 ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx)
 {
      u16 ret = STATUS_SUCCESS;
 
@@ -223,7 +195,7 @@ u16 ft1000_write_register(struct ft1000_device *ft1000dev, USHORT value, u16 nRe
 //
 //---------------------------------------------------------------------------
 
-u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, USHORT cnt)
+u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt)
 {
     u16 ret = STATUS_SUCCESS;
 
@@ -262,7 +234,7 @@ u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buf
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, USHORT cnt)
+u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt)
 {
      u16 ret = STATUS_SUCCESS;
 
@@ -299,7 +271,7 @@ u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR bu
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, u8 highlow)
+u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow)
 {
     u16 ret = STATUS_SUCCESS;
 
@@ -347,7 +319,7 @@ u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buf
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, USHORT indx, USHORT value, u8 highlow)
+u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow)
 {
      u16 ret = STATUS_SUCCESS;
 
@@ -392,10 +364,10 @@ u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, USHORT indx, USHORT va
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer)
+u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)
 {
-    UCHAR buf[16];
-    USHORT pos;
+    u8 buf[16];
+    u16 pos;
     u16 ret = STATUS_SUCCESS;
 
     //DEBUG("fix_ft1000_read_dpram32: indx: %d  \n", indx);
@@ -441,14 +413,14 @@ u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR
 // Notes:
 //
 //---------------------------------------------------------------------------
-u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer)
+u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)
 {
-    USHORT pos1;
-    USHORT pos2;
-    USHORT i;
-    UCHAR buf[32];
-    UCHAR resultbuffer[32];
-    PUCHAR pdata;
+    u16 pos1;
+    u16 pos2;
+    u16 i;
+    u8 buf[32];
+    u8 resultbuffer[32];
+    u8 *pdata;
     u16 ret  = STATUS_SUCCESS;
 
     //DEBUG("fix_ft1000_write_dpram32: Entered:\n");
@@ -472,7 +444,7 @@ u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHA
         return ret;
     }
 
-    ret = ft1000_read_dpram32(ft1000dev, pos1, (PUCHAR)&resultbuffer[0], 16);
+    ret = ft1000_read_dpram32(ft1000dev, pos1, (u8 *)&resultbuffer[0], 16);
     if (ret == STATUS_SUCCESS)
     {
         buffer = pdata;
@@ -487,8 +459,8 @@ u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHA
 
     if (ret == STATUS_FAILURE)
     {
-        ret = ft1000_write_dpram32(ft1000dev, pos1, (PUCHAR)&tempbuffer[0], 16);
-        ret = ft1000_read_dpram32(ft1000dev, pos1, (PUCHAR)&resultbuffer[0], 16);
+        ret = ft1000_write_dpram32(ft1000dev, pos1, (u8 *)&tempbuffer[0], 16);
+        ret = ft1000_read_dpram32(ft1000dev, pos1, (u8 *)&resultbuffer[0], 16);
         if (ret == STATUS_SUCCESS)
         {
             buffer = pdata;
@@ -518,10 +490,10 @@ u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHA
 //
 //  Returns:    None
 //-----------------------------------------------------------------------
-static void card_reset_dsp (struct ft1000_device *ft1000dev, BOOLEAN value)
+static void card_reset_dsp (struct ft1000_device *ft1000dev, bool value)
 {
     u16 status = STATUS_SUCCESS;
-    USHORT tempword;
+    u16 tempword;
 
     status = ft1000_write_register (ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
     status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_SUP_CTRL);
@@ -620,8 +592,8 @@ void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int siz
 int dsp_reload(struct ft1000_device *ft1000dev)
 {
     u16 status;
-    USHORT tempword;
-    ULONG templong;
+    u16 tempword;
+    u32 templong;
 
         struct ft1000_info *pft1000info;
 
@@ -648,7 +620,7 @@ int dsp_reload(struct ft1000_device *ft1000dev)
     status = ft1000_write_register (ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
 
     // Let's check for FEFE
-    status = ft1000_read_dpram32 (ft1000dev, FT1000_MAG_DPRAM_FEFE_INDX, (PUCHAR)&templong, 4);
+    status = ft1000_read_dpram32 (ft1000dev, FT1000_MAG_DPRAM_FEFE_INDX, (u8 *)&templong, 4);
     DEBUG("templong (fefe) = 0x%8x\n", templong);
 
     // call codeloader
@@ -753,7 +725,7 @@ static int ft1000_reset_card (struct net_device *dev)
 
     // Initialize DSP heartbeat area to ho
     ft1000_write_dpram16(ft1000dev, FT1000_MAG_HI_HO, ho_mag, FT1000_MAG_HI_HO_INDX);
-    ft1000_read_dpram16(ft1000dev, FT1000_MAG_HI_HO, (PCHAR)&tempword, FT1000_MAG_HI_HO_INDX);
+    ft1000_read_dpram16(ft1000dev, FT1000_MAG_HI_HO, (u8 *)&tempword, FT1000_MAG_HI_HO_INDX);
     DEBUG("ft1000_hw:ft1000_reset_card:hi_ho value = 0x%x\n", tempword);
 
 
@@ -800,8 +772,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
         int i, ret_val;
         struct list_head *cur, *tmp;
         char card_nr[2];
-
-        gCardIndex=0; //mbelian
+        unsigned long gCardIndex = 0;
 
     DEBUG("Enter init_ft1000_netdev...\n");
 
@@ -813,7 +784,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
         return -ENOMEM;
     }
 
-        pInfo = (struct ft1000_info *) netdev_priv(netdev);
+        pInfo = netdev_priv(netdev);
 
     //DEBUG("init_ft1000_netdev: gFt1000Info=%x, netdev=%x, ft1000dev=%x\n", gFt1000Info, netdev, ft1000dev);
 
@@ -821,9 +792,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
 
     dev_alloc_name(netdev, netdev->name);
 
-    //for the first inserted card, decide the card index beginning number, in case there are existing network interfaces
-    if ( gCardIndex == 0 )
-    {
         DEBUG("init_ft1000_netdev: network device name is %s\n", netdev->name);
 
         if ( strncmp(netdev->name,"eth", 3) == 0) {
@@ -843,13 +811,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
                 ret_val = -ENXIO;
                 goto err_net;
         }
-    }
-    else
-    {
-        //not the first inserted card, increase card number by 1
-        pInfo->CardNumber = gCardIndex;
-        /*DEBUG("card number = %d\n", pInfo->CardNumber);*/ //mbelian
-    }
 
     memset(&pInfo->stats, 0, sizeof(struct net_device_stats) );
 
@@ -862,7 +823,6 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
     pInfo->mediastate = 0;
     pInfo->fifo_cnt = 0;
     pInfo->DeviceCreated = FALSE;
-    pInfo->DeviceMajor = 0;
     pInfo->CurrentInterruptEnableMask = ISR_DEFAULT_MASK;
     pInfo->InterruptsEnabled = FALSE;
     pInfo->CardReady = 0;
@@ -874,13 +834,11 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
     pInfo->fCondResetPend = 0;
         pInfo->usbboot = 0;
         pInfo->dspalive = 0;
-        for (i=0;i<32 ;i++ )
-        {
-                pInfo->tempbuf[i] = 0;
-        }
+        memset(&pInfo->tempbuf[0], 0, sizeof(pInfo->tempbuf));
 
     INIT_LIST_HEAD(&pInfo->prov_list);
 
+        INIT_LIST_HEAD(&pInfo->nodes.list);
 //mbelian
 #ifdef HAVE_NET_DEVICE_OPS
         netdev->netdev_ops = &ftnet_ops;
@@ -982,7 +940,7 @@ int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int
 
 
     //Create character device, implemented by Jim
-    ft1000_CreateDevice(ft1000dev);
+    ft1000_create_dev(ft1000dev);
 
     DEBUG ("reg_ft1000_netdev returned\n");
 
@@ -1026,178 +984,6 @@ static void ft1000_usb_transmit_complete(struct urb *urb)
     //DEBUG("Return from ft1000_usb_transmit_complete\n");
 }
 
-
-/****************************************************************
- *     ft1000_control
- ****************************************************************/
-static int ft1000_read_fifo_reg(struct ft1000_device *ft1000dev,unsigned int pipe,
-                          u8 request,
-                          u8 requesttype,
-                          u16 value,
-                          u16 index,
-                          void *data,
-                          u16 size,
-                          int timeout)
-{
-    u16 ret;
-
-    DECLARE_WAITQUEUE(wait, current);
-    struct urb *urb;
-    struct usb_ctrlrequest *dr;
-    int status;
-
-    if (ft1000dev == NULL )
-    {
-        DEBUG("NULL ft1000dev, failure\n");
-        return STATUS_FAILURE;
-    }
-    else if ( ft1000dev->dev == NULL )
-    {
-        DEBUG("NULL ft1000dev->dev, failure\n");
-        return STATUS_FAILURE;
-    }
-
-    spin_lock(&ft1000dev->device_lock);
-
-    if(in_interrupt())
-    {
-        spin_unlock(&ft1000dev->device_lock);
-        return -EBUSY;
-    }
-
-    urb = usb_alloc_urb(0, GFP_KERNEL);
-    dr = kmalloc(sizeof(struct usb_ctrlrequest), in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
-
-    if(!urb || !dr)
-    {
-        kfree(dr);
-        usb_free_urb(urb);
-        spin_unlock(&ft1000dev->device_lock);
-        return -ENOMEM;
-    }
-
-
-
-    dr->bRequestType = requesttype;
-    dr->bRequest = request;
-    dr->wValue = value;
-    dr->wIndex = index;
-    dr->wLength = size;
-
-    usb_fill_control_urb(urb, ft1000dev->dev, pipe, (char*)dr, (void*)data, size, (void *)ft1000_control_complete, (void*)ft1000dev);
-
-
-    init_waitqueue_head(&ft1000dev->control_wait);
-
-        set_current_state(TASK_INTERRUPTIBLE);
-
-    add_wait_queue(&ft1000dev->control_wait, &wait);
-
-
-
-
-    status = usb_submit_urb(urb, GFP_KERNEL);
-
-    if(status)
-    {
-        usb_free_urb(urb);
-        kfree(dr);
-        remove_wait_queue(&ft1000dev->control_wait, &wait);
-        spin_unlock(&ft1000dev->device_lock);
-        return status;
-    }
-
-    if(urb->status == -EINPROGRESS)
-    {
-        while(timeout && urb->status == -EINPROGRESS)
-        {
-            status = timeout = schedule_timeout(timeout);
-        }
-    }
-    else
-    {
-        status = 1;
-    }
-
-    remove_wait_queue(&ft1000dev->control_wait, &wait);
-
-    if(!status)
-    {
-        usb_unlink_urb(urb);
-        printk("ft1000 timeout\n");
-        status = -ETIMEDOUT;
-    }
-    else
-    {
-        status = urb->status;
-
-        if(urb->status)
-        {
-            printk("ft1000 control message failed (urb addr: %p) with error number: %i\n", urb, (int)status);
-
-            usb_clear_halt(ft1000dev->dev, usb_rcvctrlpipe(ft1000dev->dev, 0));
-            usb_clear_halt(ft1000dev->dev, usb_sndctrlpipe(ft1000dev->dev, 0));
-            usb_unlink_urb(urb);
-        }
-    }
-
-
-
-    usb_free_urb(urb);
-    kfree(dr);
-    spin_unlock(&ft1000dev->device_lock);
-    return ret;
-
-
-}
-
-//---------------------------------------------------------------------------
-// Function:    ft1000_read_fifo_len
-//
-// Parameters:  ft1000dev - device structure
-//
-//
-// Returns:     none
-//
-// Description: read the fifo length register content
-//
-// Notes:
-//
-//---------------------------------------------------------------------------
-static inline u16 ft1000_read_fifo_len (struct net_device *dev)
-{
-    u16 temp;
-    u16 ret;
-
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
-    struct ft1000_device *ft1000dev = info->pFt1000Dev;
-//    DEBUG("ft1000_read_fifo_len: enter ft1000dev %x\n", ft1000dev);                   //aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct ft1000_device *???
-    DEBUG("ft1000_read_fifo_len: enter ft1000dev %p\n", ft1000dev);     //aelias [+] reason: up
-
-    ret = STATUS_SUCCESS;
-
-    ret = ft1000_read_fifo_reg(ft1000dev,
-                          usb_rcvctrlpipe(ft1000dev->dev,0),
-                          HARLEY_READ_REGISTER,
-                          HARLEY_READ_OPERATION,
-                          0,
-                          FT1000_REG_MAG_UFSR,
-                          &temp,
-                          2,
-                          LARGE_TIMEOUT);
-
-    if (ret>0)
-        ret = STATUS_SUCCESS;
-    else
-        ret = STATUS_FAILURE;
-
-    DEBUG("ft1000_read_fifo_len: returned %d\n", temp);
-
-    return (temp- 16);
-
-}
-
-
 //---------------------------------------------------------------------------
 //
 // Function:   ft1000_copy_down_pkt
@@ -1219,16 +1005,15 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)
     struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev;
 
 
-    int i, count, ret;
-    USHORT *pTemp;
-    USHORT checksum;
+        int count, ret;
     u8 *t;
+        struct pseudo_hdr hdr;
 
     if (!pInfo->CardReady)
     {
 
         DEBUG("ft1000_copy_down_pkt::Card Not Ready\n");
-        return STATUS_FAILURE;
+        return -ENODEV;
 
     }
 
@@ -1240,27 +1025,27 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)
     {
         DEBUG("Error:ft1000_copy_down_pkt:Message Size Overflow!\n");
         DEBUG("size = %d\n", count);
-        return STATUS_FAILURE;
+        return -EINVAL;
     }
 
     if ( count % 4)
         count = count + (4- (count %4) );
 
-    pTemp = (PUSHORT)&(pFt1000Dev->tx_buf[0]);
-    *pTemp ++ = ntohs(count);
-    *pTemp ++ = 0x1020;
-    *pTemp ++ = 0x2010;
-    *pTemp ++ = 0x9100;
-    *pTemp ++ = 0;
-    *pTemp ++ = 0;
-    *pTemp ++ = 0;
-    pTemp = (PUSHORT)&(pFt1000Dev->tx_buf[0]);
-    checksum = *pTemp ++;
-    for (i=1; i<7; i++)
-    {
-        checksum ^= *pTemp ++;
-    }
-    *pTemp++ = checksum;
+        memset(&hdr, 0, sizeof(struct pseudo_hdr));
+
+        hdr.length = ntohs(count);
+        hdr.source = 0x10;
+        hdr.destination = 0x20;
+        hdr.portdest = 0x20;
+        hdr.portsrc = 0x10;
+        hdr.sh_str_id = 0x91;
+        hdr.control = 0x00;
+
+        hdr.checksum = hdr.length ^ hdr.source ^ hdr.destination ^
+                        hdr.portdest ^ hdr.portsrc ^ hdr.sh_str_id ^
+                        hdr.control;
+
+        memcpy(&pFt1000Dev->tx_buf[0], &hdr, sizeof(hdr));
         memcpy(&(pFt1000Dev->tx_buf[sizeof(struct pseudo_hdr)]), packet, len);
 
     netif_stop_queue(netdev);
@@ -1283,25 +1068,18 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len)
     }*/
 
 
-    ret = usb_submit_urb(pFt1000Dev->tx_urb, GFP_ATOMIC);
-    if(ret)
-    {
+        ret = usb_submit_urb(pFt1000Dev->tx_urb, GFP_ATOMIC);
+        if (ret) {
                 DEBUG("ft1000 failed tx_urb %d\n", ret);
-
-                return STATUS_FAILURE;
-
-    }
-    else
-    {
-        //DEBUG("ft1000 sucess tx_urb %d\n", ret);
-
-        pInfo->stats.tx_packets++;
-        pInfo->stats.tx_bytes += (len+14);
-    }
+                return ret;
+        } else {
+                pInfo->stats.tx_packets++;
+                pInfo->stats.tx_bytes += (len+14);
+        }
 
     //DEBUG("ft1000_copy_down_pkt() exit\n");
 
-    return STATUS_SUCCESS;
+        return 0;
 }
 
 //---------------------------------------------------------------------------
@@ -1331,14 +1109,13 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
     if ( skb == NULL )
     {
         DEBUG ("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n" );
-        return STATUS_FAILURE;
+        return NETDEV_TX_OK;
     }
 
     if ( pFt1000Dev->status & FT1000_STATUS_CLOSING)
     {
         DEBUG("network driver is closed, return\n");
-        dev_kfree_skb(skb);
-        return STATUS_SUCCESS;
+        goto err;
     }
 
     //DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len);
@@ -1357,28 +1134,24 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
     {
         /* Drop packet is mediastate is down */
         DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n");
-        dev_kfree_skb(skb);
-        return STATUS_SUCCESS;
+        goto err;
     }
 
     if ( (skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE) )
     {
         /* Drop packet which has invalid size */
         DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n");
-        dev_kfree_skb(skb);
-        return STATUS_SUCCESS;
+        goto err;
     }
 //mbelian
-    if(ft1000_copy_down_pkt (dev, (pdata+ENET_HEADER_SIZE-2), skb->len - ENET_HEADER_SIZE + 2) == STATUS_FAILURE)
-        {
-        dev_kfree_skb(skb);
-                return STATUS_SUCCESS;
-        }
+        ft1000_copy_down_pkt(dev, (pdata+ENET_HEADER_SIZE-2),
+                                skb->len - ENET_HEADER_SIZE + 2);
 
-    dev_kfree_skb(skb);
+err:
+        dev_kfree_skb(skb);
     //DEBUG(" ft1000_start_xmit() exit\n");
 
-    return 0;
+        return NETDEV_TX_OK;
 }
 
 //---------------------------------------------------------------------------
@@ -1424,7 +1197,7 @@ static int ft1000_copy_up_pkt (struct urb *urb)
     //DEBUG("ft1000_copy_up_pkt: transfer_buffer_length=%d, actual_buffer_len=%d\n",
       //       urb->transfer_buffer_length, urb->actual_length);
 
-    chksum = (PUSHORT)ft1000dev->rx_buf;
+    chksum = (u16 *)ft1000dev->rx_buf;
 
     tempword = *chksum++;
     for (i=1; i<7; i++)
@@ -1521,7 +1294,7 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)
     {
         DEBUG("network driver is closed, return\n");
         //usb_kill_urb(pFt1000Dev->rx_urb); //mbelian
-        return STATUS_SUCCESS;
+        return -ENODEV;
     }
 
     usb_fill_bulk_urb(pFt1000Dev->rx_urb,
@@ -1536,12 +1309,12 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)
     if((result = usb_submit_urb(pFt1000Dev->rx_urb, GFP_ATOMIC)))
     {
         printk("ft1000_submit_rx_urb: submitting rx_urb %d failed\n", result);
-        return STATUS_FAILURE;
+        return result;
     }
 
     //DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result);
 
-    return STATUS_SUCCESS;
+        return 0;
 }
 
 //---------------------------------------------------------------------------
@@ -1560,8 +1333,9 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)
 //---------------------------------------------------------------------------
 static int ft1000_open (struct net_device *dev)
 {
-        struct ft1000_info *pInfo = (struct ft1000_info *)netdev_priv(dev);
+        struct ft1000_info *pInfo = netdev_priv(dev);
     struct timeval tv; //mbelian
+        int ret;
 
     DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber);
     //DEBUG("ft1000_open: dev->addr=%x, dev->addr_len=%d\n", dev->addr, dev->addr_len);
@@ -1579,8 +1353,9 @@ static int ft1000_open (struct net_device *dev)
 
     netif_carrier_on(dev); //mbelian
 
-    ft1000_submit_rx_urb(pInfo);
-    return 0;
+        ret = ft1000_submit_rx_urb(pInfo);
+
+        return ret;
 }
 
 //---------------------------------------------------------------------------
@@ -1599,7 +1374,7 @@ static int ft1000_open (struct net_device *dev)
 //---------------------------------------------------------------------------
 int ft1000_close(struct net_device *net)
 {
-        struct ft1000_info *pInfo = (struct ft1000_info *) netdev_priv(net);
+        struct ft1000_info *pInfo = netdev_priv(net);
     struct ft1000_device *ft1000dev = pInfo->pFt1000Dev;
 
     //DEBUG ("ft1000_close: netdev->refcnt=%d\n", net->refcnt);
@@ -1622,7 +1397,7 @@ int ft1000_close(struct net_device *net)
 
 static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev)
 {
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
+        struct ft1000_info *info = netdev_priv(dev);
 
         return &(info->stats); //mbelian
 }
@@ -1648,7 +1423,7 @@ Jim
 static int ft1000_chkcard (struct ft1000_device *dev) {
     u16 tempword;
     u16 status;
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
+        struct ft1000_info *info = netdev_priv(dev->net);
 
     if (info->fCondResetPend)
     {
@@ -1692,13 +1467,13 @@ static int ft1000_chkcard (struct ft1000_device *dev) {
 //          = 1 (successful)
 //
 //---------------------------------------------------------------------------
-static BOOLEAN ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int maxsz, u16 *pnxtph) {
+static bool ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int maxsz, u16 *pnxtph) {
     u16 size, ret;
     u16 *ppseudohdr;
     int i;
     u16 tempword;
 
-    ret = ft1000_read_dpram16(dev, FT1000_MAG_PH_LEN, (PUCHAR)&size, FT1000_MAG_PH_LEN_INDX);
+    ret = ft1000_read_dpram16(dev, FT1000_MAG_PH_LEN, (u8 *)&size, FT1000_MAG_PH_LEN_INDX);
     size = ntohs(size) + PSEUDOSZ;
     if (size > maxsz) {
         DEBUG("FT1000:ft1000_receive_cmd:Invalid command length = %d\n", size);
@@ -1748,15 +1523,15 @@ static BOOLEAN ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int
 static int ft1000_dsp_prov(void *arg)
 {
     struct ft1000_device *dev = (struct ft1000_device *)arg;
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
+        struct ft1000_info *info = netdev_priv(dev->net);
     u16 tempword;
     u16 len;
     u16 i=0;
         struct prov_record *ptr;
         struct pseudo_hdr *ppseudo_hdr;
-    PUSHORT pmsg;
+    u16 *pmsg;
     u16 status;
-    USHORT TempShortBuf [256];
+    u16 TempShortBuf [256];
 
     DEBUG("*** DspProv Entered\n");
 
@@ -1792,7 +1567,7 @@ static int ft1000_dsp_prov(void *arg)
             len = htons(len);
             len += PSEUDOSZ;
 
-            pmsg = (PUSHORT)ptr->pprov_data;
+            pmsg = (u16 *)ptr->pprov_data;
                 ppseudo_hdr = (struct pseudo_hdr *)pmsg;
             // Insert slow queue sequence number
             ppseudo_hdr->seq_num = info->squeseqnum++;
@@ -1809,7 +1584,7 @@ static int ft1000_dsp_prov(void *arg)
             TempShortBuf[1] = htons (len);
             memcpy(&TempShortBuf[2], ppseudo_hdr, len);
 
-            status = ft1000_write_dpram32 (dev, 0, (PUCHAR)&TempShortBuf[0], (unsigned short)(len+2));
+            status = ft1000_write_dpram32 (dev, 0, (u8 *)&TempShortBuf[0], (unsigned short)(len+2));
             status = ft1000_write_register (dev, FT1000_DB_DPRAM_TX, FT1000_REG_DOORBELL);
 
             list_del(&ptr->list);
@@ -1831,7 +1606,7 @@ static int ft1000_dsp_prov(void *arg)
 
 
 static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
+        struct ft1000_info *info = netdev_priv(dev->net);
     u16 msgtype;
     u16 tempword;
         struct media_msg *pmediamsg;
@@ -1839,7 +1614,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
         struct drv_msg *pdrvmsg;
     u16 i;
         struct pseudo_hdr *ppseudo_hdr;
-    PUSHORT pmsg;
+    u16 *pmsg;
     u16 status;
     union {
         u8  byte[2];
@@ -1971,7 +1746,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
                 tempword = ntohs(pdrvmsg->length);
                 info->DSPInfoBlklen = tempword;
                 if (tempword < (MAX_DSP_SESS_REC-4) ) {
-                    pmsg = (PUSHORT)&pdrvmsg->data[0];
+                    pmsg = (u16 *)&pdrvmsg->data[0];
                     for (i=0; i<((tempword+1)/2); i++) {
                         DEBUG("FT1000:drivermsg:dsp info data = 0x%x\n", *pmsg);
                         info->DSPInfoBlk[i+10] = *pmsg++;
@@ -2003,10 +1778,10 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
 
                 // Put message into Slow Queue
                 // Form Pseudo header
-                pmsg = (PUSHORT)info->DSPInfoBlk;
+                pmsg = (u16 *)info->DSPInfoBlk;
                 *pmsg++ = 0;
                 *pmsg++ = htons(info->DSPInfoBlklen+20+info->DSPInfoBlklen);
-                ppseudo_hdr = (struct pseudo_hdr *)(PUSHORT)&info->DSPInfoBlk[2];
+                ppseudo_hdr = (struct pseudo_hdr *)(u16 *)&info->DSPInfoBlk[2];
                 ppseudo_hdr->length = htons(info->DSPInfoBlklen+4+info->DSPInfoBlklen);
                 ppseudo_hdr->source = 0x10;
                 ppseudo_hdr->destination = 0x20;
@@ -2028,7 +1803,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
                 }
                 info->DSPInfoBlk[10] = 0x7200;
                 info->DSPInfoBlk[11] = htons(info->DSPInfoBlklen);
-                status = ft1000_write_dpram32 (dev, 0, (PUCHAR)&info->DSPInfoBlk[0], (unsigned short)(info->DSPInfoBlklen+22));
+                status = ft1000_write_dpram32 (dev, 0, (u8 *)&info->DSPInfoBlk[0], (unsigned short)(info->DSPInfoBlklen+22));
                 status = ft1000_write_register (dev, FT1000_DB_DPRAM_TX, FT1000_REG_DOORBELL);
                 info->DrvMsgPend = 0;
 
@@ -2053,7 +1828,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
               if ( (tempword & FT1000_DB_DPRAM_TX) == 0) {
                   // Put message into Slow Queue
                   // Form Pseudo header
-                  pmsg = (PUSHORT)&tempbuffer[0];
+                  pmsg = (u16 *)&tempbuffer[0];
                         ppseudo_hdr = (struct pseudo_hdr *)pmsg;
                   ppseudo_hdr->length = htons(0x0012);
                   ppseudo_hdr->source = 0x10;
@@ -2074,7 +1849,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
                   for (i=1; i<7; i++) {
                       ppseudo_hdr->checksum ^= *pmsg++;
                   }
-                  pmsg = (PUSHORT)&tempbuffer[16];
+                  pmsg = (u16 *)&tempbuffer[16];
                   *pmsg++ = htons(RSP_DRV_ERR_RPT_MSG);
                   *pmsg++ = htons(0x000e);
                   *pmsg++ = htons(info->DSP_TIME[0]);
@@ -2089,7 +1864,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
                   *pmsg++ = convert.wrd;
                   *pmsg++ = htons(info->DrvErrNum);
 
-                  CardSendCommand (dev, (unsigned char*)&tempbuffer[0], (USHORT)(0x0012 + PSEUDOSZ));
+                  CardSendCommand (dev, (unsigned char*)&tempbuffer[0], (u16)(0x0012 + PSEUDOSZ));
                   info->DrvErrNum = 0;
               }
               info->DrvMsgPend = 0;
@@ -2114,15 +1889,15 @@ out:
 int ft1000_poll(void* dev_id) {
 
     struct ft1000_device *dev = (struct ft1000_device *)dev_id;
-        struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
+        struct ft1000_info *info = netdev_priv(dev->net);
 
     u16 tempword;
     u16 status;
     u16 size;
     int i;
-    USHORT data;
-    USHORT modulo;
-    USHORT portid;
+    u16 data;
+    u16 modulo;
+    u16 portid;
     u16 nxtph;
         struct dpram_blk *pdpram_blk;
         struct pseudo_hdr *ppseudo_hdr;
@@ -2143,14 +1918,14 @@ int ft1000_poll(void* dev_id) {
         if (tempword & FT1000_DB_DPRAM_RX) {
             //DEBUG("ft1000_poll: FT1000_REG_DOORBELL message type:  FT1000_DB_DPRAM_RX\n");
 
-            status = ft1000_read_dpram16(dev, 0x200, (PUCHAR)&data, 0);
+            status = ft1000_read_dpram16(dev, 0x200, (u8 *)&data, 0);
             //DEBUG("ft1000_poll:FT1000_DB_DPRAM_RX:ft1000_read_dpram16:size = 0x%x\n", data);
             size = ntohs(data) + 16 + 2; //wai
             if (size % 4) {
                 modulo = 4 - (size % 4);
                 size = size + modulo;
             }
-            status = ft1000_read_dpram16(dev, 0x201, (PUCHAR)&portid, 1);
+            status = ft1000_read_dpram16(dev, 0x201, (u8 *)&portid, 1);
             portid &= 0xff;
             //DEBUG("ft1000_poll: FT1000_REG_DOORBELL message type: FT1000_DB_DPRAM_RX : portid 0x%x\n", portid);
 
@@ -2285,7 +2060,7 @@ int ft1000_poll(void* dev_id) {
             status = ft1000_write_register (dev, FT1000_ASIC_RESET_REQ, FT1000_REG_DOORBELL);
             status = ft1000_write_register (dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
             // copy dsp session record from Adapter block
-            status = ft1000_write_dpram32 (dev, 0, (PUCHAR)&info->DSPSess.Rec[0], 1024);
+            status = ft1000_write_dpram32 (dev, 0, (u8 *)&info->DSPSess.Rec[0], 1024);
             // Program WMARK register
             status = ft1000_write_register (dev, 0x600, FT1000_REG_MAG_WATERMARK);
             // ring doorbell to tell DSP that ASIC is out of reset
@@ -2299,10 +2074,10 @@ int ft1000_poll(void* dev_id) {
             if (info->fAppMsgPend == 0) {
                // Reset ASIC and DSP
 
-                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER0, (PUCHAR)&(info->DSP_TIME[0]), FT1000_MAG_DSP_TIMER0_INDX);
-                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER1, (PUCHAR)&(info->DSP_TIME[1]), FT1000_MAG_DSP_TIMER1_INDX);
-                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER2, (PUCHAR)&(info->DSP_TIME[2]), FT1000_MAG_DSP_TIMER2_INDX);
-                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER3, (PUCHAR)&(info->DSP_TIME[3]), FT1000_MAG_DSP_TIMER3_INDX);
+                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER0, (u8 *)&(info->DSP_TIME[0]), FT1000_MAG_DSP_TIMER0_INDX);
+                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER1, (u8 *)&(info->DSP_TIME[1]), FT1000_MAG_DSP_TIMER1_INDX);
+                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER2, (u8 *)&(info->DSP_TIME[2]), FT1000_MAG_DSP_TIMER2_INDX);
+                status    = ft1000_read_dpram16(dev, FT1000_MAG_DSP_TIMER3, (u8 *)&(info->DSP_TIME[3]), FT1000_MAG_DSP_TIMER3_INDX);
                 info->CardReady = 0;
                 info->DrvErrNum = DSP_CONDRESET_INFO;
                 DEBUG("ft1000_hw:DSP conditional reset requested\n");
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.h b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.h
index c58074131014..ab9312f9f326 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.h
@@ -4,7 +4,7 @@
 
 #include "ft1000_usb.h"
 
-extern u16 ft1000_read_register(struct usb_device *dev, PUSHORT Data, u8 nRegIndx);
-extern u16 ft1000_write_register(struct usb_device *dev, USHORT value, u8 nRegIndx);
+extern u16 ft1000_read_register(struct usb_device *dev, u16 *Data, u8 nRegIndx);
+extern u16 ft1000_write_register(struct usb_device *dev, u16 value, u8 nRegIndx);
 
 #endif
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
index 36cdd588fa98..b87542abbe86 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -1,3 +1,24 @@
+/*
+ * ft1000_proc.c - ft1000 proc interface
+ *
+ * Copyright    (C) 2009-2010 Quintec
+ *              (C) 2010 Open-nandra
+ *      <marek.belisko@open-nandra.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file "COPYING" in the main directory of this
+ * archive for more details.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
@@ -14,219 +35,217 @@
 
 #define PUTX_TO_PAGE(len,page,message,size,var) \
         len += snprintf(page+len, PAGE_SIZE - len, message); \
-        for(i = 0; i < (size - 1); i++) \
-        { \
+        for (i = 0; i < (size - 1); i++) {\
                 len += snprintf(page+len, PAGE_SIZE - len, "%02x:", var[i]); \
         } \
         len += snprintf(page+len, PAGE_SIZE - len, "%02x\n", var[i])
 
 #define PUTD_TO_PAGE(len,page,message,size,var) \
         len += snprintf(page+len, PAGE_SIZE - len, message); \
-        for(i = 0; i < (size - 1); i++) \
-        { \
+        for (i = 0; i < (size - 1); i++) {\
                 len += snprintf(page+len, PAGE_SIZE - len, "%d.", var[i]); \
         } \
         len += snprintf(page+len, PAGE_SIZE - len, "%d\n", var[i])
 
 
-
-
-//#ifdef INIT_NET_NS
 #define FTNET_PROC init_net.proc_net
-//#else
-//#define FTNET_PROC proc_net
-//#endif
 
 
-u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx,
-                         PUCHAR buffer, u8 highlow);
+u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, u16 indx,
+                         u8 *buffer, u8 highlow);
 
 
 static int
-ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof,
+ft1000ReadProc(char *page, char **start, off_t off, int count, int *eof,
                 void *data)
 {
-  struct net_device *dev;
-  int len;
-  int i;
-  unsigned short ledStat;
-  unsigned short conStat;
+        struct net_device *dev;
+        int len;
+        int i;
+        unsigned short ledStat;
+        unsigned short conStat;
 
         struct ft1000_info *info;
 
-  char *status[] = { "Idle (Disconnect)", "Searching", "Active (Connected)",
-    "Waiting for L2", "Sleep", "No Coverage", "", ""
-  };
-
-  char *signal[] = { "", "*", "**", "***", "****" };
-  int strength;
-  int quality;
-  struct timeval tv;
-  time_t delta;
-
-  dev = (struct net_device *) data;
-        info = (struct ft1000_info *) netdev_priv(dev);
-
-  if (off > 0)
-    {
-      *eof = 1;
-      return 0;
-    }
-
-
-  if (info->ProgConStat != 0xFF)
-    {
-      ft1000_read_dpram16 (info->pFt1000Dev, FT1000_MAG_DSP_LED,
-                           (PUCHAR) & ledStat, FT1000_MAG_DSP_LED_INDX);
-      info->LedStat = ntohs (ledStat);
-
-      ft1000_read_dpram16 (info->pFt1000Dev, FT1000_MAG_DSP_CON_STATE,
-                           (PUCHAR) & conStat, FT1000_MAG_DSP_CON_STATE_INDX);
-      info->ConStat = ntohs (conStat);
-      do_gettimeofday (&tv);
-      delta = (tv.tv_sec - info->ConTm);
-    }
-  else
-    {
-      info->ConStat = 0xf;
-      delta = 0;
-    }
-
-
-
-  i = (info->LedStat) & 0xf;
-  switch (i)
-    {
-    case 0x1:
-      strength = 1;
-      break;
-    case 0x3:
-      strength = 2;
-      break;
-    case 0x7:
-      strength = 3;
-      break;
-    case 0xf:
-      strength = 4;
-      break;
-    default:
-      strength = 0;
-    }
-
-  i = (info->LedStat >> 8) & 0xf;
-  switch (i)
-    {
-    case 0x1:
-      quality = 1;
-      break;
-    case 0x3:
-      quality = 2;
-      break;
-    case 0x7:
-      quality = 3;
-      break;
-    case 0xf:
-      quality = 4;
-      break;
-    default:
-      quality = 0;
-    }
-
-
-  len = 0;
-  PUTM_TO_PAGE (len, page, "Connection Time: %02ld:%02ld:%02ld\n",
-                ((delta / 3600) % 24), ((delta / 60) % 60), (delta % 60));
-  PUTM_TO_PAGE (len, page, "Connection Time[s]: %ld\n", delta);
-  PUTM_TO_PAGE (len, page, "Asic ID: %s\n",
-                (info->AsicID) ==
-                ELECTRABUZZ_ID ? "ELECTRABUZZ ASIC" : "MAGNEMITE ASIC");
-  PUTX_TO_PAGE (len, page, "SKU: ", SKUSZ, info->Sku);
-  PUTX_TO_PAGE (len, page, "EUI64: ", EUISZ, info->eui64);
-  PUTD_TO_PAGE (len, page, "DSP version number: ", DSPVERSZ, info->DspVer);
-  PUTX_TO_PAGE (len, page, "Hardware Serial Number: ", HWSERNUMSZ,
-                info->HwSerNum);
-  PUTX_TO_PAGE (len, page, "Caliberation Version: ", CALVERSZ,
-                info->RfCalVer);
-  PUTD_TO_PAGE (len, page, "Caliberation Date: ", CALDATESZ, info->RfCalDate);
-  PUTM_TO_PAGE (len, page, "Media State: %s\n",
-                (info->mediastate) ? "link" : "no link");
-  PUTM_TO_PAGE (len, page, "Connection Status: %s\n",
-                status[((info->ConStat) & 0x7)]);
-  PUTM_TO_PAGE (len, page, "RX packets: %ld\n", info->stats.rx_packets);
-  PUTM_TO_PAGE (len, page, "TX packets: %ld\n", info->stats.tx_packets);
-  PUTM_TO_PAGE (len, page, "RX bytes: %ld\n", info->stats.rx_bytes);
-  PUTM_TO_PAGE (len, page, "TX bytes: %ld\n", info->stats.tx_bytes);
-  PUTM_TO_PAGE (len, page, "Signal Strength: %s\n", signal[strength]);
-  PUTM_TO_PAGE (len, page, "Signal Quality: %s\n", signal[quality]);
-
-
-
-
-  return len;
+        char *status[] = { 
+                "Idle (Disconnect)", 
+                "Searching",
+                "Active (Connected)",
+                "Waiting for L2",
+                "Sleep",
+                "No Coverage",
+                "",
+                "",
+        };
+
+        char *signal[] = { "", "*", "**", "***", "****" };
+        int strength;
+        int quality;
+        struct timeval tv;
+        time_t delta;
+
+        dev = (struct net_device *) data;
+        info = netdev_priv(dev);
+
+        if (off > 0) {
+                *eof = 1;
+                return 0;
+        }
+
+
+        if (info->ProgConStat != 0xFF) {
+                ft1000_read_dpram16(info->pFt1000Dev, FT1000_MAG_DSP_LED,
+                           (u8 *)&ledStat, FT1000_MAG_DSP_LED_INDX);
+                info->LedStat = ntohs(ledStat);
+
+                ft1000_read_dpram16(info->pFt1000Dev, FT1000_MAG_DSP_CON_STATE,
+                        (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
+                info->ConStat = ntohs(conStat);
+                do_gettimeofday(&tv);
+                delta = (tv.tv_sec - info->ConTm);
+        } else {
+                info->ConStat = 0xf;
+                delta = 0;
+        }
+
+        i = (info->LedStat) & 0xf;
+        switch (i) {
+        case 0x1:
+                strength = 1;
+                break;
+        case 0x3:
+                strength = 2;
+                break;
+        case 0x7:
+                strength = 3;
+                break;
+        case 0xf:
+                strength = 4;
+                break;
+        default:
+                strength = 0;
+        }
+
+        i = (info->LedStat >> 8) & 0xf;
+        switch (i) {
+        case 0x1:
+                quality = 1;
+                break;
+        case 0x3:
+                quality = 2;
+                break;
+        case 0x7:
+                quality = 3;
+                break;
+        case 0xf:
+                quality = 4;
+                break;
+        default:
+                quality = 0;
+        }
+
+        len = 0;
+        PUTM_TO_PAGE(len, page, "Connection Time: %02ld:%02ld:%02ld\n",
+                ((delta / 3600) % 24), ((delta / 60) % 60), (delta % 60));
+        PUTM_TO_PAGE(len, page, "Connection Time[s]: %ld\n", delta);
+        PUTM_TO_PAGE(len, page, "Asic ID: %s\n",
+        (info->AsicID) ==
+        ELECTRABUZZ_ID ? "ELECTRABUZZ ASIC" : "MAGNEMITE ASIC");
+        PUTX_TO_PAGE(len, page, "SKU: ", SKUSZ, info->Sku);
+        PUTX_TO_PAGE(len, page, "EUI64: ", EUISZ, info->eui64);
+        PUTD_TO_PAGE(len, page, "DSP version number: ", DSPVERSZ, info->DspVer);
+        PUTX_TO_PAGE(len, page, "Hardware Serial Number: ", HWSERNUMSZ,
+                info->HwSerNum);
+        PUTX_TO_PAGE(len, page, "Caliberation Version: ", CALVERSZ,
+                info->RfCalVer);
+        PUTD_TO_PAGE(len, page, "Caliberation Date: ", CALDATESZ,
+                info->RfCalDate);
+        PUTM_TO_PAGE(len, page, "Media State: %s\n",
+                (info->mediastate) ? "link" : "no link");
+        PUTM_TO_PAGE(len, page, "Connection Status: %s\n",
+                status[((info->ConStat) & 0x7)]);
+        PUTM_TO_PAGE(len, page, "RX packets: %ld\n", info->stats.rx_packets);
+        PUTM_TO_PAGE(len, page, "TX packets: %ld\n", info->stats.tx_packets);
+        PUTM_TO_PAGE(len, page, "RX bytes: %ld\n", info->stats.rx_bytes);
+        PUTM_TO_PAGE(len, page, "TX bytes: %ld\n", info->stats.tx_bytes);
+        PUTM_TO_PAGE(len, page, "Signal Strength: %s\n", signal[strength]);
+        PUTM_TO_PAGE(len, page, "Signal Quality: %s\n", signal[quality]);
+
+        return len;
 }
 
 static int
-ft1000NotifyProc (struct notifier_block *this, unsigned long event, void *ptr)
+ft1000NotifyProc(struct notifier_block *this, unsigned long event, void *ptr)
 {
-  struct net_device *dev = ptr;
+        struct net_device *dev = ptr;
         struct ft1000_info *info;
-  struct proc_dir_entry *ft1000_proc_file;
-
-info = (struct ft1000_info *) netdev_priv(dev);
-
-
-  switch (event)
-    {
-    case NETDEV_CHANGENAME:
-      remove_proc_entry (info->netdevname, info->ft1000_proc_dir);
-      ft1000_proc_file = create_proc_read_entry (dev->name, 0644,
-                                                 info->ft1000_proc_dir,
-                                                 ft1000ReadProc, dev);
-      snprintf (info->netdevname, IFNAMSIZ, "%s", dev->name);
-      break;
-    }
-  return NOTIFY_DONE;
+        struct proc_dir_entry *ft1000_proc_file;
+
+        info = netdev_priv(dev);
+
+        switch (event) {
+        case NETDEV_CHANGENAME:
+                remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
+                ft1000_proc_file = create_proc_read_entry(dev->name, 0644,
+                                        info->ft1000_proc_dir,
+                                        ft1000ReadProc, dev);
+                snprintf(info->netdevname, IFNAMSIZ, "%s", dev->name);
+                break;
+        }
+
+        return NOTIFY_DONE;
 }
 
 static struct notifier_block ft1000_netdev_notifier = {
-  .notifier_call = ft1000NotifyProc
+        .notifier_call = ft1000NotifyProc,
 };
 
 
-void
-ft1000InitProc (struct net_device *dev)
+int ft1000_init_proc(struct net_device *dev)
 {
         struct ft1000_info *info;
-  struct proc_dir_entry *ft1000_proc_file;
-        info = (struct ft1000_info *) netdev_priv(dev);
-
-
-  info->ft1000_proc_dir = proc_mkdir (FT1000_PROC_DIR, FTNET_PROC);
-  if (info->ft1000_proc_dir == NULL)
-    {
-      remove_proc_entry (FT1000_PROC_DIR, FTNET_PROC);
-    }
-
-
-  ft1000_proc_file =
-    create_proc_read_entry (dev->name, 0644, info->ft1000_proc_dir,
-                            ft1000ReadProc, dev);
-  if (ft1000_proc_file == NULL)
-    {
-      remove_proc_entry (info->netdevname, info->ft1000_proc_dir);
-    }
-
-  snprintf (info->netdevname, IFNAMSIZ, "%s", dev->name);
-  register_netdevice_notifier (&ft1000_netdev_notifier);
-  return;
+        struct proc_dir_entry *ft1000_proc_file;
+        int ret = 0;
+
+        info = netdev_priv(dev);
+
+        info->ft1000_proc_dir = proc_mkdir(FT1000_PROC_DIR, FTNET_PROC);
+        if (info->ft1000_proc_dir == NULL) {
+                printk(KERN_WARNING "Unable to create %s dir.\n",
+                        FT1000_PROC_DIR);
+                ret = -EINVAL;
+                goto fail;
+        }
+
+        ft1000_proc_file =
+                create_proc_read_entry(dev->name, 0644,
+                        info->ft1000_proc_dir, ft1000ReadProc, dev);
+
+        if (ft1000_proc_file == NULL) {
+                printk(KERN_WARNING "Unable to create /proc entry.\n");
+                ret = -EINVAL;
+                goto fail_entry;
+        }
+
+        snprintf(info->netdevname, IFNAMSIZ, "%s", dev->name);
+
+        ret = register_netdevice_notifier(&ft1000_netdev_notifier);
+        if (ret)
+                goto fail_notif;
+
+        return 0;
+
+fail_notif:
+        remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
+fail_entry:
+        remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC);
+fail:
+        return ret;
 }
 
-void
-ft1000CleanupProc(struct ft1000_info *info)
+void ft1000_cleanup_proc(struct ft1000_info *info)
 {
-  remove_proc_entry (info->netdevname, info->ft1000_proc_dir);
-  remove_proc_entry (FT1000_PROC_DIR, FTNET_PROC);
-  unregister_netdevice_notifier (&ft1000_netdev_notifier);
-
-  return;
+        remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
+        remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC);
+        unregister_netdevice_notifier(&ft1000_netdev_notifier);
 }
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 28f55b2030e9..79482ac1c489 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -36,7 +36,7 @@ static struct usb_device_id id_table[] = {
 
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static BOOLEAN gPollingfailed = FALSE;
+static bool gPollingfailed = FALSE;
 int ft1000_poll_thread(void *arg)
 {
         int ret = STATUS_SUCCESS;
@@ -64,7 +64,7 @@ static int ft1000_probe(struct usb_interface *interface,
         int i, ret = 0, size;
 
         struct ft1000_device *ft1000dev;
-        struct ft1000_info *pft1000info;
+        struct ft1000_info *pft1000info = NULL;
         const struct firmware *dsp_fw;
 
         ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL);
@@ -84,7 +84,6 @@ static int ft1000_probe(struct usb_interface *interface,
         ft1000dev->dev = dev;
         ft1000dev->status = 0;
         ft1000dev->net = NULL;
-        spin_lock_init(&ft1000dev->device_lock);
         ft1000dev->tx_urb = usb_alloc_urb(0, GFP_ATOMIC);
         ft1000dev->rx_urb = usb_alloc_urb(0, GFP_ATOMIC);
 
@@ -164,7 +163,7 @@ static int ft1000_probe(struct usb_interface *interface,
         if (ret)
                 goto err_load;
 
-        pft1000info = (struct ft1000_info *) netdev_priv(ft1000dev->net);
+        pft1000info = netdev_priv(ft1000dev->net);
 
         DEBUG("In probe: pft1000info=%p\n", pft1000info);
         ret = dsp_reload(ft1000dev);
@@ -176,14 +175,18 @@ static int ft1000_probe(struct usb_interface *interface,
         gPollingfailed = FALSE;
         pft1000info->pPollThread =
             kthread_run(ft1000_poll_thread, ft1000dev, "ft1000_poll");
+
+        if (IS_ERR(pft1000info->pPollThread)) {
+                ret = PTR_ERR(pft1000info->pPollThread);
+                goto err_load;
+        }
+
         msleep(500);
 
         while (!pft1000info->CardReady) {
                 if (gPollingfailed) {
-                        if (pft1000info->pPollThread)
-                                kthread_stop(pft1000info->pPollThread);
                         ret = -EIO;
-                        goto err_load;
+                        goto err_thread;
                 }
                 msleep(100);
                 DEBUG("ft1000_probe::Waiting for Card Ready\n");
@@ -193,14 +196,21 @@ static int ft1000_probe(struct usb_interface *interface,
 
         ret = reg_ft1000_netdev(ft1000dev, interface);
         if (ret)
-                goto err_load;
+                goto err_thread;
 
-        pft1000info->NetDevRegDone = 1;
+        ret = ft1000_init_proc(ft1000dev->net);
+        if (ret)
+                goto err_proc;
 
-        ft1000InitProc(ft1000dev->net);
+        pft1000info->NetDevRegDone = 1;
 
         return 0;
 
+err_proc:
+        unregister_netdev(ft1000dev->net);
+        free_netdev(ft1000dev->net);
+err_thread:
+        kthread_stop(pft1000info->pPollThread);
 err_load:
         kfree(pFileStart);
 err_fw:
@@ -218,7 +228,7 @@ static void ft1000_disconnect(struct usb_interface *interface)
         DEBUG("In disconnect pft1000info=%p\n", pft1000info);
 
         if (pft1000info) {
-                ft1000CleanupProc(pft1000info);
+                ft1000_cleanup_proc(pft1000info);
                 if (pft1000info->pPollThread)
                         kthread_stop(pft1000info->pPollThread);
 
@@ -226,7 +236,7 @@ static void ft1000_disconnect(struct usb_interface *interface)
 
                 if (pft1000info->pFt1000Dev->net) {
                         DEBUG("ft1000_disconnect: destroy char driver\n");
-                        ft1000_DestroyDevice(pft1000info->pFt1000Dev->net);
+                        ft1000_destroy_dev(pft1000info->pFt1000Dev->net);
                         unregister_netdev(pft1000info->pFt1000Dev->net);
                         DEBUG
                             ("ft1000_disconnect: network device unregisterd\n");
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index a9d419a98a06..a143e9ca4f08 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -98,16 +98,6 @@ struct prov_record {
 /*end of Jim*/
 #define DEBUG(args...) printk(KERN_INFO args)
 
-#define UCHAR               u8
-#define USHORT              u16
-#define ULONG               u32 /* WTF ??? */
-#define BOOLEAN             u8
-#define PULONG              u32 *
-#define PUSHORT             u16 *
-#define PUCHAR              u8 *
-#define PCHAR               u8 *
-#define UINT                u32
-
 #define FALSE           0
 #define TRUE            1
 
@@ -372,15 +362,15 @@ struct prov_record {
 
 
 
-#define ISR_EMPTY                       (UCHAR)0x00      // no bits set in ISR
+#define ISR_EMPTY                       (u8)0x00         // no bits set in ISR
 
-#define ISR_DOORBELL_ACK        (UCHAR)0x01              //  the doorbell i sent has been recieved.
+#define ISR_DOORBELL_ACK        (u8)0x01                 //  the doorbell i sent has been recieved.
 
-#define ISR_DOORBELL_PEND       (UCHAR)0x02      //  doorbell for me
+#define ISR_DOORBELL_PEND       (u8)0x02         //  doorbell for me
 
-#define ISR_RCV                         (UCHAR)0x04      // packet received with no errors
+#define ISR_RCV                         (u8)0x04         // packet received with no errors
 
-#define ISR_WATERMARK           (UCHAR)0x08      //
+#define ISR_WATERMARK           (u8)0x08         //
 
 
 
@@ -466,12 +456,9 @@ struct ft1000_device
 {
         struct usb_device *dev;
         struct net_device *net;
-        spinlock_t device_lock;
 
         u32 status;
 
-        wait_queue_head_t control_wait;
-
         struct urb *rx_urb;
         struct urb *tx_urb;
 
@@ -486,6 +473,13 @@ struct ft1000_device
 //      struct net_device_stats stats; //mbelian
 } __attribute__ ((packed));
 
+struct ft1000_debug_dirs {
+        struct list_head list;
+        struct dentry *dent;
+        struct dentry *file;
+        int int_number;
+};
+
 struct ft1000_info {
     struct ft1000_device *pFt1000Dev;
     struct net_device_stats stats;
@@ -497,9 +491,9 @@ struct ft1000_info {
         unsigned char usbboot;
     unsigned short dspalive;
     u16 ASIC_ID;
-    BOOLEAN fProvComplete;
-    BOOLEAN fCondResetPend;
-    BOOLEAN fAppMsgPend;
+    bool fProvComplete;
+    bool fCondResetPend;
+    bool fAppMsgPend;
     char *pfwimg;
     int fwimgsz;
     u16 DrvErrNum;
@@ -520,7 +514,7 @@ struct ft1000_info {
     int NetDevRegDone;
     u8 CardNumber;
     u8 DeviceName[15];
-    int DeviceMajor;
+    struct ft1000_debug_dirs nodes;
     int registered;
     int mediastate;
     int dhcpflg;
@@ -567,26 +561,26 @@ struct dpram_blk {
 } __attribute__ ((packed));
 
 u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx);
-u16 ft1000_write_register(struct ft1000_device *ft1000dev, USHORT value, u16 nRegIndx);
-u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, USHORT cnt);
-u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, USHORT cnt);
-u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer, u8 highlow);
-u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, USHORT indx, USHORT value, u8 highlow);
-u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer);
-u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buffer);
+u16 ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx);
+u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);
+u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);
+u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow);
+u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow);
+u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);
+u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);
 
 extern void *pFileStart;
 extern size_t FileLength;
 extern int numofmsgbuf;
 
 int ft1000_close (struct net_device *dev);
-u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG  FileLength);
+u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32  FileLength);
 
 extern struct list_head freercvpool;
 extern spinlock_t free_buff_lock;   // lock to arbitrate free buffer list for receive command data
 
-int ft1000_CreateDevice(struct ft1000_device *dev);
-void ft1000_DestroyDevice(struct net_device *dev);
+int ft1000_create_dev(struct ft1000_device *dev);
+void ft1000_destroy_dev(struct net_device *dev);
 extern void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int size);
 
 struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist);
@@ -600,8 +594,8 @@ struct usb_interface;
 int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf);
 int ft1000_poll(void* dev_id);
 
-void ft1000InitProc(struct net_device *dev);
-void ft1000CleanupProc(struct ft1000_info *info);
+int ft1000_init_proc(struct net_device *dev);
+void ft1000_cleanup_proc(struct ft1000_info *info);
 
 
 
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c
index 48d4e483d8a4..6c9279a6d606 100644
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/go7007/go7007-driver.c
@@ -624,7 +624,7 @@ struct go7007 *go7007_alloc(struct go7007_board_info *board, struct device *dev)
         go->dvd_mode = 0;
         go->interlace_coding = 0;
         for (i = 0; i < 4; ++i)
-                go->modet[i].enable = 0;;
+                go->modet[i].enable = 0;
         for (i = 0; i < 1624; ++i)
                 go->modet_map[i] = 0;
         go->audio_deliver = NULL;
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index b46349bb43bf..acd39bd75b1c 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
 obj-$(CONFIG_HYPERV_UTILS)      += hv_utils.o
 
 hv_vmbus-y := vmbus_drv.o osd.o \
-                 vmbus.o hv.o connection.o channel.o \
+                 hv.o connection.o channel.o \
                  channel_mgmt.o ring_buffer.o
 hv_storvsc-y := storvsc_drv.o storvsc.o
 hv_blkvsc-y := blkvsc_drv.o blkvsc.o
diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
index d5b0abd771ab..bc16d9172eb2 100644
--- a/drivers/staging/hv/blkvsc.c
+++ b/drivers/staging/hv/blkvsc.c
@@ -25,24 +25,24 @@
 #include "osd.h"
 #include "storvsc.c"
 
-static const char *gBlkDriverName = "blkvsc";
+static const char *g_blk_driver_name = "blkvsc";
 
 /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
-static const struct hv_guid gBlkVscDeviceType = {
+static const struct hv_guid g_blk_device_type = {
         .data = {
                 0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
                 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
         }
 };
 
-static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
+static int blk_vsc_on_device_add(struct hv_device *device, void *additional_info)
 {
-        struct storvsc_device_info *deviceInfo;
+        struct storvsc_device_info *device_info;
         int ret = 0;
 
-        deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
+        device_info = (struct storvsc_device_info *)additional_info;
 
-        ret = StorVscOnDeviceAdd(Device, AdditionalInfo);
+        ret = stor_vsc_on_device_add(device, additional_info);
         if (ret != 0)
                 return ret;
 
@@ -51,31 +51,31 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
          * id. For IDE devices, the device instance id is formatted as
          * <bus id> * - <device id> - 8899 - 000000000000.
          */
-        deviceInfo->PathId = Device->deviceInstance.data[3] << 24 |
-                             Device->deviceInstance.data[2] << 16 |
-                             Device->deviceInstance.data[1] << 8  |
-                             Device->deviceInstance.data[0];
+        device_info->path_id = device->deviceInstance.data[3] << 24 |
+                             device->deviceInstance.data[2] << 16 |
+                             device->deviceInstance.data[1] << 8  |
+                             device->deviceInstance.data[0];
 
-        deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 |
-                               Device->deviceInstance.data[4];
+        device_info->target_id = device->deviceInstance.data[5] << 8 |
+                               device->deviceInstance.data[4];
 
         return ret;
 }
 
-int BlkVscInitialize(struct hv_driver *Driver)
+int blk_vsc_initialize(struct hv_driver *driver)
 {
-        struct storvsc_driver_object *storDriver;
+        struct storvsc_driver_object *stor_driver;
         int ret = 0;
 
-        storDriver = (struct storvsc_driver_object *)Driver;
+        stor_driver = (struct storvsc_driver_object *)driver;
 
         /* Make sure we are at least 2 pages since 1 page is used for control */
-        /* ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1)); */
+        /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */
 
-        Driver->name = gBlkDriverName;
-        memcpy(&Driver->deviceType, &gBlkVscDeviceType, sizeof(struct hv_guid));
+        driver->name = g_blk_driver_name;
+        memcpy(&driver->deviceType, &g_blk_device_type, sizeof(struct hv_guid));
 
-        storDriver->RequestExtSize = sizeof(struct storvsc_request_extension);
+        stor_driver->request_ext_size = sizeof(struct storvsc_request_extension);
 
         /*
          * Divide the ring buffer data size (which is 1 page less than the ring
@@ -83,20 +83,20 @@ int BlkVscInitialize(struct hv_driver *Driver)
          * by the max request size (which is
          * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
          */
-        storDriver->MaxOutstandingRequestsPerChannel =
-                ((storDriver->RingBufferSize - PAGE_SIZE) /
+        stor_driver->max_outstanding_req_per_channel =
+                ((stor_driver->ring_buffer_size - PAGE_SIZE) /
                   ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET +
                            sizeof(struct vstor_packet) + sizeof(u64),
                            sizeof(u64)));
 
         DPRINT_INFO(BLKVSC, "max io outstd %u",
-                    storDriver->MaxOutstandingRequestsPerChannel);
+                    stor_driver->max_outstanding_req_per_channel);
 
         /* Setup the dispatch table */
-        storDriver->Base.OnDeviceAdd = BlkVscOnDeviceAdd;
-        storDriver->Base.OnDeviceRemove = StorVscOnDeviceRemove;
-        storDriver->Base.OnCleanup = StorVscOnCleanup;
-        storDriver->OnIORequest = StorVscOnIORequest;
+        stor_driver->base.OnDeviceAdd = blk_vsc_on_device_add;
+        stor_driver->base.OnDeviceRemove = stor_vsc_on_device_remove;
+        stor_driver->base.OnCleanup = stor_vsc_on_cleanup;
+        stor_driver->on_io_request = stor_vsc_on_io_request;
 
         return ret;
 }
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 3f81ca591064..b3d05fcfe6d2 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -177,13 +177,13 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
         int ret;
 
-        storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
+        storvsc_drv_obj->ring_buffer_size = blkvsc_ringbuffer_size;
 
         /* Callback to client driver to complete the initialization */
-        drv_init(&storvsc_drv_obj->Base);
+        drv_init(&storvsc_drv_obj->base);
 
-        drv_ctx->driver.name = storvsc_drv_obj->Base.name;
-        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType,
+        drv_ctx->driver.name = storvsc_drv_obj->base.name;
+        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->base.deviceType,
                sizeof(struct hv_guid));
 
         drv_ctx->probe = blkvsc_probe;
@@ -230,8 +230,8 @@ static void blkvsc_drv_exit(void)
                 device_unregister(current_dev);
         }
 
-        if (storvsc_drv_obj->Base.OnCleanup)
-                storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base);
+        if (storvsc_drv_obj->base.OnCleanup)
+                storvsc_drv_obj->base.OnCleanup(&storvsc_drv_obj->base);
 
         vmbus_child_driver_unregister(drv_ctx);
 
@@ -262,7 +262,7 @@ static int blkvsc_probe(struct device *device)
 
         DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");
 
-        if (!storvsc_drv_obj->Base.OnDeviceAdd) {
+        if (!storvsc_drv_obj->base.OnDeviceAdd) {
                 DPRINT_ERR(BLKVSC_DRV, "OnDeviceAdd() not set");
                 ret = -1;
                 goto Cleanup;
@@ -284,7 +284,7 @@ static int blkvsc_probe(struct device *device)
 
         blkdev->request_pool = kmem_cache_create(dev_name(&device_ctx->device),
                                         sizeof(struct blkvsc_request) +
-                                        storvsc_drv_obj->RequestExtSize, 0,
+                                        storvsc_drv_obj->request_ext_size, 0,
                                         SLAB_HWCACHE_ALIGN, NULL);
         if (!blkdev->request_pool) {
                 ret = -ENOMEM;
@@ -293,7 +293,7 @@ static int blkvsc_probe(struct device *device)
 
 
         /* Call to the vsc driver to add the device */
-        ret = storvsc_drv_obj->Base.OnDeviceAdd(device_obj, &device_info);
+        ret = storvsc_drv_obj->base.OnDeviceAdd(device_obj, &device_info);
         if (ret != 0) {
                 DPRINT_ERR(BLKVSC_DRV, "unable to add blkvsc device");
                 goto Cleanup;
@@ -301,9 +301,9 @@ static int blkvsc_probe(struct device *device)
 
         blkdev->device_ctx = device_ctx;
         /* this identified the device 0 or 1 */
-        blkdev->target = device_info.TargetId;
+        blkdev->target = device_info.target_id;
         /* this identified the ide ctrl 0 or 1 */
-        blkdev->path = device_info.PathId;
+        blkdev->path = device_info.path_id;
 
         dev_set_drvdata(device, blkdev);
 
@@ -391,7 +391,7 @@ static int blkvsc_probe(struct device *device)
         return ret;
 
 Remove:
-        storvsc_drv_obj->Base.OnDeviceRemove(device_obj);
+        storvsc_drv_obj->base.OnDeviceRemove(device_obj);
 
 Cleanup:
         if (blkdev) {
@@ -459,9 +459,9 @@ static int blkvsc_do_flush(struct block_device_context *blkdev)
         blkvsc_req->req = NULL;
         blkvsc_req->write = 0;
 
-        blkvsc_req->request.DataBuffer.PfnArray[0] = 0;
-        blkvsc_req->request.DataBuffer.Offset = 0;
-        blkvsc_req->request.DataBuffer.Length = 0;
+        blkvsc_req->request.data_buffer.PfnArray[0] = 0;
+        blkvsc_req->request.data_buffer.Offset = 0;
+        blkvsc_req->request.data_buffer.Length = 0;
 
         blkvsc_req->cmnd[0] = SYNCHRONIZE_CACHE;
         blkvsc_req->cmd_len = 10;
@@ -506,9 +506,9 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev)
         blkvsc_req->req = NULL;
         blkvsc_req->write = 0;
 
-        blkvsc_req->request.DataBuffer.PfnArray[0] = page_to_pfn(page_buf);
-        blkvsc_req->request.DataBuffer.Offset = 0;
-        blkvsc_req->request.DataBuffer.Length = 64;
+        blkvsc_req->request.data_buffer.PfnArray[0] = page_to_pfn(page_buf);
+        blkvsc_req->request.data_buffer.Offset = 0;
+        blkvsc_req->request.data_buffer.Length = 64;
 
         blkvsc_req->cmnd[0] = INQUIRY;
         blkvsc_req->cmnd[1] = 0x1;              /* Get product data */
@@ -593,9 +593,9 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev)
         blkvsc_req->req = NULL;
         blkvsc_req->write = 0;
 
-        blkvsc_req->request.DataBuffer.PfnArray[0] = page_to_pfn(page_buf);
-        blkvsc_req->request.DataBuffer.Offset = 0;
-        blkvsc_req->request.DataBuffer.Length = 8;
+        blkvsc_req->request.data_buffer.PfnArray[0] = page_to_pfn(page_buf);
+        blkvsc_req->request.data_buffer.Offset = 0;
+        blkvsc_req->request.data_buffer.Length = 8;
 
         blkvsc_req->cmnd[0] = READ_CAPACITY;
         blkvsc_req->cmd_len = 16;
@@ -614,7 +614,7 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev)
         wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond);
 
         /* check error */
-        if (blkvsc_req->request.Status) {
+        if (blkvsc_req->request.status) {
                 scsi_normalize_sense(blkvsc_req->sense_buffer,
                                      SCSI_SENSE_BUFFERSIZE, &sense_hdr);
 
@@ -670,9 +670,9 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
         blkvsc_req->req = NULL;
         blkvsc_req->write = 0;
 
-        blkvsc_req->request.DataBuffer.PfnArray[0] = page_to_pfn(page_buf);
-        blkvsc_req->request.DataBuffer.Offset = 0;
-        blkvsc_req->request.DataBuffer.Length = 12;
+        blkvsc_req->request.data_buffer.PfnArray[0] = page_to_pfn(page_buf);
+        blkvsc_req->request.data_buffer.Offset = 0;
+        blkvsc_req->request.data_buffer.Length = 12;
 
         blkvsc_req->cmnd[0] = 0x9E; /* READ_CAPACITY16; */
         blkvsc_req->cmd_len = 16;
@@ -691,7 +691,7 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
         wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond);
 
         /* check error */
-        if (blkvsc_req->request.Status) {
+        if (blkvsc_req->request.status) {
                 scsi_normalize_sense(blkvsc_req->sense_buffer,
                                      SCSI_SENSE_BUFFERSIZE, &sense_hdr);
                 if (sense_hdr.asc == 0x3A) {
@@ -741,14 +741,14 @@ static int blkvsc_remove(struct device *device)
 
         DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
 
-        if (!storvsc_drv_obj->Base.OnDeviceRemove)
+        if (!storvsc_drv_obj->base.OnDeviceRemove)
                 return -1;
 
         /*
          * Call to the vsc driver to let it know that the device is being
          * removed
          */
-        ret = storvsc_drv_obj->Base.OnDeviceRemove(device_obj);
+        ret = storvsc_drv_obj->base.OnDeviceRemove(device_obj);
         if (ret != 0) {
                 /* TODO: */
                 DPRINT_ERR(BLKVSC_DRV,
@@ -865,38 +865,38 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
                    (blkvsc_req->write) ? "WRITE" : "READ",
                    (unsigned long) blkvsc_req->sector_start,
                    blkvsc_req->sector_count,
-                   blkvsc_req->request.DataBuffer.Offset,
-                   blkvsc_req->request.DataBuffer.Length);
+                   blkvsc_req->request.data_buffer.Offset,
+                   blkvsc_req->request.data_buffer.Length);
 #if 0
-        for (i = 0; i < (blkvsc_req->request.DataBuffer.Length >> 12); i++) {
+        for (i = 0; i < (blkvsc_req->request.data_buffer.Length >> 12); i++) {
                 DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
                            "req %p pfn[%d] %llx\n",
                            blkvsc_req, i,
-                           blkvsc_req->request.DataBuffer.PfnArray[i]);
+                           blkvsc_req->request.data_buffer.PfnArray[i]);
         }
 #endif
 
         storvsc_req = &blkvsc_req->request;
-        storvsc_req->Extension = (void *)((unsigned long)blkvsc_req +
+        storvsc_req->extension = (void *)((unsigned long)blkvsc_req +
                                           sizeof(struct blkvsc_request));
 
-        storvsc_req->Type = blkvsc_req->write ? WRITE_TYPE : READ_TYPE;
+        storvsc_req->type = blkvsc_req->write ? WRITE_TYPE : READ_TYPE;
 
-        storvsc_req->OnIOCompletion = request_completion;
-        storvsc_req->Context = blkvsc_req;
+        storvsc_req->on_io_completion = request_completion;
+        storvsc_req->context = blkvsc_req;
 
-        storvsc_req->Host = blkdev->port;
-        storvsc_req->Bus = blkdev->path;
-        storvsc_req->TargetId = blkdev->target;
-        storvsc_req->LunId = 0;  /* this is not really used at all */
+        storvsc_req->host = blkdev->port;
+        storvsc_req->bus = blkdev->path;
+        storvsc_req->target_id = blkdev->target;
+        storvsc_req->lun_id = 0;         /* this is not really used at all */
 
-        storvsc_req->CdbLen = blkvsc_req->cmd_len;
-        storvsc_req->Cdb = blkvsc_req->cmnd;
+        storvsc_req->cdb_len = blkvsc_req->cmd_len;
+        storvsc_req->cdb = blkvsc_req->cmnd;
 
-        storvsc_req->SenseBuffer = blkvsc_req->sense_buffer;
-        storvsc_req->SenseBufferSize = SCSI_SENSE_BUFFERSIZE;
+        storvsc_req->sense_buffer = blkvsc_req->sense_buffer;
+        storvsc_req->sense_buffer_size = SCSI_SENSE_BUFFERSIZE;
 
-        ret = storvsc_drv_obj->OnIORequest(&blkdev->device_ctx->device_obj,
+        ret = storvsc_drv_obj->on_io_request(&blkdev->device_ctx->device_obj,
                                            &blkvsc_req->request);
         if (ret == 0)
                 blkdev->num_outstanding_reqs++;
@@ -992,8 +992,10 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
 
                                         blkvsc_req->dev = blkdev;
                                         blkvsc_req->req = req;
-                                        blkvsc_req->request.DataBuffer.Offset = bvec->bv_offset;
-                                        blkvsc_req->request.DataBuffer.Length = 0;
+                                        blkvsc_req->request.data_buffer.Offset
+                                                = bvec->bv_offset;
+                                        blkvsc_req->request.data_buffer.Length
+                                                = 0;
 
                                         /* Add to the group */
                                         blkvsc_req->group = group;
@@ -1007,8 +1009,11 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
                                 }
 
                                 /* Add the curr bvec/segment to the curr blkvsc_req */
-                                blkvsc_req->request.DataBuffer.PfnArray[databuf_idx] = page_to_pfn(bvec->bv_page);
-                                blkvsc_req->request.DataBuffer.Length += bvec->bv_len;
+                                blkvsc_req->request.data_buffer.
+                                        PfnArray[databuf_idx]
+                                                = page_to_pfn(bvec->bv_page);
+                                blkvsc_req->request.data_buffer.Length
+                                        += bvec->bv_len;
 
                                 prev_bvec = bvec;
 
@@ -1073,7 +1078,7 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
 static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
 {
         struct blkvsc_request *blkvsc_req =
-                        (struct blkvsc_request *)request->Context;
+                        (struct blkvsc_request *)request->context;
         struct block_device_context *blkdev =
                         (struct block_device_context *)blkvsc_req->dev;
         struct scsi_sense_hdr sense_hdr;
@@ -1083,7 +1088,7 @@ static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
 
         blkdev->num_outstanding_reqs--;
 
-        if (blkvsc_req->request.Status)
+        if (blkvsc_req->request.status)
                 if (scsi_normalize_sense(blkvsc_req->sense_buffer,
                                          SCSI_SENSE_BUFFERSIZE, &sense_hdr))
                         scsi_print_sense_hdr("blkvsc", &sense_hdr);
@@ -1095,7 +1100,7 @@ static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
 static void blkvsc_request_completion(struct hv_storvsc_request *request)
 {
         struct blkvsc_request *blkvsc_req =
-                        (struct blkvsc_request *)request->Context;
+                        (struct blkvsc_request *)request->context;
         struct block_device_context *blkdev =
                         (struct block_device_context *)blkvsc_req->dev;
         unsigned long flags;
@@ -1110,7 +1115,7 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
                    (blkvsc_req->write) ? "WRITE" : "READ",
                    (unsigned long)blkvsc_req->sector_start,
                    blkvsc_req->sector_count,
-                   blkvsc_req->request.DataBuffer.Length,
+                   blkvsc_req->request.data_buffer.Length,
                    blkvsc_req->group->outstanding,
                    blkdev->num_outstanding_reqs);
 
@@ -1137,7 +1142,7 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
                         list_del(&comp_req->req_entry);
 
                         if (!__blk_end_request(comp_req->req,
-                                (!comp_req->request.Status ? 0 : -EIO),
+                                (!comp_req->request.status ? 0 : -EIO),
                                 comp_req->sector_count * blkdev->sector_size)) {
                                 /*
                                  * All the sectors have been xferred ie the
@@ -1195,7 +1200,7 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev)
 
                         if (comp_req->req) {
                                 ret = __blk_end_request(comp_req->req,
-                                        (!comp_req->request.Status ? 0 : -EIO),
+                                        (!comp_req->request.status ? 0 : -EIO),
                                         comp_req->sector_count *
                                         blkdev->sector_size);
 
@@ -1482,7 +1487,7 @@ static int __init blkvsc_init(void)
 
         DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");
 
-        ret = blkvsc_drv_init(BlkVscInitialize);
+        ret = blkvsc_drv_init(blk_vsc_initialize);
 
         return ret;
 }
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index 26ebc77f22b7..45a627d77b41 100644
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -43,24 +43,24 @@ static void DumpMonitorPage(struct hv_monitor_page *MonitorPage)
         int j = 0;
 
         DPRINT_DBG(VMBUS, "monitorPage - %p, trigger state - %d",
-                   MonitorPage, MonitorPage->TriggerState);
+                   MonitorPage, MonitorPage->trigger_state);
 
         for (i = 0; i < 4; i++)
                 DPRINT_DBG(VMBUS, "trigger group (%d) - %llx", i,
-                           MonitorPage->TriggerGroup[i].AsUINT64);
+                           MonitorPage->trigger_group[i].as_uint64);
 
         for (i = 0; i < 4; i++) {
                 for (j = 0; j < 32; j++) {
                         DPRINT_DBG(VMBUS, "latency (%d)(%d) - %llx", i, j,
-                                   MonitorPage->Latency[i][j]);
+                                   MonitorPage->latency[i][j]);
                 }
         }
         for (i = 0; i < 4; i++) {
                 for (j = 0; j < 32; j++) {
                         DPRINT_DBG(VMBUS, "param-conn id (%d)(%d) - %d", i, j,
-                               MonitorPage->Parameter[i][j].ConnectionId.Asu32);
+                               MonitorPage->parameter[i][j].connectionid.asu32);
                         DPRINT_DBG(VMBUS, "param-flag (%d)(%d) - %d", i, j,
-                                MonitorPage->Parameter[i][j].FlagNumber);
+                                MonitorPage->parameter[i][j].flag_number);
                 }
         }
 }
@@ -74,21 +74,21 @@ static void vmbus_setevent(struct vmbus_channel *channel)
 {
         struct hv_monitor_page *monitorpage;
 
-        if (channel->OfferMsg.MonitorAllocated) {
+        if (channel->offermsg.monitor_allocated) {
                 /* Each u32 represents 32 channels */
-                set_bit(channel->OfferMsg.ChildRelId & 31,
+                set_bit(channel->offermsg.child_relid & 31,
                         (unsigned long *) gVmbusConnection.SendInterruptPage +
-                        (channel->OfferMsg.ChildRelId >> 5));
+                        (channel->offermsg.child_relid >> 5));
 
                 monitorpage = gVmbusConnection.MonitorPages;
                 monitorpage++; /* Get the child to parent monitor page */
 
-                set_bit(channel->MonitorBit,
-                        (unsigned long *)&monitorpage->TriggerGroup
-                                        [channel->MonitorGroup].Pending);
+                set_bit(channel->monitor_bit,
+                        (unsigned long *)&monitorpage->trigger_group
+                                        [channel->monitor_grp].pending);
 
         } else {
-                VmbusSetEvent(channel->OfferMsg.ChildRelId);
+                VmbusSetEvent(channel->offermsg.child_relid);
         }
 }
 
@@ -97,19 +97,19 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
 {
         struct hv_monitor_page *monitorPage;
 
-        if (Channel->OfferMsg.MonitorAllocated) {
+        if (Channel->offermsg.monitor_allocated) {
                 /* Each u32 represents 32 channels */
-                clear_bit(Channel->OfferMsg.ChildRelId & 31,
+                clear_bit(Channel->offermsg.child_relid & 31,
                           (unsigned long *)gVmbusConnection.SendInterruptPage +
-                          (Channel->OfferMsg.ChildRelId >> 5));
+                          (Channel->offermsg.child_relid >> 5));
 
                 monitorPage =
                         (struct hv_monitor_page *)gVmbusConnection.MonitorPages;
                 monitorPage++; /* Get the child to parent monitor page */
 
-                clear_bit(Channel->MonitorBit,
-                          (unsigned long *)&monitorPage->TriggerGroup
-                                        [Channel->MonitorGroup].Pending);
+                clear_bit(Channel->monitor_bit,
+                          (unsigned long *)&monitorPage->trigger_group
+                                        [Channel->monitor_grp].Pending);
         }
 }
 
@@ -121,42 +121,42 @@ void vmbus_get_debug_info(struct vmbus_channel *channel,
                               struct vmbus_channel_debug_info *debuginfo)
 {
         struct hv_monitor_page *monitorpage;
-        u8 monitor_group = (u8)channel->OfferMsg.MonitorId / 32;
-        u8 monitor_offset = (u8)channel->OfferMsg.MonitorId % 32;
+        u8 monitor_group = (u8)channel->offermsg.monitorid / 32;
+        u8 monitor_offset = (u8)channel->offermsg.monitorid % 32;
         /* u32 monitorBit       = 1 << monitorOffset; */
 
-        debuginfo->RelId = channel->OfferMsg.ChildRelId;
-        debuginfo->State = channel->State;
-        memcpy(&debuginfo->InterfaceType,
-               &channel->OfferMsg.Offer.InterfaceType, sizeof(struct hv_guid));
-        memcpy(&debuginfo->InterfaceInstance,
-               &channel->OfferMsg.Offer.InterfaceInstance,
+        debuginfo->relid = channel->offermsg.child_relid;
+        debuginfo->state = channel->state;
+        memcpy(&debuginfo->interfacetype,
+               &channel->offermsg.offer.InterfaceType, sizeof(struct hv_guid));
+        memcpy(&debuginfo->interface_instance,
+               &channel->offermsg.offer.InterfaceInstance,
                sizeof(struct hv_guid));
 
         monitorpage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;
 
-        debuginfo->MonitorId = channel->OfferMsg.MonitorId;
+        debuginfo->monitorid = channel->offermsg.monitorid;
 
-        debuginfo->ServerMonitorPending =
-                        monitorpage->TriggerGroup[monitor_group].Pending;
-        debuginfo->ServerMonitorLatency =
-                        monitorpage->Latency[monitor_group][monitor_offset];
-        debuginfo->ServerMonitorConnectionId =
-                        monitorpage->Parameter[monitor_group]
-                                        [monitor_offset].ConnectionId.u.Id;
+        debuginfo->servermonitor_pending =
+                        monitorpage->trigger_group[monitor_group].pending;
+        debuginfo->servermonitor_latency =
+                        monitorpage->latency[monitor_group][monitor_offset];
+        debuginfo->servermonitor_connectionid =
+                        monitorpage->parameter[monitor_group]
+                                        [monitor_offset].connectionid.u.id;
 
         monitorpage++;
 
-        debuginfo->ClientMonitorPending =
-                        monitorpage->TriggerGroup[monitor_group].Pending;
-        debuginfo->ClientMonitorLatency =
-                        monitorpage->Latency[monitor_group][monitor_offset];
-        debuginfo->ClientMonitorConnectionId =
-                        monitorpage->Parameter[monitor_group]
-                                        [monitor_offset].ConnectionId.u.Id;
+        debuginfo->clientmonitor_pending =
+                        monitorpage->trigger_group[monitor_group].pending;
+        debuginfo->clientmonitor_latency =
+                        monitorpage->latency[monitor_group][monitor_offset];
+        debuginfo->clientmonitor_connectionid =
+                        monitorpage->parameter[monitor_group]
+                                        [monitor_offset].connectionid.u.id;
 
-        RingBufferGetDebugInfo(&channel->Inbound, &debuginfo->Inbound);
-        RingBufferGetDebugInfo(&channel->Outbound, &debuginfo->Outbound);
+        ringbuffer_get_debuginfo(&channel->inbound, &debuginfo->inbound);
+        ringbuffer_get_debuginfo(&channel->outbound, &debuginfo->outbound);
 }
 
 /*
@@ -176,11 +176,11 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
         /* ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1))); */
         /* ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1))); */
 
-        newchannel->OnChannelCallback = onchannelcallback;
-        newchannel->ChannelCallbackContext = context;
+        newchannel->onchannel_callback = onchannelcallback;
+        newchannel->channel_callback_context = context;
 
         /* Allocate the ring buffer */
-        out = osd_PageAlloc((send_ringbuffer_size + recv_ringbuffer_size)
+        out = osd_page_alloc((send_ringbuffer_size + recv_ringbuffer_size)
                              >> PAGE_SHIFT);
         if (!out)
                 return -ENOMEM;
@@ -189,17 +189,17 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 
         in = (void *)((unsigned long)out + send_ringbuffer_size);
 
-        newchannel->RingBufferPages = out;
-        newchannel->RingBufferPageCount = (send_ringbuffer_size +
+        newchannel->ringbuffer_pages = out;
+        newchannel->ringbuffer_pagecount = (send_ringbuffer_size +
                                            recv_ringbuffer_size) >> PAGE_SHIFT;
 
-        ret = RingBufferInit(&newchannel->Outbound, out, send_ringbuffer_size);
+        ret = ringbuffer_init(&newchannel->outbound, out, send_ringbuffer_size);
         if (ret != 0) {
                 err = ret;
                 goto errorout;
         }
 
-        ret = RingBufferInit(&newchannel->Inbound, in, recv_ringbuffer_size);
+        ret = ringbuffer_init(&newchannel->inbound, in, recv_ringbuffer_size);
         if (ret != 0) {
                 err = ret;
                 goto errorout;
@@ -210,13 +210,13 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
         DPRINT_DBG(VMBUS, "Establishing ring buffer's gpadl for channel %p...",
                    newchannel);
 
-        newchannel->RingBufferGpadlHandle = 0;
+        newchannel->ringbuffer_gpadlhandle = 0;
 
         ret = vmbus_establish_gpadl(newchannel,
-                                         newchannel->Outbound.RingBuffer,
+                                         newchannel->outbound.ring_buffer,
                                          send_ringbuffer_size +
                                          recv_ringbuffer_size,
-                                         &newchannel->RingBufferGpadlHandle);
+                                         &newchannel->ringbuffer_gpadlhandle);
 
         if (ret != 0) {
                 err = ret;
@@ -225,12 +225,12 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 
         DPRINT_DBG(VMBUS, "channel %p <relid %d gpadl 0x%x send ring %p "
                    "size %d recv ring %p size %d, downstreamoffset %d>",
-                   newchannel, newchannel->OfferMsg.ChildRelId,
-                   newchannel->RingBufferGpadlHandle,
-                   newchannel->Outbound.RingBuffer,
-                   newchannel->Outbound.RingSize,
-                   newchannel->Inbound.RingBuffer,
-                   newchannel->Inbound.RingSize,
+                   newchannel, newchannel->offermsg.child_relid,
+                   newchannel->ringbuffer_gpadlhandle,
+                   newchannel->outbound.ring_buffer,
+                   newchannel->outbound.ring_size,
+                   newchannel->inbound.ring_buffer,
+                   newchannel->inbound.ring_size,
                    send_ringbuffer_size);
 
         /* Create and init the channel open message */
@@ -242,20 +242,20 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
                 goto errorout;
         }
 
-        openInfo->WaitEvent = osd_WaitEventCreate();
-        if (!openInfo->WaitEvent) {
+        openInfo->waitevent = osd_waitevent_create();
+        if (!openInfo->waitevent) {
                 err = -ENOMEM;
                 goto errorout;
         }
 
-        openMsg = (struct vmbus_channel_open_channel *)openInfo->Msg;
-        openMsg->Header.MessageType = ChannelMessageOpenChannel;
-        openMsg->OpenId = newchannel->OfferMsg.ChildRelId; /* FIXME */
-        openMsg->ChildRelId = newchannel->OfferMsg.ChildRelId;
-        openMsg->RingBufferGpadlHandle = newchannel->RingBufferGpadlHandle;
-        openMsg->DownstreamRingBufferPageOffset = send_ringbuffer_size >>
+        openMsg = (struct vmbus_channel_open_channel *)openInfo->msg;
+        openMsg->header.msgtype = CHANNELMSG_OPENCHANNEL;
+        openMsg->openid = newchannel->offermsg.child_relid; /* FIXME */
+        openMsg->child_relid = newchannel->offermsg.child_relid;
+        openMsg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle;
+        openMsg->downstream_ringbuffer_pageoffset = send_ringbuffer_size >>
                                                   PAGE_SHIFT;
-        openMsg->ServerContextAreaGpadlHandle = 0; /* TODO */
+        openMsg->server_contextarea_gpadlhandle = 0; /* TODO */
 
         if (userdatalen > MAX_USER_DEFINED_BYTES) {
                 err = -EINVAL;
@@ -263,10 +263,10 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
         }
 
         if (userdatalen)
-                memcpy(openMsg->UserData, userdata, userdatalen);
+                memcpy(openMsg->userdata, userdata, userdatalen);
 
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_add_tail(&openInfo->MsgListEntry,
+        list_add_tail(&openInfo->msglistentry,
                       &gVmbusConnection.ChannelMsgList);
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
@@ -280,27 +280,27 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
         }
 
         /* FIXME: Need to time-out here */
-        osd_WaitEventWait(openInfo->WaitEvent);
+        osd_waitevent_wait(openInfo->waitevent);
 
-        if (openInfo->Response.OpenResult.Status == 0)
+        if (openInfo->response.open_result.status == 0)
                 DPRINT_INFO(VMBUS, "channel <%p> open success!!", newchannel);
         else
                 DPRINT_INFO(VMBUS, "channel <%p> open failed - %d!!",
-                            newchannel, openInfo->Response.OpenResult.Status);
+                            newchannel, openInfo->response.open_result.status);
 
 Cleanup:
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_del(&openInfo->MsgListEntry);
+        list_del(&openInfo->msglistentry);
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
-        kfree(openInfo->WaitEvent);
+        kfree(openInfo->waitevent);
         kfree(openInfo);
         return 0;
 
 errorout:
-        RingBufferCleanup(&newchannel->Outbound);
-        RingBufferCleanup(&newchannel->Inbound);
-        osd_PageFree(out, (send_ringbuffer_size + recv_ringbuffer_size)
+        ringbuffer_cleanup(&newchannel->outbound);
+        ringbuffer_cleanup(&newchannel->inbound);
+        osd_page_free(out, (send_ringbuffer_size + recv_ringbuffer_size)
                      >> PAGE_SHIFT);
         kfree(openInfo);
         return err;
@@ -322,7 +322,7 @@ static void dump_gpadl_body(struct vmbus_channel_gpadl_body *gpadl, u32 len)
 
         for (i = 0; i < pfncount; i++)
                 DPRINT_DBG(VMBUS, "gpadl body  - %d) pfn %llu",
-                           i, gpadl->Pfn[i]);
+                           i, gpadl->pfn[i]);
 }
 
 /*
@@ -336,18 +336,18 @@ static void dump_gpadl_header(struct vmbus_channel_gpadl_header *gpadl)
 
         DPRINT_DBG(VMBUS,
                    "gpadl header - relid %d, range count %d, range buflen %d",
-                   gpadl->ChildRelId, gpadl->RangeCount, gpadl->RangeBufLen);
-        for (i = 0; i < gpadl->RangeCount; i++) {
-                pagecount = gpadl->Range[i].ByteCount >> PAGE_SHIFT;
+                   gpadl->child_relid, gpadl->rangecount, gpadl->range_buflen);
+        for (i = 0; i < gpadl->rangecount; i++) {
+                pagecount = gpadl->range[i].ByteCount >> PAGE_SHIFT;
                 pagecount = (pagecount > 26) ? 26 : pagecount;
 
                 DPRINT_DBG(VMBUS, "gpadl range %d - len %d offset %d "
-                           "page count %d", i, gpadl->Range[i].ByteCount,
-                           gpadl->Range[i].ByteOffset, pagecount);
+                           "page count %d", i, gpadl->range[i].ByteCount,
+                           gpadl->range[i].ByteOffset, pagecount);
 
                 for (j = 0; j < pagecount; j++)
                         DPRINT_DBG(VMBUS, "%d) pfn %llu", j,
-                                   gpadl->Range[i].PfnArray[j]);
+                                   gpadl->range[i].PfnArray[j]);
         }
 }
 
@@ -391,18 +391,18 @@ static int create_gpadl_header(void *kbuffer, u32 size,
                 if (!msgheader)
                         goto nomem;
 
-                INIT_LIST_HEAD(&msgheader->SubMsgList);
-                msgheader->MessageSize = msgsize;
+                INIT_LIST_HEAD(&msgheader->submsglist);
+                msgheader->msgsize = msgsize;
 
                 gpadl_header = (struct vmbus_channel_gpadl_header *)
-                        msgheader->Msg;
-                gpadl_header->RangeCount = 1;
-                gpadl_header->RangeBufLen = sizeof(struct gpa_range) +
+                        msgheader->msg;
+                gpadl_header->rangecount = 1;
+                gpadl_header->range_buflen = sizeof(struct gpa_range) +
                                          pagecount * sizeof(u64);
-                gpadl_header->Range[0].ByteOffset = 0;
-                gpadl_header->Range[0].ByteCount = size;
+                gpadl_header->range[0].ByteOffset = 0;
+                gpadl_header->range[0].ByteCount = size;
                 for (i = 0; i < pfncount; i++)
-                        gpadl_header->Range[0].PfnArray[i] = pfn+i;
+                        gpadl_header->range[0].PfnArray[i] = pfn+i;
                 *msginfo = msgheader;
                 *messagecount = 1;
 
@@ -428,10 +428,10 @@ static int create_gpadl_header(void *kbuffer, u32 size,
                         /* FIXME: we probably need to more if this fails */
                         if (!msgbody)
                                 goto nomem;
-                        msgbody->MessageSize = msgsize;
+                        msgbody->msgsize = msgsize;
                         (*messagecount)++;
                         gpadl_body =
-                                (struct vmbus_channel_gpadl_body *)msgbody->Msg;
+                                (struct vmbus_channel_gpadl_body *)msgbody->msg;
 
                         /*
                          * FIXME:
@@ -440,11 +440,11 @@ static int create_gpadl_header(void *kbuffer, u32 size,
                          */
                         /* gpadl_body->Gpadl = kbuffer; */
                         for (i = 0; i < pfncurr; i++)
-                                gpadl_body->Pfn[i] = pfn + pfnsum + i;
+                                gpadl_body->pfn[i] = pfn + pfnsum + i;
 
                         /* add to msg header */
-                        list_add_tail(&msgbody->MsgListEntry,
-                                      &msgheader->SubMsgList);
+                        list_add_tail(&msgbody->msglistentry,
+                                      &msgheader->submsglist);
                         pfnsum += pfncurr;
                         pfnleft -= pfncurr;
                 }
@@ -456,17 +456,17 @@ static int create_gpadl_header(void *kbuffer, u32 size,
                 msgheader = kzalloc(msgsize, GFP_KERNEL);
                 if (msgheader == NULL)
                         goto nomem;
-                msgheader->MessageSize = msgsize;
+                msgheader->msgsize = msgsize;
 
                 gpadl_header = (struct vmbus_channel_gpadl_header *)
-                        msgheader->Msg;
-                gpadl_header->RangeCount = 1;
-                gpadl_header->RangeBufLen = sizeof(struct gpa_range) +
+                        msgheader->msg;
+                gpadl_header->rangecount = 1;
+                gpadl_header->range_buflen = sizeof(struct gpa_range) +
                                          pagecount * sizeof(u64);
-                gpadl_header->Range[0].ByteOffset = 0;
-                gpadl_header->Range[0].ByteCount = size;
+                gpadl_header->range[0].ByteOffset = 0;
+                gpadl_header->range[0].ByteCount = size;
                 for (i = 0; i < pagecount; i++)
-                        gpadl_header->Range[0].PfnArray[i] = pfn+i;
+                        gpadl_header->range[0].PfnArray[i] = pfn+i;
 
                 *msginfo = msgheader;
                 *messagecount = 1;
@@ -508,21 +508,21 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
         if (ret)
                 return ret;
 
-        msginfo->WaitEvent = osd_WaitEventCreate();
-        if (!msginfo->WaitEvent) {
+        msginfo->waitevent = osd_waitevent_create();
+        if (!msginfo->waitevent) {
                 ret = -ENOMEM;
                 goto Cleanup;
         }
 
-        gpadlmsg = (struct vmbus_channel_gpadl_header *)msginfo->Msg;
-        gpadlmsg->Header.MessageType = ChannelMessageGpadlHeader;
-        gpadlmsg->ChildRelId = channel->OfferMsg.ChildRelId;
-        gpadlmsg->Gpadl = next_gpadl_handle;
+        gpadlmsg = (struct vmbus_channel_gpadl_header *)msginfo->msg;
+        gpadlmsg->header.msgtype = CHANNELMSG_GPADL_HEADER;
+        gpadlmsg->child_relid = channel->offermsg.child_relid;
+        gpadlmsg->gpadl = next_gpadl_handle;
 
         dump_gpadl_header(gpadlmsg);
 
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_add_tail(&msginfo->MsgListEntry,
+        list_add_tail(&msginfo->msglistentry,
                       &gVmbusConnection.ChannelMsgList);
 
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
@@ -530,9 +530,9 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
                    kbuffer, size, msgcount);
 
         DPRINT_DBG(VMBUS, "Sending GPADL Header - len %zd",
-                   msginfo->MessageSize - sizeof(*msginfo));
+                   msginfo->msgsize - sizeof(*msginfo));
 
-        ret = VmbusPostMessage(gpadlmsg, msginfo->MessageSize -
+        ret = VmbusPostMessage(gpadlmsg, msginfo->msgsize -
                                sizeof(*msginfo));
         if (ret != 0) {
                 DPRINT_ERR(VMBUS, "Unable to open channel - %d", ret);
@@ -540,48 +540,48 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
         }
 
         if (msgcount > 1) {
-                list_for_each(curr, &msginfo->SubMsgList) {
+                list_for_each(curr, &msginfo->submsglist) {
 
                         /* FIXME: should this use list_entry() instead ? */
                         submsginfo = (struct vmbus_channel_msginfo *)curr;
                         gpadl_body =
-                             (struct vmbus_channel_gpadl_body *)submsginfo->Msg;
+                             (struct vmbus_channel_gpadl_body *)submsginfo->msg;
 
-                        gpadl_body->Header.MessageType =
-                                ChannelMessageGpadlBody;
-                        gpadl_body->Gpadl = next_gpadl_handle;
+                        gpadl_body->header.msgtype =
+                                CHANNELMSG_GPADL_BODY;
+                        gpadl_body->gpadl = next_gpadl_handle;
 
                         DPRINT_DBG(VMBUS, "Sending GPADL Body - len %zd",
-                                   submsginfo->MessageSize -
+                                   submsginfo->msgsize -
                                    sizeof(*submsginfo));
 
-                        dump_gpadl_body(gpadl_body, submsginfo->MessageSize -
+                        dump_gpadl_body(gpadl_body, submsginfo->msgsize -
                                       sizeof(*submsginfo));
                         ret = VmbusPostMessage(gpadl_body,
-                                               submsginfo->MessageSize -
+                                               submsginfo->msgsize -
                                                sizeof(*submsginfo));
                         if (ret != 0)
                                 goto Cleanup;
 
                 }
         }
-        osd_WaitEventWait(msginfo->WaitEvent);
+        osd_waitevent_wait(msginfo->waitevent);
 
         /* At this point, we received the gpadl created msg */
         DPRINT_DBG(VMBUS, "Received GPADL created "
                    "(relid %d, status %d handle %x)",
-                   channel->OfferMsg.ChildRelId,
-                   msginfo->Response.GpadlCreated.CreationStatus,
-                   gpadlmsg->Gpadl);
+                   channel->offermsg.child_relid,
+                   msginfo->response.gpadl_created.creation_status,
+                   gpadlmsg->gpadl);
 
-        *gpadl_handle = gpadlmsg->Gpadl;
+        *gpadl_handle = gpadlmsg->gpadl;
 
 Cleanup:
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_del(&msginfo->MsgListEntry);
+        list_del(&msginfo->msglistentry);
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
-        kfree(msginfo->WaitEvent);
+        kfree(msginfo->waitevent);
         kfree(msginfo);
         return ret;
 }
@@ -604,20 +604,20 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
         if (!info)
                 return -ENOMEM;
 
-        info->WaitEvent = osd_WaitEventCreate();
-        if (!info->WaitEvent) {
+        info->waitevent = osd_waitevent_create();
+        if (!info->waitevent) {
                 kfree(info);
                 return -ENOMEM;
         }
 
-        msg = (struct vmbus_channel_gpadl_teardown *)info->Msg;
+        msg = (struct vmbus_channel_gpadl_teardown *)info->msg;
 
-        msg->Header.MessageType = ChannelMessageGpadlTeardown;
-        msg->ChildRelId = channel->OfferMsg.ChildRelId;
-        msg->Gpadl = gpadl_handle;
+        msg->header.msgtype = CHANNELMSG_GPADL_TEARDOWN;
+        msg->child_relid = channel->offermsg.child_relid;
+        msg->gpadl = gpadl_handle;
 
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_add_tail(&info->MsgListEntry,
+        list_add_tail(&info->msglistentry,
                       &gVmbusConnection.ChannelMsgList);
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
@@ -628,14 +628,14 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
                 /* something... */
         }
 
-        osd_WaitEventWait(info->WaitEvent);
+        osd_waitevent_wait(info->waitevent);
 
         /* Received a torndown response */
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_del(&info->MsgListEntry);
+        list_del(&info->msglistentry);
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
-        kfree(info->WaitEvent);
+        kfree(info->waitevent);
         kfree(info);
         return ret;
 }
@@ -652,7 +652,7 @@ void vmbus_close(struct vmbus_channel *channel)
         int ret;
 
         /* Stop callback and cancel the timer asap */
-        channel->OnChannelCallback = NULL;
+        channel->onchannel_callback = NULL;
         del_timer_sync(&channel->poll_timer);
 
         /* Send a closing message */
@@ -663,11 +663,11 @@ void vmbus_close(struct vmbus_channel *channel)
         if (!info)
                 return;
 
-        /* info->waitEvent = osd_WaitEventCreate(); */
+        /* info->waitEvent = osd_waitevent_create(); */
 
-        msg = (struct vmbus_channel_close_channel *)info->Msg;
-        msg->Header.MessageType = ChannelMessageCloseChannel;
-        msg->ChildRelId = channel->OfferMsg.ChildRelId;
+        msg = (struct vmbus_channel_close_channel *)info->msg;
+        msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
+        msg->child_relid = channel->offermsg.child_relid;
 
         ret = VmbusPostMessage(msg, sizeof(struct vmbus_channel_close_channel));
         if (ret != 0) {
@@ -676,17 +676,17 @@ void vmbus_close(struct vmbus_channel *channel)
         }
 
         /* Tear down the gpadl for the channel's ring buffer */
-        if (channel->RingBufferGpadlHandle)
+        if (channel->ringbuffer_gpadlhandle)
                 vmbus_teardown_gpadl(channel,
-                                          channel->RingBufferGpadlHandle);
+                                          channel->ringbuffer_gpadlhandle);
 
         /* TODO: Send a msg to release the childRelId */
 
         /* Cleanup the ring buffers for this channel */
-        RingBufferCleanup(&channel->Outbound);
-        RingBufferCleanup(&channel->Inbound);
+        ringbuffer_cleanup(&channel->outbound);
+        ringbuffer_cleanup(&channel->inbound);
 
-        osd_PageFree(channel->RingBufferPages, channel->RingBufferPageCount);
+        osd_page_free(channel->ringbuffer_pages, channel->ringbuffer_pagecount);
 
         kfree(info);
 
@@ -696,9 +696,9 @@ void vmbus_close(struct vmbus_channel *channel)
          * caller will free the channel
          */
 
-        if (channel->State == CHANNEL_OPEN_STATE) {
+        if (channel->state == CHANNEL_OPEN_STATE) {
                 spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
-                list_del(&channel->ListEntry);
+                list_del(&channel->listentry);
                 spin_unlock_irqrestore(&gVmbusConnection.channel_lock, flags);
 
                 free_channel(channel);
@@ -752,10 +752,10 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer,
         sg_set_buf(&bufferlist[2], &aligned_data,
                    packetlen_aligned - packetlen);
 
-        ret = RingBufferWrite(&channel->Outbound, bufferlist, 3);
+        ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
         /* TODO: We should determine if this is optional */
-        if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound))
+        if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                 vmbus_setevent(channel);
 
         return ret;
@@ -817,10 +817,10 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
         sg_set_buf(&bufferlist[2], &aligned_data,
                 packetlen_aligned - packetlen);
 
-        ret = RingBufferWrite(&channel->Outbound, bufferlist, 3);
+        ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
         /* TODO: We should determine if this is optional */
-        if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound))
+        if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                 vmbus_setevent(channel);
 
         return ret;
@@ -886,10 +886,10 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
         sg_set_buf(&bufferlist[2], &aligned_data,
                 packetlen_aligned - packetlen);
 
-        ret = RingBufferWrite(&channel->Outbound, bufferlist, 3);
+        ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
         /* TODO: We should determine if this is optional */
-        if (ret == 0 && !GetRingBufferInterruptMask(&channel->Outbound))
+        if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                 vmbus_setevent(channel);
 
         return ret;
@@ -923,7 +923,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
 
         spin_lock_irqsave(&channel->inbound_lock, flags);
 
-        ret = RingBufferPeek(&channel->Inbound, &desc,
+        ret = ringbuffer_peek(&channel->inbound, &desc,
                              sizeof(struct vmpacket_descriptor));
         if (ret != 0) {
                 spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -940,7 +940,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
 
         DPRINT_DBG(VMBUS, "packet received on channel %p relid %d <type %d "
                    "flag %d tid %llx pktlen %d datalen %d> ",
-                   channel, channel->OfferMsg.ChildRelId, desc.Type,
+                   channel, channel->offermsg.child_relid, desc.Type,
                    desc.Flags, desc.TransactionId, packetlen, userlen);
 
         *buffer_actual_len = userlen;
@@ -956,7 +956,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
         *requestid = desc.TransactionId;
 
         /* Copy over the packet to the user buffer */
-        ret = RingBufferRead(&channel->Inbound, buffer, userlen,
+        ret = ringbuffer_read(&channel->inbound, buffer, userlen,
                              (desc.DataOffset8 << 3));
 
         spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -983,7 +983,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
 
         spin_lock_irqsave(&channel->inbound_lock, flags);
 
-        ret = RingBufferPeek(&channel->Inbound, &desc,
+        ret = ringbuffer_peek(&channel->inbound, &desc,
                              sizeof(struct vmpacket_descriptor));
         if (ret != 0) {
                 spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -999,7 +999,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
 
         DPRINT_DBG(VMBUS, "packet received on channel %p relid %d <type %d "
                    "flag %d tid %llx pktlen %d datalen %d> ",
-                   channel, channel->OfferMsg.ChildRelId, desc.Type,
+                   channel, channel->offermsg.child_relid, desc.Type,
                    desc.Flags, desc.TransactionId, packetlen, userlen);
 
         *buffer_actual_len = packetlen;
@@ -1015,7 +1015,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
         *requestid = desc.TransactionId;
 
         /* Copy over the entire packet to the user buffer */
-        ret = RingBufferRead(&channel->Inbound, buffer, packetlen, 0);
+        ret = ringbuffer_read(&channel->inbound, buffer, packetlen, 0);
 
         spin_unlock_irqrestore(&channel->inbound_lock, flags);
         return 0;
@@ -1030,7 +1030,7 @@ void vmbus_onchannel_event(struct vmbus_channel *channel)
         dump_vmbus_channel(channel);
         /* ASSERT(Channel->OnChannelCallback); */
 
-        channel->OnChannelCallback(channel->ChannelCallbackContext);
+        channel->onchannel_callback(channel->channel_callback_context);
 
         mod_timer(&channel->poll_timer, jiffies + usecs_to_jiffies(100));
 }
@@ -1042,8 +1042,8 @@ void vmbus_ontimer(unsigned long data)
 {
         struct vmbus_channel *channel = (struct vmbus_channel *)data;
 
-        if (channel->OnChannelCallback)
-                channel->OnChannelCallback(channel->ChannelCallbackContext);
+        if (channel->onchannel_callback)
+                channel->onchannel_callback(channel->channel_callback_context);
 }
 
 /*
@@ -1051,7 +1051,7 @@ void vmbus_ontimer(unsigned long data)
  */
 static void dump_vmbus_channel(struct vmbus_channel *channel)
 {
-        DPRINT_DBG(VMBUS, "Channel (%d)", channel->OfferMsg.ChildRelId);
-        DumpRingInfo(&channel->Outbound, "Outbound ");
-        DumpRingInfo(&channel->Inbound, "Inbound ");
+        DPRINT_DBG(VMBUS, "Channel (%d)", channel->offermsg.child_relid);
+        dump_ring_info(&channel->outbound, "Outbound ");
+        dump_ring_info(&channel->inbound, "Inbound ");
 }
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 45dbe305afed..d44d5c39f68b 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -251,8 +251,8 @@ static struct vmbus_channel *alloc_channel(void)
         channel->poll_timer.data = (unsigned long)channel;
         channel->poll_timer.function = vmbus_ontimer;
 
-        channel->ControlWQ = create_workqueue("hv_vmbus_ctl");
-        if (!channel->ControlWQ) {
+        channel->controlwq = create_workqueue("hv_vmbus_ctl");
+        if (!channel->controlwq) {
                 kfree(channel);
                 return NULL;
         }
@@ -263,12 +263,14 @@ static struct vmbus_channel *alloc_channel(void)
 /*
  * release_hannel - Release the vmbus channel object itself
  */
-static inline void release_channel(void *context)
+static void release_channel(struct work_struct *work)
 {
-        struct vmbus_channel *channel = context;
+        struct vmbus_channel *channel = container_of(work,
+                                                     struct vmbus_channel,
+                                                     work);
 
         DPRINT_DBG(VMBUS, "releasing channel (%p)", channel);
-        destroy_workqueue(channel->ControlWQ);
+        destroy_workqueue(channel->controlwq);
         DPRINT_DBG(VMBUS, "channel released (%p)", channel);
 
         kfree(channel);
@@ -286,8 +288,8 @@ void free_channel(struct vmbus_channel *channel)
          * workqueue/thread context
          * ie we can't destroy ourselves.
          */
-        osd_schedule_callback(gVmbusConnection.WorkQueue, release_channel,
-                              channel);
+        INIT_WORK(&channel->work, release_channel);
+        queue_work(gVmbusConnection.WorkQueue, &channel->work);
 }
 
 
@@ -308,29 +310,46 @@ static void count_hv_channel(void)
         spin_unlock_irqrestore(&gVmbusConnection.channel_lock, flags);
 }
 
+/*
+ * vmbus_process_rescind_offer -
+ * Rescind the offer by initiating a device removal
+ */
+static void vmbus_process_rescind_offer(struct work_struct *work)
+{
+        struct vmbus_channel *channel = container_of(work,
+                                                     struct vmbus_channel,
+                                                     work);
+
+        vmbus_child_device_unregister(channel->device_obj);
+}
 
 /*
  * vmbus_process_offer - Process the offer by creating a channel/device
  * associated with this offer
  */
-static void vmbus_process_offer(void *context)
+static void vmbus_process_offer(struct work_struct *work)
 {
-        struct vmbus_channel *newchannel = context;
+        struct vmbus_channel *newchannel = container_of(work,
+                                                        struct vmbus_channel,
+                                                        work);
         struct vmbus_channel *channel;
         bool fnew = true;
         int ret;
         int cnt;
         unsigned long flags;
 
+        /* The next possible work is rescind handling */
+        INIT_WORK(&newchannel->work, vmbus_process_rescind_offer);
+
         /* Make sure this is a new offer */
         spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
 
-        list_for_each_entry(channel, &gVmbusConnection.ChannelList, ListEntry) {
-                if (!memcmp(&channel->OfferMsg.Offer.InterfaceType,
-                            &newchannel->OfferMsg.Offer.InterfaceType,
+        list_for_each_entry(channel, &gVmbusConnection.ChannelList, listentry) {
+                if (!memcmp(&channel->offermsg.offer.InterfaceType,
+                            &newchannel->offermsg.offer.InterfaceType,
                             sizeof(struct hv_guid)) &&
-                    !memcmp(&channel->OfferMsg.Offer.InterfaceInstance,
-                            &newchannel->OfferMsg.Offer.InterfaceInstance,
+                    !memcmp(&channel->offermsg.offer.InterfaceInstance,
+                            &newchannel->offermsg.offer.InterfaceInstance,
                             sizeof(struct hv_guid))) {
                         fnew = false;
                         break;
@@ -338,14 +357,14 @@ static void vmbus_process_offer(void *context)
         }
 
         if (fnew)
-                list_add_tail(&newchannel->ListEntry,
+                list_add_tail(&newchannel->listentry,
                               &gVmbusConnection.ChannelList);
 
         spin_unlock_irqrestore(&gVmbusConnection.channel_lock, flags);
 
         if (!fnew) {
                 DPRINT_DBG(VMBUS, "Ignoring duplicate offer for relid (%d)",
-                           newchannel->OfferMsg.ChildRelId);
+                           newchannel->offermsg.child_relid);
                 free_channel(newchannel);
                 return;
         }
@@ -355,27 +374,27 @@ static void vmbus_process_offer(void *context)
          * We need to set the DeviceObject field before calling
          * VmbusChildDeviceAdd()
          */
-        newchannel->DeviceObject = VmbusChildDeviceCreate(
-                &newchannel->OfferMsg.Offer.InterfaceType,
-                &newchannel->OfferMsg.Offer.InterfaceInstance,
+        newchannel->device_obj = vmbus_child_device_create(
+                &newchannel->offermsg.offer.InterfaceType,
+                &newchannel->offermsg.offer.InterfaceInstance,
                 newchannel);
 
         DPRINT_DBG(VMBUS, "child device object allocated - %p",
-                   newchannel->DeviceObject);
+                   newchannel->device_obj);
 
         /*
          * Add the new device to the bus. This will kick off device-driver
          * binding which eventually invokes the device driver's AddDevice()
          * method.
          */
-        ret = VmbusChildDeviceAdd(newchannel->DeviceObject);
+        ret = VmbusChildDeviceAdd(newchannel->device_obj);
         if (ret != 0) {
                 DPRINT_ERR(VMBUS,
                            "unable to add child device object (relid %d)",
-                           newchannel->OfferMsg.ChildRelId);
+                           newchannel->offermsg.child_relid);
 
                 spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
-                list_del(&newchannel->ListEntry);
+                list_del(&newchannel->listentry);
                 spin_unlock_irqrestore(&gVmbusConnection.channel_lock, flags);
 
                 free_channel(newchannel);
@@ -385,11 +404,11 @@ static void vmbus_process_offer(void *context)
                  * so that when we do close the channel normally, we
                  * can cleanup properly
                  */
-                newchannel->State = CHANNEL_OPEN_STATE;
+                newchannel->state = CHANNEL_OPEN_STATE;
 
                 /* Open IC channels */
                 for (cnt = 0; cnt < MAX_MSG_TYPES; cnt++) {
-                        if (memcmp(&newchannel->OfferMsg.Offer.InterfaceType,
+                        if (memcmp(&newchannel->offermsg.offer.InterfaceType,
                                    &hv_cb_utils[cnt].data,
                                    sizeof(struct hv_guid)) == 0 &&
                                 vmbus_open(newchannel, 2 * PAGE_SIZE,
@@ -406,17 +425,6 @@ static void vmbus_process_offer(void *context)
 }
 
 /*
- * vmbus_process_rescind_offer -
- * Rescind the offer by initiating a device removal
- */
-static void vmbus_process_rescind_offer(void *context)
-{
-        struct vmbus_channel *channel = context;
-
-        VmbusChildDeviceRemove(channel->DeviceObject);
-}
-
-/*
  * vmbus_onoffer - Handler for channel offers from vmbus in parent partition.
  *
  * We ignore all offers except network and storage offers. For each network and
@@ -434,7 +442,7 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
 
         offer = (struct vmbus_channel_offer_channel *)hdr;
         for (i = 0; i < MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) {
-                if (memcmp(&offer->Offer.InterfaceType,
+                if (memcmp(&offer->offer.InterfaceType,
                     &gSupportedDeviceClasses[i], sizeof(struct hv_guid)) == 0) {
                         fsupported = 1;
                         break;
@@ -443,12 +451,12 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
 
         if (!fsupported) {
                 DPRINT_DBG(VMBUS, "Ignoring channel offer notification for "
-                           "child relid %d", offer->ChildRelId);
+                           "child relid %d", offer->child_relid);
                 return;
         }
 
-        guidtype = &offer->Offer.InterfaceType;
-        guidinstance = &offer->Offer.InterfaceInstance;
+        guidtype = &offer->offer.InterfaceType;
+        guidinstance = &offer->offer.InterfaceInstance;
 
         DPRINT_INFO(VMBUS, "Channel offer notification - "
                     "child relid %d monitor id %d allocated %d, "
@@ -456,8 +464,8 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
                     "%02x%02x%02x%02x%02x%02x%02x%02x} "
                     "instance {%02x%02x%02x%02x-%02x%02x-%02x%02x-"
                     "%02x%02x%02x%02x%02x%02x%02x%02x}",
-                    offer->ChildRelId, offer->MonitorId,
-                    offer->MonitorAllocated,
+                    offer->child_relid, offer->monitorid,
+                    offer->monitor_allocated,
                     guidtype->data[3], guidtype->data[2],
                     guidtype->data[1], guidtype->data[0],
                     guidtype->data[5], guidtype->data[4],
@@ -484,14 +492,14 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
 
         DPRINT_DBG(VMBUS, "channel object allocated - %p", newchannel);
 
-        memcpy(&newchannel->OfferMsg, offer,
+        memcpy(&newchannel->offermsg, offer,
                sizeof(struct vmbus_channel_offer_channel));
-        newchannel->MonitorGroup = (u8)offer->MonitorId / 32;
-        newchannel->MonitorBit = (u8)offer->MonitorId % 32;
+        newchannel->monitor_grp = (u8)offer->monitorid / 32;
+        newchannel->monitor_bit = (u8)offer->monitorid % 32;
 
         /* TODO: Make sure the offer comes from our parent partition */
-        osd_schedule_callback(newchannel->ControlWQ, vmbus_process_offer,
-                              newchannel);
+        INIT_WORK(&newchannel->work, vmbus_process_offer);
+        queue_work(newchannel->controlwq, &newchannel->work);
 }
 
 /*
@@ -505,16 +513,16 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
         struct vmbus_channel *channel;
 
         rescind = (struct vmbus_channel_rescind_offer *)hdr;
-        channel = GetChannelFromRelId(rescind->ChildRelId);
+        channel = GetChannelFromRelId(rescind->child_relid);
         if (channel == NULL) {
                 DPRINT_DBG(VMBUS, "channel not found for relId %d",
-                           rescind->ChildRelId);
+                           rescind->child_relid);
                 return;
         }
 
-        osd_schedule_callback(channel->ControlWQ,
-                              vmbus_process_rescind_offer,
-                              channel);
+        /* work is initialized for vmbus_process_rescind_offer() from
+         * vmbus_process_offer() where the channel got created */
+        queue_work(channel->controlwq, &channel->work);
 }
 
 /*
@@ -545,7 +553,7 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr)
         unsigned long flags;
 
         result = (struct vmbus_channel_open_result *)hdr;
-        DPRINT_DBG(VMBUS, "vmbus open result - %d", result->Status);
+        DPRINT_DBG(VMBUS, "vmbus open result - %d", result->status);
 
         /*
          * Find the open msg, copy the result and signal/unblock the wait event
@@ -556,17 +564,17 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr)
 /* FIXME: this should probably use list_entry() instead */
                 msginfo = (struct vmbus_channel_msginfo *)curr;
                 requestheader =
-                        (struct vmbus_channel_message_header *)msginfo->Msg;
+                        (struct vmbus_channel_message_header *)msginfo->msg;
 
-                if (requestheader->MessageType == ChannelMessageOpenChannel) {
+                if (requestheader->msgtype == CHANNELMSG_OPENCHANNEL) {
                         openmsg =
-                        (struct vmbus_channel_open_channel *)msginfo->Msg;
-                        if (openmsg->ChildRelId == result->ChildRelId &&
-                            openmsg->OpenId == result->OpenId) {
-                                memcpy(&msginfo->Response.OpenResult,
+                        (struct vmbus_channel_open_channel *)msginfo->msg;
+                        if (openmsg->child_relid == result->child_relid &&
+                            openmsg->openid == result->openid) {
+                                memcpy(&msginfo->response.open_result,
                                        result,
                                        sizeof(struct vmbus_channel_open_result));
-                                osd_WaitEventSet(msginfo->WaitEvent);
+                                osd_waitevent_set(msginfo->waitevent);
                                 break;
                         }
                 }
@@ -592,7 +600,7 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr)
 
         gpadlcreated = (struct vmbus_channel_gpadl_created *)hdr;
         DPRINT_DBG(VMBUS, "vmbus gpadl created result - %d",
-                   gpadlcreated->CreationStatus);
+                   gpadlcreated->creation_status);
 
         /*
          * Find the establish msg, copy the result and signal/unblock the wait
@@ -604,19 +612,19 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr)
 /* FIXME: this should probably use list_entry() instead */
                 msginfo = (struct vmbus_channel_msginfo *)curr;
                 requestheader =
-                        (struct vmbus_channel_message_header *)msginfo->Msg;
+                        (struct vmbus_channel_message_header *)msginfo->msg;
 
-                if (requestheader->MessageType == ChannelMessageGpadlHeader) {
+                if (requestheader->msgtype == CHANNELMSG_GPADL_HEADER) {
                         gpadlheader =
                         (struct vmbus_channel_gpadl_header *)requestheader;
 
-                        if ((gpadlcreated->ChildRelId ==
-                             gpadlheader->ChildRelId) &&
-                            (gpadlcreated->Gpadl == gpadlheader->Gpadl)) {
-                                memcpy(&msginfo->Response.GpadlCreated,
+                        if ((gpadlcreated->child_relid ==
+                             gpadlheader->child_relid) &&
+                            (gpadlcreated->gpadl == gpadlheader->gpadl)) {
+                                memcpy(&msginfo->response.gpadl_created,
                                        gpadlcreated,
                                        sizeof(struct vmbus_channel_gpadl_created));
-                                osd_WaitEventSet(msginfo->WaitEvent);
+                                osd_waitevent_set(msginfo->waitevent);
                                 break;
                         }
                 }
@@ -652,17 +660,17 @@ static void vmbus_ongpadl_torndown(
 /* FIXME: this should probably use list_entry() instead */
                 msginfo = (struct vmbus_channel_msginfo *)curr;
                 requestheader =
-                        (struct vmbus_channel_message_header *)msginfo->Msg;
+                        (struct vmbus_channel_message_header *)msginfo->msg;
 
-                if (requestheader->MessageType == ChannelMessageGpadlTeardown) {
+                if (requestheader->msgtype == CHANNELMSG_GPADL_TEARDOWN) {
                         gpadl_teardown =
                         (struct vmbus_channel_gpadl_teardown *)requestheader;
 
-                        if (gpadl_torndown->Gpadl == gpadl_teardown->Gpadl) {
-                                memcpy(&msginfo->Response.GpadlTorndown,
+                        if (gpadl_torndown->gpadl == gpadl_teardown->gpadl) {
+                                memcpy(&msginfo->response.gpadl_torndown,
                                        gpadl_torndown,
                                        sizeof(struct vmbus_channel_gpadl_torndown));
-                                osd_WaitEventSet(msginfo->WaitEvent);
+                                osd_waitevent_set(msginfo->waitevent);
                                 break;
                         }
                 }
@@ -694,16 +702,16 @@ static void vmbus_onversion_response(
 /* FIXME: this should probably use list_entry() instead */
                 msginfo = (struct vmbus_channel_msginfo *)curr;
                 requestheader =
-                        (struct vmbus_channel_message_header *)msginfo->Msg;
+                        (struct vmbus_channel_message_header *)msginfo->msg;
 
-                if (requestheader->MessageType ==
-                    ChannelMessageInitiateContact) {
+                if (requestheader->msgtype ==
+                    CHANNELMSG_INITIATE_CONTACT) {
                         initiate =
                         (struct vmbus_channel_initiate_contact *)requestheader;
-                        memcpy(&msginfo->Response.VersionResponse,
+                        memcpy(&msginfo->response.version_response,
                               version_response,
                               sizeof(struct vmbus_channel_version_response));
-                        osd_WaitEventSet(msginfo->WaitEvent);
+                        osd_waitevent_set(msginfo->waitevent);
                 }
         }
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
@@ -711,24 +719,24 @@ static void vmbus_onversion_response(
 
 /* Channel message dispatch table */
 static struct vmbus_channel_message_table_entry
-        gChannelMessageTable[ChannelMessageCount] = {
-        {ChannelMessageInvalid,                 NULL},
-        {ChannelMessageOfferChannel,            vmbus_onoffer},
-        {ChannelMessageRescindChannelOffer,     vmbus_onoffer_rescind},
-        {ChannelMessageRequestOffers,           NULL},
-        {ChannelMessageAllOffersDelivered,      vmbus_onoffers_delivered},
-        {ChannelMessageOpenChannel,             NULL},
-        {ChannelMessageOpenChannelResult,       vmbus_onopen_result},
-        {ChannelMessageCloseChannel,            NULL},
-        {ChannelMessageGpadlHeader,             NULL},
-        {ChannelMessageGpadlBody,               NULL},
-        {ChannelMessageGpadlCreated,            vmbus_ongpadl_created},
-        {ChannelMessageGpadlTeardown,           NULL},
-        {ChannelMessageGpadlTorndown,           vmbus_ongpadl_torndown},
-        {ChannelMessageRelIdReleased,           NULL},
-        {ChannelMessageInitiateContact,         NULL},
-        {ChannelMessageVersionResponse,         vmbus_onversion_response},
-        {ChannelMessageUnload,                  NULL},
+        gChannelMessageTable[CHANNELMSG_COUNT] = {
+        {CHANNELMSG_INVALID,                    NULL},
+        {CHANNELMSG_OFFERCHANNEL,               vmbus_onoffer},
+        {CHANNELMSG_RESCIND_CHANNELOFFER,       vmbus_onoffer_rescind},
+        {CHANNELMSG_REQUESTOFFERS,              NULL},
+        {CHANNELMSG_ALLOFFERS_DELIVERED,        vmbus_onoffers_delivered},
+        {CHANNELMSG_OPENCHANNEL,                NULL},
+        {CHANNELMSG_OPENCHANNEL_RESULT, vmbus_onopen_result},
+        {CHANNELMSG_CLOSECHANNEL,               NULL},
+        {CHANNELMSG_GPADL_HEADER,               NULL},
+        {CHANNELMSG_GPADL_BODY,         NULL},
+        {CHANNELMSG_GPADL_CREATED,              vmbus_ongpadl_created},
+        {CHANNELMSG_GPADL_TEARDOWN,             NULL},
+        {CHANNELMSG_GPADL_TORNDOWN,             vmbus_ongpadl_torndown},
+        {CHANNELMSG_RELID_RELEASED,             NULL},
+        {CHANNELMSG_INITIATE_CONTACT,           NULL},
+        {CHANNELMSG_VERSION_RESPONSE,           vmbus_onversion_response},
+        {CHANNELMSG_UNLOAD,                     NULL},
 };
 
 /*
@@ -742,29 +750,25 @@ void vmbus_onmessage(void *context)
         struct vmbus_channel_message_header *hdr;
         int size;
 
-        hdr = (struct vmbus_channel_message_header *)msg->u.Payload;
-        size = msg->Header.PayloadSize;
+        hdr = (struct vmbus_channel_message_header *)msg->u.payload;
+        size = msg->header.payload_size;
 
-        DPRINT_DBG(VMBUS, "message type %d size %d", hdr->MessageType, size);
+        DPRINT_DBG(VMBUS, "message type %d size %d", hdr->msgtype, size);
 
-        if (hdr->MessageType >= ChannelMessageCount) {
+        if (hdr->msgtype >= CHANNELMSG_COUNT) {
                 DPRINT_ERR(VMBUS,
                            "Received invalid channel message type %d size %d",
-                           hdr->MessageType, size);
+                           hdr->msgtype, size);
                 print_hex_dump_bytes("", DUMP_PREFIX_NONE,
-                                     (unsigned char *)msg->u.Payload, size);
-                kfree(msg);
+                                     (unsigned char *)msg->u.payload, size);
                 return;
         }
 
-        if (gChannelMessageTable[hdr->MessageType].messageHandler)
-                gChannelMessageTable[hdr->MessageType].messageHandler(hdr);
+        if (gChannelMessageTable[hdr->msgtype].messageHandler)
+                gChannelMessageTable[hdr->msgtype].messageHandler(hdr);
         else
                 DPRINT_ERR(VMBUS, "Unhandled channel message type %d",
-                           hdr->MessageType);
-
-        /* Free the msg that was allocated in VmbusOnMsgDPC() */
-        kfree(msg);
+                           hdr->msgtype);
 }
 
 /*
@@ -782,15 +786,15 @@ int vmbus_request_offers(void)
         if (!msginfo)
                 return -ENOMEM;
 
-        msginfo->WaitEvent = osd_WaitEventCreate();
-        if (!msginfo->WaitEvent) {
+        msginfo->waitevent = osd_waitevent_create();
+        if (!msginfo->waitevent) {
                 kfree(msginfo);
                 return -ENOMEM;
         }
 
-        msg = (struct vmbus_channel_message_header *)msginfo->Msg;
+        msg = (struct vmbus_channel_message_header *)msginfo->msg;
 
-        msg->MessageType = ChannelMessageRequestOffers;
+        msg->msgtype = CHANNELMSG_REQUESTOFFERS;
 
         /*SpinlockAcquire(gVmbusConnection.channelMsgLock);
         INSERT_TAIL_LIST(&gVmbusConnection.channelMsgList,
@@ -808,7 +812,7 @@ int vmbus_request_offers(void)
 
                 goto Cleanup;
         }
-        /* osd_WaitEventWait(msgInfo->waitEvent); */
+        /* osd_waitevent_wait(msgInfo->waitEvent); */
 
         /*SpinlockAcquire(gVmbusConnection.channelMsgLock);
         REMOVE_ENTRY_LIST(&msgInfo->msgListEntry);
@@ -817,7 +821,7 @@ int vmbus_request_offers(void)
 
 Cleanup:
         if (msginfo) {
-                kfree(msginfo->WaitEvent);
+                kfree(msginfo->waitevent);
                 kfree(msginfo);
         }
 
@@ -837,17 +841,17 @@ void vmbus_release_unattached_channels(void)
         spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
 
         list_for_each_entry_safe(channel, pos, &gVmbusConnection.ChannelList,
-                                 ListEntry) {
+                                 listentry) {
                 if (channel == start)
                         break;
 
-                if (!channel->DeviceObject->Driver) {
-                        list_del(&channel->ListEntry);
+                if (!channel->device_obj->Driver) {
+                        list_del(&channel->listentry);
                         DPRINT_INFO(VMBUS,
                                     "Releasing unattached device object %p",
-                                    channel->DeviceObject);
+                                    channel->device_obj);
 
-                        VmbusChildDeviceRemove(channel->DeviceObject);
+                        vmbus_child_device_unregister(channel->device_obj);
                         free_channel(channel);
                 } else {
                         if (!start)
diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h
index d16cc0811169..de6b2a0ebf70 100644
--- a/drivers/staging/hv/channel_mgmt.h
+++ b/drivers/staging/hv/channel_mgmt.h
@@ -33,60 +33,60 @@
 
 /* Version 1 messages */
 enum vmbus_channel_message_type {
-        ChannelMessageInvalid                   =  0,
-        ChannelMessageOfferChannel              =  1,
-        ChannelMessageRescindChannelOffer       =  2,
-        ChannelMessageRequestOffers             =  3,
-        ChannelMessageAllOffersDelivered        =  4,
-        ChannelMessageOpenChannel               =  5,
-        ChannelMessageOpenChannelResult         =  6,
-        ChannelMessageCloseChannel              =  7,
-        ChannelMessageGpadlHeader               =  8,
-        ChannelMessageGpadlBody                 =  9,
-        ChannelMessageGpadlCreated              = 10,
-        ChannelMessageGpadlTeardown             = 11,
-        ChannelMessageGpadlTorndown             = 12,
-        ChannelMessageRelIdReleased             = 13,
-        ChannelMessageInitiateContact           = 14,
-        ChannelMessageVersionResponse           = 15,
-        ChannelMessageUnload                    = 16,
+        CHANNELMSG_INVALID                      =  0,
+        CHANNELMSG_OFFERCHANNEL         =  1,
+        CHANNELMSG_RESCIND_CHANNELOFFER =  2,
+        CHANNELMSG_REQUESTOFFERS                =  3,
+        CHANNELMSG_ALLOFFERS_DELIVERED  =  4,
+        CHANNELMSG_OPENCHANNEL          =  5,
+        CHANNELMSG_OPENCHANNEL_RESULT           =  6,
+        CHANNELMSG_CLOSECHANNEL         =  7,
+        CHANNELMSG_GPADL_HEADER         =  8,
+        CHANNELMSG_GPADL_BODY                   =  9,
+        CHANNELMSG_GPADL_CREATED                = 10,
+        CHANNELMSG_GPADL_TEARDOWN               = 11,
+        CHANNELMSG_GPADL_TORNDOWN               = 12,
+        CHANNELMSG_RELID_RELEASED               = 13,
+        CHANNELMSG_INITIATE_CONTACT             = 14,
+        CHANNELMSG_VERSION_RESPONSE             = 15,
+        CHANNELMSG_UNLOAD                       = 16,
 #ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD
-        ChannelMessageViewRangeAdd              = 17,
-        ChannelMessageViewRangeRemove           = 18,
+        CHANNELMSG_VIEWRANGE_ADD                = 17,
+        CHANNELMSG_VIEWRANGE_REMOVE             = 18,
 #endif
-        ChannelMessageCount
+        CHANNELMSG_COUNT
 };
 
 struct vmbus_channel_message_header {
-        enum vmbus_channel_message_type MessageType;
-        u32 Padding;
+        enum vmbus_channel_message_type msgtype;
+        u32 padding;
 } __attribute__((packed));
 
 /* Query VMBus Version parameters */
 struct vmbus_channel_query_vmbus_version {
-        struct vmbus_channel_message_header Header;
-        u32 Version;
+        struct vmbus_channel_message_header header;
+        u32 version;
 } __attribute__((packed));
 
 /* VMBus Version Supported parameters */
 struct vmbus_channel_version_supported {
-        struct vmbus_channel_message_header Header;
-        bool VersionSupported;
+        struct vmbus_channel_message_header header;
+        bool version_supported;
 } __attribute__((packed));
 
 /* Offer Channel parameters */
 struct vmbus_channel_offer_channel {
-        struct vmbus_channel_message_header Header;
-        struct vmbus_channel_offer Offer;
-        u32 ChildRelId;
-        u8 MonitorId;
-        bool MonitorAllocated;
+        struct vmbus_channel_message_header header;
+        struct vmbus_channel_offer offer;
+        u32 child_relid;
+        u8 monitorid;
+        bool monitor_allocated;
 } __attribute__((packed));
 
 /* Rescind Offer parameters */
 struct vmbus_channel_rescind_offer {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
 } __attribute__((packed));
 
 /*
@@ -100,43 +100,43 @@ struct vmbus_channel_rescind_offer {
 
 /* Open Channel parameters */
 struct vmbus_channel_open_channel {
-        struct vmbus_channel_message_header Header;
+        struct vmbus_channel_message_header header;
 
         /* Identifies the specific VMBus channel that is being opened. */
-        u32 ChildRelId;
+        u32 child_relid;
 
         /* ID making a particular open request at a channel offer unique. */
-        u32 OpenId;
+        u32 openid;
 
         /* GPADL for the channel's ring buffer. */
-        u32 RingBufferGpadlHandle;
+        u32 ringbuffer_gpadlhandle;
 
         /* GPADL for the channel's server context save area. */
-        u32 ServerContextAreaGpadlHandle;
+        u32 server_contextarea_gpadlhandle;
 
         /*
         * The upstream ring buffer begins at offset zero in the memory
         * described by RingBufferGpadlHandle. The downstream ring buffer
         * follows it at this offset (in pages).
         */
-        u32 DownstreamRingBufferPageOffset;
+        u32 downstream_ringbuffer_pageoffset;
 
         /* User-specific data to be passed along to the server endpoint. */
-        unsigned char UserData[MAX_USER_DEFINED_BYTES];
+        unsigned char userdata[MAX_USER_DEFINED_BYTES];
 } __attribute__((packed));
 
 /* Open Channel Result parameters */
 struct vmbus_channel_open_result {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
-        u32 OpenId;
-        u32 Status;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
+        u32 openid;
+        u32 status;
 } __attribute__((packed));
 
 /* Close channel parameters; */
 struct vmbus_channel_close_channel {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
 } __attribute__((packed));
 
 /* Channel Message GPADL */
@@ -151,72 +151,72 @@ struct vmbus_channel_close_channel {
  * follow-up packet that contains more.
  */
 struct vmbus_channel_gpadl_header {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
-        u32 Gpadl;
-        u16 RangeBufLen;
-        u16 RangeCount;
-        struct gpa_range Range[0];
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
+        u32 gpadl;
+        u16 range_buflen;
+        u16 rangecount;
+        struct gpa_range range[0];
 } __attribute__((packed));
 
 /* This is the followup packet that contains more PFNs. */
 struct vmbus_channel_gpadl_body {
-        struct vmbus_channel_message_header Header;
-        u32 MessageNumber;
-        u32 Gpadl;
-        u64 Pfn[0];
+        struct vmbus_channel_message_header header;
+        u32 msgnumber;
+        u32 gpadl;
+        u64 pfn[0];
 } __attribute__((packed));
 
 struct vmbus_channel_gpadl_created {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
-        u32 Gpadl;
-        u32 CreationStatus;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
+        u32 gpadl;
+        u32 creation_status;
 } __attribute__((packed));
 
 struct vmbus_channel_gpadl_teardown {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
-        u32 Gpadl;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
+        u32 gpadl;
 } __attribute__((packed));
 
 struct vmbus_channel_gpadl_torndown {
-        struct vmbus_channel_message_header Header;
-        u32 Gpadl;
+        struct vmbus_channel_message_header header;
+        u32 gpadl;
 } __attribute__((packed));
 
 #ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD
 struct vmbus_channel_view_range_add {
-        struct vmbus_channel_message_header Header;
-        PHYSICAL_ADDRESS ViewRangeBase;
-        u64 ViewRangeLength;
-        u32 ChildRelId;
+        struct vmbus_channel_message_header header;
+        PHYSICAL_ADDRESS viewrange_base;
+        u64 viewrange_length;
+        u32 child_relid;
 } __attribute__((packed));
 
 struct vmbus_channel_view_range_remove {
-        struct vmbus_channel_message_header Header;
-        PHYSICAL_ADDRESS ViewRangeBase;
-        u32 ChildRelId;
+        struct vmbus_channel_message_header header;
+        PHYSICAL_ADDRESS viewrange_base;
+        u32 child_relid;
 } __attribute__((packed));
 #endif
 
 struct vmbus_channel_relid_released {
-        struct vmbus_channel_message_header Header;
-        u32 ChildRelId;
+        struct vmbus_channel_message_header header;
+        u32 child_relid;
 } __attribute__((packed));
 
 struct vmbus_channel_initiate_contact {
-        struct vmbus_channel_message_header Header;
-        u32 VMBusVersionRequested;
-        u32 Padding2;
-        u64 InterruptPage;
-        u64 MonitorPage1;
-        u64 MonitorPage2;
+        struct vmbus_channel_message_header header;
+        u32 vmbus_version_requested;
+        u32 padding2;
+        u64 interrupt_page;
+        u64 monitor_page1;
+        u64 monitor_page2;
 } __attribute__((packed));
 
 struct vmbus_channel_version_response {
-        struct vmbus_channel_message_header Header;
-        bool VersionSupported;
+        struct vmbus_channel_message_header header;
+        bool version_supported;
 } __attribute__((packed));
 
 enum vmbus_channel_state {
@@ -226,54 +226,55 @@ enum vmbus_channel_state {
 };
 
 struct vmbus_channel {
-        struct list_head ListEntry;
+        struct list_head listentry;
 
-        struct hv_device *DeviceObject;
+        struct hv_device *device_obj;
 
         struct timer_list poll_timer; /* SA-111 workaround */
+        struct work_struct work;
 
-        enum vmbus_channel_state State;
+        enum vmbus_channel_state state;
 
-        struct vmbus_channel_offer_channel OfferMsg;
+        struct vmbus_channel_offer_channel offermsg;
         /*
          * These are based on the OfferMsg.MonitorId.
          * Save it here for easy access.
          */
-        u8 MonitorGroup;
-        u8 MonitorBit;
+        u8 monitor_grp;
+        u8 monitor_bit;
 
-        u32 RingBufferGpadlHandle;
+        u32 ringbuffer_gpadlhandle;
 
         /* Allocated memory for ring buffer */
-        void *RingBufferPages;
-        u32 RingBufferPageCount;
-        struct hv_ring_buffer_info Outbound;    /* send to parent */
-        struct hv_ring_buffer_info Inbound;     /* receive from parent */
+        void *ringbuffer_pages;
+        u32 ringbuffer_pagecount;
+        struct hv_ring_buffer_info outbound;    /* send to parent */
+        struct hv_ring_buffer_info inbound;     /* receive from parent */
         spinlock_t inbound_lock;
-        struct workqueue_struct *ControlWQ;
+        struct workqueue_struct *controlwq;
 
         /* Channel callback are invoked in this workqueue context */
         /* HANDLE dataWorkQueue; */
 
-        void (*OnChannelCallback)(void *context);
-        void *ChannelCallbackContext;
+        void (*onchannel_callback)(void *context);
+        void *channel_callback_context;
 };
 
 struct vmbus_channel_debug_info {
-        u32 RelId;
-        enum vmbus_channel_state State;
-        struct hv_guid InterfaceType;
-        struct hv_guid InterfaceInstance;
-        u32 MonitorId;
-        u32 ServerMonitorPending;
-        u32 ServerMonitorLatency;
-        u32 ServerMonitorConnectionId;
-        u32 ClientMonitorPending;
-        u32 ClientMonitorLatency;
-        u32 ClientMonitorConnectionId;
-
-        struct hv_ring_buffer_debug_info Inbound;
-        struct hv_ring_buffer_debug_info Outbound;
+        u32 relid;
+        enum vmbus_channel_state state;
+        struct hv_guid interfacetype;
+        struct hv_guid interface_instance;
+        u32 monitorid;
+        u32 servermonitor_pending;
+        u32 servermonitor_latency;
+        u32 servermonitor_connectionid;
+        u32 clientmonitor_pending;
+        u32 clientmonitor_latency;
+        u32 clientmonitor_connectionid;
+
+        struct hv_ring_buffer_debug_info inbound;
+        struct hv_ring_buffer_debug_info outbound;
 };
 
 /*
@@ -282,28 +283,28 @@ struct vmbus_channel_debug_info {
  */
 struct vmbus_channel_msginfo {
         /* Bookkeeping stuff */
-        struct list_head MsgListEntry;
+        struct list_head msglistentry;
 
         /* So far, this is only used to handle gpadl body message */
-        struct list_head SubMsgList;
+        struct list_head submsglist;
 
         /* Synchronize the request/response if needed */
-        struct osd_waitevent *WaitEvent;
+        struct osd_waitevent *waitevent;
 
         union {
-                struct vmbus_channel_version_supported VersionSupported;
-                struct vmbus_channel_open_result OpenResult;
-                struct vmbus_channel_gpadl_torndown GpadlTorndown;
-                struct vmbus_channel_gpadl_created GpadlCreated;
-                struct vmbus_channel_version_response VersionResponse;
-        } Response;
-
-        u32 MessageSize;
+                struct vmbus_channel_version_supported version_supported;
+                struct vmbus_channel_open_result open_result;
+                struct vmbus_channel_gpadl_torndown gpadl_torndown;
+                struct vmbus_channel_gpadl_created gpadl_created;
+                struct vmbus_channel_version_response version_response;
+        } response;
+
+        u32 msgsize;
         /*
          * The channel message that goes out on the "wire".
          * It will contain at minimum the VMBUS_CHANNEL_MESSAGE_HEADER header
          */
-        unsigned char Msg[0];
+        unsigned char msg[0];
 };
 
 
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index f8477072ace4..c2e298ff4834 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -66,7 +66,7 @@ int VmbusConnect(void)
          * Setup the vmbus event connection for channel interrupt
          * abstraction stuff
          */
-        gVmbusConnection.InterruptPage = osd_PageAlloc(1);
+        gVmbusConnection.InterruptPage = osd_page_alloc(1);
         if (gVmbusConnection.InterruptPage == NULL) {
                 ret = -1;
                 goto Cleanup;
@@ -81,7 +81,7 @@ int VmbusConnect(void)
          * Setup the monitor notification facility. The 1st page for
          * parent->child and the 2nd page for child->parent
          */
-        gVmbusConnection.MonitorPages = osd_PageAlloc(2);
+        gVmbusConnection.MonitorPages = osd_page_alloc(2);
         if (gVmbusConnection.MonitorPages == NULL) {
                 ret = -1;
                 goto Cleanup;
@@ -95,19 +95,19 @@ int VmbusConnect(void)
                 goto Cleanup;
         }
 
-        msgInfo->WaitEvent = osd_WaitEventCreate();
-        if (!msgInfo->WaitEvent) {
+        msgInfo->waitevent = osd_waitevent_create();
+        if (!msgInfo->waitevent) {
                 ret = -ENOMEM;
                 goto Cleanup;
         }
 
-        msg = (struct vmbus_channel_initiate_contact *)msgInfo->Msg;
+        msg = (struct vmbus_channel_initiate_contact *)msgInfo->msg;
 
-        msg->Header.MessageType = ChannelMessageInitiateContact;
-        msg->VMBusVersionRequested = VMBUS_REVISION_NUMBER;
-        msg->InterruptPage = virt_to_phys(gVmbusConnection.InterruptPage);
-        msg->MonitorPage1 = virt_to_phys(gVmbusConnection.MonitorPages);
-        msg->MonitorPage2 = virt_to_phys(
+        msg->header.msgtype = CHANNELMSG_INITIATE_CONTACT;
+        msg->vmbus_version_requested = VMBUS_REVISION_NUMBER;
+        msg->interrupt_page = virt_to_phys(gVmbusConnection.InterruptPage);
+        msg->monitor_page1 = virt_to_phys(gVmbusConnection.MonitorPages);
+        msg->monitor_page2 = virt_to_phys(
                         (void *)((unsigned long)gVmbusConnection.MonitorPages +
                                  PAGE_SIZE));
 
@@ -116,30 +116,30 @@ int VmbusConnect(void)
          * receive the response before returning from this routine
          */
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
-        list_add_tail(&msgInfo->MsgListEntry,
+        list_add_tail(&msgInfo->msglistentry,
                       &gVmbusConnection.ChannelMsgList);
 
         spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
 
         DPRINT_DBG(VMBUS, "Vmbus connection - interrupt pfn %llx, "
                    "monitor1 pfn %llx,, monitor2 pfn %llx",
-                   msg->InterruptPage, msg->MonitorPage1, msg->MonitorPage2);
+                   msg->interrupt_page, msg->monitor_page1, msg->monitor_page2);
 
         DPRINT_DBG(VMBUS, "Sending channel initiate msg...");
         ret = VmbusPostMessage(msg,
                                sizeof(struct vmbus_channel_initiate_contact));
         if (ret != 0) {
-                list_del(&msgInfo->MsgListEntry);
+                list_del(&msgInfo->msglistentry);
                 goto Cleanup;
         }
 
         /* Wait for the connection response */
-        osd_WaitEventWait(msgInfo->WaitEvent);
+        osd_waitevent_wait(msgInfo->waitevent);
 
-        list_del(&msgInfo->MsgListEntry);
+        list_del(&msgInfo->msglistentry);
 
         /* Check if successful */
-        if (msgInfo->Response.VersionResponse.VersionSupported) {
+        if (msgInfo->response.version_response.version_supported) {
                 DPRINT_INFO(VMBUS, "Vmbus connected!!");
                 gVmbusConnection.ConnectState = Connected;
 
@@ -151,7 +151,7 @@ int VmbusConnect(void)
                 goto Cleanup;
         }
 
-        kfree(msgInfo->WaitEvent);
+        kfree(msgInfo->waitevent);
         kfree(msgInfo);
         return 0;
 
@@ -162,17 +162,17 @@ Cleanup:
                 destroy_workqueue(gVmbusConnection.WorkQueue);
 
         if (gVmbusConnection.InterruptPage) {
-                osd_PageFree(gVmbusConnection.InterruptPage, 1);
+                osd_page_free(gVmbusConnection.InterruptPage, 1);
                 gVmbusConnection.InterruptPage = NULL;
         }
 
         if (gVmbusConnection.MonitorPages) {
-                osd_PageFree(gVmbusConnection.MonitorPages, 2);
+                osd_page_free(gVmbusConnection.MonitorPages, 2);
                 gVmbusConnection.MonitorPages = NULL;
         }
 
         if (msgInfo) {
-                kfree(msgInfo->WaitEvent);
+                kfree(msgInfo->waitevent);
                 kfree(msgInfo);
         }
 
@@ -195,14 +195,14 @@ int VmbusDisconnect(void)
         if (!msg)
                 return -ENOMEM;
 
-        msg->MessageType = ChannelMessageUnload;
+        msg->msgtype = CHANNELMSG_UNLOAD;
 
         ret = VmbusPostMessage(msg,
                                sizeof(struct vmbus_channel_message_header));
         if (ret != 0)
                 goto Cleanup;
 
-        osd_PageFree(gVmbusConnection.InterruptPage, 1);
+        osd_page_free(gVmbusConnection.InterruptPage, 1);
 
         /* TODO: iterate thru the msg list and free up */
         destroy_workqueue(gVmbusConnection.WorkQueue);
@@ -226,8 +226,8 @@ struct vmbus_channel *GetChannelFromRelId(u32 relId)
         unsigned long flags;
 
         spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
-        list_for_each_entry(channel, &gVmbusConnection.ChannelList, ListEntry) {
-                if (channel->OfferMsg.ChildRelId == relId) {
+        list_for_each_entry(channel, &gVmbusConnection.ChannelList, listentry) {
+                if (channel->offermsg.child_relid == relId) {
                         foundChannel = channel;
                         break;
                 }
@@ -309,9 +309,9 @@ int VmbusPostMessage(void *buffer, size_t bufferLen)
 {
         union hv_connection_id connId;
 
-        connId.Asu32 = 0;
-        connId.u.Id = VMBUS_MESSAGE_CONNECTION_ID;
-        return HvPostMessage(connId, 1, buffer, bufferLen);
+        connId.asu32 = 0;
+        connId.u.id = VMBUS_MESSAGE_CONNECTION_ID;
+        return hv_post_message(connId, 1, buffer, bufferLen);
 }
 
 /*
@@ -324,5 +324,5 @@ int VmbusSetEvent(u32 childRelId)
                 (unsigned long *)gVmbusConnection.SendInterruptPage +
                 (childRelId >> 5));
 
-        return HvSignalEvent();
+        return hv_signal_event();
 }
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 86b1ddd90404..a34d713d9c57 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -28,17 +28,18 @@
 #include "vmbus_private.h"
 
 /* The one and only */
-struct hv_context gHvContext = {
-        .SynICInitialized       = false,
-        .HypercallPage          = NULL,
-        .SignalEventParam       = NULL,
-        .SignalEventBuffer      = NULL,
+struct hv_context hv_context = {
+        .synic_initialized      = false,
+        .hypercall_page         = NULL,
+        .signal_event_param     = NULL,
+        .signal_event_buffer    = NULL,
 };
 
 /*
- * HvQueryHypervisorPresence - Query the cpuid for presense of windows hypervisor
+ * query_hypervisor_presence
+ * - Query the cpuid for presense of windows hypervisor
  */
-static int HvQueryHypervisorPresence(void)
+static int query_hypervisor_presence(void)
 {
         unsigned int eax;
         unsigned int ebx;
@@ -50,22 +51,22 @@ static int HvQueryHypervisorPresence(void)
         ebx = 0;
         ecx = 0;
         edx = 0;
-        op = HvCpuIdFunctionVersionAndFeatures;
+        op = HVCPUID_VERSION_FEATURES;
         cpuid(op, &eax, &ebx, &ecx, &edx);
 
         return ecx & HV_PRESENT_BIT;
 }
 
 /*
- * HvQueryHypervisorInfo - Get version info of the windows hypervisor
+ * query_hypervisor_info - Get version info of the windows hypervisor
  */
-static int HvQueryHypervisorInfo(void)
+static int query_hypervisor_info(void)
 {
         unsigned int eax;
         unsigned int ebx;
         unsigned int ecx;
         unsigned int edx;
-        unsigned int maxLeaf;
+        unsigned int max_leaf;
         unsigned int op;
 
         /*
@@ -76,7 +77,7 @@ static int HvQueryHypervisorInfo(void)
         ebx = 0;
         ecx = 0;
         edx = 0;
-        op = HvCpuIdFunctionHvVendorAndMaxFunction;
+        op = HVCPUID_VENDOR_MAXFUNCTION;
         cpuid(op, &eax, &ebx, &ecx, &edx);
 
         DPRINT_INFO(VMBUS, "Vendor ID: %c%c%c%c%c%c%c%c%c%c%c%c",
@@ -93,12 +94,12 @@ static int HvQueryHypervisorInfo(void)
                     ((edx >> 16) & 0xFF),
                     ((edx >> 24) & 0xFF));
 
-        maxLeaf = eax;
+        max_leaf = eax;
         eax = 0;
         ebx = 0;
         ecx = 0;
         edx = 0;
-        op = HvCpuIdFunctionHvInterface;
+        op = HVCPUID_INTERFACE;
         cpuid(op, &eax, &ebx, &ecx, &edx);
 
         DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c",
@@ -107,12 +108,12 @@ static int HvQueryHypervisorInfo(void)
                     ((eax >> 16) & 0xFF),
                     ((eax >> 24) & 0xFF));
 
-        if (maxLeaf >= HvCpuIdFunctionMsHvVersion) {
+        if (max_leaf >= HVCPUID_VERSION) {
                 eax = 0;
                 ebx = 0;
                 ecx = 0;
                 edx = 0;
-                op = HvCpuIdFunctionMsHvVersion;
+                op = HVCPUID_VERSION;
                 cpuid(op, &eax, &ebx, &ecx, &edx);
                 DPRINT_INFO(VMBUS, "OS Build:%d-%d.%d-%d-%d.%d",\
                             eax,
@@ -122,80 +123,81 @@ static int HvQueryHypervisorInfo(void)
                             edx >> 24,
                             edx & 0xFFFFFF);
         }
-        return maxLeaf;
+        return max_leaf;
 }
 
 /*
- * HvDoHypercall - Invoke the specified hypercall
+ * do_hypercall- Invoke the specified hypercall
  */
-static u64 HvDoHypercall(u64 Control, void *Input, void *Output)
+static u64 do_hypercall(u64 control, void *input, void *output)
 {
 #ifdef CONFIG_X86_64
-        u64 hvStatus = 0;
-        u64 inputAddress = (Input) ? virt_to_phys(Input) : 0;
-        u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
-        volatile void *hypercallPage = gHvContext.HypercallPage;
+        u64 hv_status = 0;
+        u64 input_address = (input) ? virt_to_phys(input) : 0;
+        u64 output_address = (output) ? virt_to_phys(output) : 0;
+        volatile void *hypercall_page = hv_context.hypercall_page;
 
         DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p "
                    "output phys %llx virt %p hypercall %p>",
-                   Control, inputAddress, Input,
-                   outputAddress, Output, hypercallPage);
+                   control, input_address, input,
+                   output_address, output, hypercall_page);
 
-        __asm__ __volatile__("mov %0, %%r8" : : "r" (outputAddress) : "r8");
-        __asm__ __volatile__("call *%3" : "=a" (hvStatus) :
-                             "c" (Control), "d" (inputAddress),
-                             "m" (hypercallPage));
+        __asm__ __volatile__("mov %0, %%r8" : : "r" (output_address) : "r8");
+        __asm__ __volatile__("call *%3" : "=a" (hv_status) :
+                             "c" (control), "d" (input_address),
+                             "m" (hypercall_page));
 
-        DPRINT_DBG(VMBUS, "Hypercall <return %llx>",  hvStatus);
+        DPRINT_DBG(VMBUS, "Hypercall <return %llx>",  hv_status);
 
-        return hvStatus;
+        return hv_status;
 
 #else
 
-        u32 controlHi = Control >> 32;
-        u32 controlLo = Control & 0xFFFFFFFF;
-        u32 hvStatusHi = 1;
-        u32 hvStatusLo = 1;
-        u64 inputAddress = (Input) ? virt_to_phys(Input) : 0;
-        u32 inputAddressHi = inputAddress >> 32;
-        u32 inputAddressLo = inputAddress & 0xFFFFFFFF;
-        u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
-        u32 outputAddressHi = outputAddress >> 32;
-        u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
-        volatile void *hypercallPage = gHvContext.HypercallPage;
+        u32 control_hi = control >> 32;
+        u32 control_lo = control & 0xFFFFFFFF;
+        u32 hv_status_hi = 1;
+        u32 hv_status_lo = 1;
+        u64 input_address = (input) ? virt_to_phys(input) : 0;
+        u32 input_address_hi = input_address >> 32;
+        u32 input_address_lo = input_address & 0xFFFFFFFF;
+        u64 output_address = (output) ? virt_to_phys(output) : 0;
+        u32 output_address_hi = output_address >> 32;
+        u32 output_address_lo = output_address & 0xFFFFFFFF;
+        volatile void *hypercall_page = hv_context.hypercall_page;
 
         DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
-                   Control, Input, Output);
+                   control, input, output);
 
-        __asm__ __volatile__ ("call *%8" : "=d"(hvStatusHi),
-                              "=a"(hvStatusLo) : "d" (controlHi),
-                              "a" (controlLo), "b" (inputAddressHi),
-                              "c" (inputAddressLo), "D"(outputAddressHi),
-                              "S"(outputAddressLo), "m" (hypercallPage));
+        __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
+                              "=a"(hv_status_lo) : "d" (control_hi),
+                              "a" (control_lo), "b" (input_address_hi),
+                              "c" (input_address_lo), "D"(output_address_hi),
+                              "S"(output_address_lo), "m" (hypercall_page));
 
         DPRINT_DBG(VMBUS, "Hypercall <return %llx>",
-                   hvStatusLo | ((u64)hvStatusHi << 32));
+                   hv_status_lo | ((u64)hv_status_hi << 32));
 
-        return hvStatusLo | ((u64)hvStatusHi << 32);
+        return hv_status_lo | ((u64)hv_status_hi << 32);
 #endif /* !x86_64 */
 }
 
 /*
- * HvInit - Main initialization routine.
+ * hv_init - Main initialization routine.
  *
  * This routine must be called before any other routines in here are called
  */
-int HvInit(void)
+int hv_init(void)
 {
         int ret = 0;
-        int maxLeaf;
-        union hv_x64_msr_hypercall_contents hypercallMsr;
-        void *virtAddr = NULL;
+        int max_leaf;
+        union hv_x64_msr_hypercall_contents hypercall_msr;
+        void *virtaddr = NULL;
 
-        memset(gHvContext.synICEventPage, 0, sizeof(void *) * MAX_NUM_CPUS);
-        memset(gHvContext.synICMessagePage, 0, sizeof(void *) * MAX_NUM_CPUS);
+        memset(hv_context.synic_event_page, 0, sizeof(void *) * MAX_NUM_CPUS);
+        memset(hv_context.synic_message_page, 0,
+               sizeof(void *) * MAX_NUM_CPUS);
 
-        if (!HvQueryHypervisorPresence()) {
+        if (!query_hypervisor_presence()) {
                 DPRINT_ERR(VMBUS, "No Windows hypervisor detected!!");
                 goto Cleanup;
         }
@@ -203,146 +205,148 @@ int HvInit(void)
         DPRINT_INFO(VMBUS,
                     "Windows hypervisor detected! Retrieving more info...");
 
-        maxLeaf = HvQueryHypervisorInfo();
+        max_leaf = query_hypervisor_info();
         /* HvQueryHypervisorFeatures(maxLeaf); */
 
         /*
          * We only support running on top of Hyper-V
          */
-        rdmsrl(HV_X64_MSR_GUEST_OS_ID, gHvContext.GuestId);
+        rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
 
-        if (gHvContext.GuestId != 0) {
+        if (hv_context.guestid != 0) {
                 DPRINT_ERR(VMBUS, "Unknown guest id (0x%llx)!!",
-                                gHvContext.GuestId);
+                                hv_context.guestid);
                 goto Cleanup;
         }
 
         /* Write our OS info */
         wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
-        gHvContext.GuestId = HV_LINUX_GUEST_ID;
+        hv_context.guestid = HV_LINUX_GUEST_ID;
 
         /* See if the hypercall page is already set */
-        rdmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
+        rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
 
         /*
         * Allocate the hypercall page memory
-        * virtAddr = osd_PageAlloc(1);
+        * virtaddr = osd_page_alloc(1);
         */
-        virtAddr = osd_VirtualAllocExec(PAGE_SIZE);
+        virtaddr = osd_virtual_alloc_exec(PAGE_SIZE);
 
-        if (!virtAddr) {
+        if (!virtaddr) {
                 DPRINT_ERR(VMBUS,
                            "unable to allocate hypercall page!!");
                 goto Cleanup;
         }
 
-        hypercallMsr.Enable = 1;
+        hypercall_msr.enable = 1;
 
-        hypercallMsr.GuestPhysicalAddress = vmalloc_to_pfn(virtAddr);
-        wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
+        hypercall_msr.guest_physical_address = vmalloc_to_pfn(virtaddr);
+        wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
 
         /* Confirm that hypercall page did get setup. */
-        hypercallMsr.AsUINT64 = 0;
-        rdmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
+        hypercall_msr.as_uint64 = 0;
+        rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
 
-        if (!hypercallMsr.Enable) {
+        if (!hypercall_msr.enable) {
                 DPRINT_ERR(VMBUS, "unable to set hypercall page!!");
                 goto Cleanup;
         }
 
-        gHvContext.HypercallPage = virtAddr;
+        hv_context.hypercall_page = virtaddr;
 
         DPRINT_INFO(VMBUS, "Hypercall page VA=%p, PA=0x%0llx",
-                    gHvContext.HypercallPage,
-                    (u64)hypercallMsr.GuestPhysicalAddress << PAGE_SHIFT);
+                    hv_context.hypercall_page,
+                    (u64)hypercall_msr.guest_physical_address << PAGE_SHIFT);
 
         /* Setup the global signal event param for the signal event hypercall */
-        gHvContext.SignalEventBuffer =
+        hv_context.signal_event_buffer =
                         kmalloc(sizeof(struct hv_input_signal_event_buffer),
                                 GFP_KERNEL);
-        if (!gHvContext.SignalEventBuffer)
+        if (!hv_context.signal_event_buffer)
                 goto Cleanup;
 
-        gHvContext.SignalEventParam =
+        hv_context.signal_event_param =
                 (struct hv_input_signal_event *)
-                        (ALIGN_UP((unsigned long)gHvContext.SignalEventBuffer,
+                        (ALIGN_UP((unsigned long)
+                                  hv_context.signal_event_buffer,
                                   HV_HYPERCALL_PARAM_ALIGN));
-        gHvContext.SignalEventParam->ConnectionId.Asu32 = 0;
-        gHvContext.SignalEventParam->ConnectionId.u.Id =
+        hv_context.signal_event_param->connectionid.asu32 = 0;
+        hv_context.signal_event_param->connectionid.u.id =
                                                 VMBUS_EVENT_CONNECTION_ID;
-        gHvContext.SignalEventParam->FlagNumber = 0;
-        gHvContext.SignalEventParam->RsvdZ = 0;
+        hv_context.signal_event_param->flag_number = 0;
+        hv_context.signal_event_param->rsvdz = 0;
 
         return ret;
 
 Cleanup:
-        if (virtAddr) {
-                if (hypercallMsr.Enable) {
-                        hypercallMsr.AsUINT64 = 0;
-                        wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
+        if (virtaddr) {
+                if (hypercall_msr.enable) {
+                        hypercall_msr.as_uint64 = 0;
+                        wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
                 }
 
-                vfree(virtAddr);
+                vfree(virtaddr);
         }
         ret = -1;
         return ret;
 }
 
 /*
- * HvCleanup - Cleanup routine.
+ * hv_cleanup - Cleanup routine.
  *
  * This routine is called normally during driver unloading or exiting.
  */
-void HvCleanup(void)
+void hv_cleanup(void)
 {
-        union hv_x64_msr_hypercall_contents hypercallMsr;
+        union hv_x64_msr_hypercall_contents hypercall_msr;
 
-        kfree(gHvContext.SignalEventBuffer);
-        gHvContext.SignalEventBuffer = NULL;
-        gHvContext.SignalEventParam = NULL;
+        kfree(hv_context.signal_event_buffer);
+        hv_context.signal_event_buffer = NULL;
+        hv_context.signal_event_param = NULL;
 
-        if (gHvContext.HypercallPage) {
-                hypercallMsr.AsUINT64 = 0;
-                wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
-                vfree(gHvContext.HypercallPage);
-                gHvContext.HypercallPage = NULL;
+        if (hv_context.hypercall_page) {
+                hypercall_msr.as_uint64 = 0;
+                wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
+                vfree(hv_context.hypercall_page);
+                hv_context.hypercall_page = NULL;
         }
 }
 
 /*
- * HvPostMessage - Post a message using the hypervisor message IPC.
+ * hv_post_message - Post a message using the hypervisor message IPC.
  *
  * This involves a hypercall.
  */
-u16 HvPostMessage(union hv_connection_id connectionId,
-                  enum hv_message_type messageType,
-                  void *payload, size_t payloadSize)
+u16 hv_post_message(union hv_connection_id connection_id,
+                  enum hv_message_type message_type,
+                  void *payload, size_t payload_size)
 {
-        struct alignedInput {
+        struct aligned_input {
                 u64 alignment8;
                 struct hv_input_post_message msg;
         };
 
-        struct hv_input_post_message *alignedMsg;
+        struct hv_input_post_message *aligned_msg;
         u16 status;
         unsigned long addr;
 
-        if (payloadSize > HV_MESSAGE_PAYLOAD_BYTE_COUNT)
+        if (payload_size > HV_MESSAGE_PAYLOAD_BYTE_COUNT)
                 return -1;
 
-        addr = (unsigned long)kmalloc(sizeof(struct alignedInput), GFP_ATOMIC);
+        addr = (unsigned long)kmalloc(sizeof(struct aligned_input), GFP_ATOMIC);
         if (!addr)
                 return -1;
 
-        alignedMsg = (struct hv_input_post_message *)
+        aligned_msg = (struct hv_input_post_message *)
                         (ALIGN_UP(addr, HV_HYPERCALL_PARAM_ALIGN));
 
-        alignedMsg->ConnectionId = connectionId;
-        alignedMsg->MessageType = messageType;
-        alignedMsg->PayloadSize = payloadSize;
-        memcpy((void *)alignedMsg->Payload, payload, payloadSize);
+        aligned_msg->connectionid = connection_id;
+        aligned_msg->message_type = message_type;
+        aligned_msg->payload_size = payload_size;
+        memcpy((void *)aligned_msg->payload, payload, payload_size);
 
-        status = HvDoHypercall(HvCallPostMessage, alignedMsg, NULL) & 0xFFFF;
+        status = do_hypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL)
+                & 0xFFFF;
 
         kfree((void *)addr);
 
@@ -351,38 +355,40 @@ u16 HvPostMessage(union hv_connection_id connectionId,
 
 
 /*
- * HvSignalEvent - Signal an event on the specified connection using the hypervisor event IPC.
+ * hv_signal_event -
+ * Signal an event on the specified connection using the hypervisor event IPC.
  *
  * This involves a hypercall.
  */
-u16 HvSignalEvent(void)
+u16 hv_signal_event(void)
 {
         u16 status;
 
-        status = HvDoHypercall(HvCallSignalEvent, gHvContext.SignalEventParam,
+        status = do_hypercall(HVCALL_SIGNAL_EVENT,
+                               hv_context.signal_event_param,
                                NULL) & 0xFFFF;
         return status;
 }
 
 /*
- * HvSynicInit - Initialize the Synthethic Interrupt Controller.
+ * hv_synic_init - Initialize the Synthethic Interrupt Controller.
  *
  * If it is already initialized by another entity (ie x2v shim), we need to
  * retrieve the initialized message and event pages.  Otherwise, we create and
  * initialize the message and event pages.
  */
-void HvSynicInit(void *irqarg)
+void hv_synic_init(void *irqarg)
 {
         u64 version;
         union hv_synic_simp simp;
         union hv_synic_siefp siefp;
-        union hv_synic_sint sharedSint;
+        union hv_synic_sint shared_sint;
         union hv_synic_scontrol sctrl;
 
-        u32 irqVector = *((u32 *)(irqarg));
+        u32 irq_vector = *((u32 *)(irqarg));
         int cpu = smp_processor_id();
 
-        if (!gHvContext.HypercallPage)
+        if (!hv_context.hypercall_page)
                 return;
 
         /* Check the version */
@@ -390,110 +396,112 @@ void HvSynicInit(void *irqarg)
 
         DPRINT_INFO(VMBUS, "SynIC version: %llx", version);
 
-        gHvContext.synICMessagePage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
+        hv_context.synic_message_page[cpu] =
+                (void *)get_zeroed_page(GFP_ATOMIC);
 
-        if (gHvContext.synICMessagePage[cpu] == NULL) {
+        if (hv_context.synic_message_page[cpu] == NULL) {
                 DPRINT_ERR(VMBUS,
                            "unable to allocate SYNIC message page!!");
                 goto Cleanup;
         }
 
-        gHvContext.synICEventPage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
+        hv_context.synic_event_page[cpu] =
+                (void *)get_zeroed_page(GFP_ATOMIC);
 
-        if (gHvContext.synICEventPage[cpu] == NULL) {
+        if (hv_context.synic_event_page[cpu] == NULL) {
                 DPRINT_ERR(VMBUS,
                            "unable to allocate SYNIC event page!!");
                 goto Cleanup;
         }
 
         /* Setup the Synic's message page */
-        rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
-        simp.SimpEnabled = 1;
-        simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[cpu])
+        rdmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+        simp.simp_enabled = 1;
+        simp.base_simp_gpa = virt_to_phys(hv_context.synic_message_page[cpu])
                 >> PAGE_SHIFT;
 
-        DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx", simp.AsUINT64);
+        DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx", simp.as_uint64);
 
-        wrmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
+        wrmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
 
         /* Setup the Synic's event page */
-        rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
-        siefp.SiefpEnabled = 1;
-        siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[cpu])
+        rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+        siefp.siefp_enabled = 1;
+        siefp.base_siefp_gpa = virt_to_phys(hv_context.synic_event_page[cpu])
                 >> PAGE_SHIFT;
 
-        DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx", siefp.AsUINT64);
+        DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx", siefp.as_uint64);
 
-        wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
+        wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
 
         /* Setup the interception SINT. */
         /* wrmsrl((HV_X64_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX), */
-        /*        interceptionSint.AsUINT64); */
+        /*        interceptionSint.as_uint64); */
 
         /* Setup the shared SINT. */
-        rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
+        rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
-        sharedSint.AsUINT64 = 0;
-        sharedSint.Vector = irqVector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */
-        sharedSint.Masked = false;
-        sharedSint.AutoEoi = true;
+        shared_sint.as_uint64 = 0;
+        shared_sint.vector = irq_vector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */
+        shared_sint.masked = false;
+        shared_sint.auto_eoi = true;
 
         DPRINT_DBG(VMBUS, "HV_X64_MSR_SINT1 msr set to: %llx",
-                   sharedSint.AsUINT64);
+                   shared_sint.as_uint64);
 
-        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
+        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
         /* Enable the global synic bit */
-        rdmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64);
-        sctrl.Enable = 1;
+        rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
+        sctrl.enable = 1;
 
-        wrmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64);
+        wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
 
-        gHvContext.SynICInitialized = true;
+        hv_context.synic_initialized = true;
         return;
 
 Cleanup:
-        if (gHvContext.synICEventPage[cpu])
-                osd_PageFree(gHvContext.synICEventPage[cpu], 1);
+        if (hv_context.synic_event_page[cpu])
+                osd_page_free(hv_context.synic_event_page[cpu], 1);
 
-        if (gHvContext.synICMessagePage[cpu])
-                osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
+        if (hv_context.synic_message_page[cpu])
+                osd_page_free(hv_context.synic_message_page[cpu], 1);
         return;
 }
 
 /*
- * HvSynicCleanup - Cleanup routine for HvSynicInit().
+ * hv_synic_cleanup - Cleanup routine for hv_synic_init().
  */
-void HvSynicCleanup(void *arg)
+void hv_synic_cleanup(void *arg)
 {
-        union hv_synic_sint sharedSint;
+        union hv_synic_sint shared_sint;
         union hv_synic_simp simp;
         union hv_synic_siefp siefp;
         int cpu = smp_processor_id();
 
-        if (!gHvContext.SynICInitialized)
+        if (!hv_context.synic_initialized)
                 return;
 
-        rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
+        rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
-        sharedSint.Masked = 1;
+        shared_sint.masked = 1;
 
         /* Need to correctly cleanup in the case of SMP!!! */
         /* Disable the interrupt */
-        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
+        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
-        rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
-        simp.SimpEnabled = 0;
-        simp.BaseSimpGpa = 0;
+        rdmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+        simp.simp_enabled = 0;
+        simp.base_simp_gpa = 0;
 
-        wrmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
+        wrmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
 
-        rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
-        siefp.SiefpEnabled = 0;
-        siefp.BaseSiefpGpa = 0;
+        rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+        siefp.siefp_enabled = 0;
+        siefp.base_siefp_gpa = 0;
 
-        wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
+        wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
 
-        osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
-        osd_PageFree(gHvContext.synICEventPage[cpu], 1);
+        osd_page_free(hv_context.synic_message_page[cpu], 1);
+        osd_page_free(hv_context.synic_event_page[cpu], 1);
 }
diff --git a/drivers/staging/hv/hv.h b/drivers/staging/hv/hv.h
index 41f5ebb86e17..829aff81bb30 100644
--- a/drivers/staging/hv/hv.h
+++ b/drivers/staging/hv/hv.h
@@ -92,49 +92,49 @@ static const struct hv_guid VMBUS_SERVICE_ID = {
 
 
 struct hv_input_signal_event_buffer {
-        u64 Align8;
-        struct hv_input_signal_event Event;
+        u64 align8;
+        struct hv_input_signal_event event;
 };
 
 struct hv_context {
         /* We only support running on top of Hyper-V
         * So at this point this really can only contain the Hyper-V ID
         */
-        u64 GuestId;
+        u64 guestid;
 
-        void *HypercallPage;
+        void *hypercall_page;
 
-        bool SynICInitialized;
+        bool synic_initialized;
 
         /*
          * This is used as an input param to HvCallSignalEvent hypercall. The
          * input param is immutable in our usage and must be dynamic mem (vs
          * stack or global). */
-        struct hv_input_signal_event_buffer *SignalEventBuffer;
+        struct hv_input_signal_event_buffer *signal_event_buffer;
         /* 8-bytes aligned of the buffer above */
-        struct hv_input_signal_event *SignalEventParam;
+        struct hv_input_signal_event *signal_event_param;
 
-        void *synICMessagePage[MAX_NUM_CPUS];
-        void *synICEventPage[MAX_NUM_CPUS];
+        void *synic_message_page[MAX_NUM_CPUS];
+        void *synic_event_page[MAX_NUM_CPUS];
 };
 
-extern struct hv_context gHvContext;
+extern struct hv_context hv_context;
 
 
 /* Hv Interface */
 
-extern int HvInit(void);
+extern int hv_init(void);
 
-extern void HvCleanup(void);
+extern void hv_cleanup(void);
 
-extern u16 HvPostMessage(union hv_connection_id connectionId,
-                         enum hv_message_type messageType,
-                         void *payload, size_t payloadSize);
+extern u16 hv_post_message(union hv_connection_id connection_id,
+                         enum hv_message_type message_type,
+                         void *payload, size_t payload_size);
 
-extern u16 HvSignalEvent(void);
+extern u16 hv_signal_event(void);
 
-extern void HvSynicInit(void *irqarg);
+extern void hv_synic_init(void *irqarg);
 
-extern void HvSynicCleanup(void *arg);
+extern void hv_synic_cleanup(void *arg);
 
 #endif /* __HV_H__ */
diff --git a/drivers/staging/hv/hv_api.h b/drivers/staging/hv/hv_api.h
index 9eb818ee07ba..70e863ad0464 100644
--- a/drivers/staging/hv/hv_api.h
+++ b/drivers/staging/hv/hv_api.h
@@ -510,21 +510,21 @@
 
 /*
  * The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent
- * is set by CPUID(HvCpuIdFunctionVersionAndFeatures).
+ * is set by CPUID(HVCPUID_VERSION_FEATURES).
  */
 enum hv_cpuid_function {
-        HvCpuIdFunctionVersionAndFeatures               = 0x00000001,
-        HvCpuIdFunctionHvVendorAndMaxFunction           = 0x40000000,
-        HvCpuIdFunctionHvInterface                      = 0x40000001,
+        HVCPUID_VERSION_FEATURES                = 0x00000001,
+        HVCPUID_VENDOR_MAXFUNCTION              = 0x40000000,
+        HVCPUID_INTERFACE                       = 0x40000001,
 
         /*
          * The remaining functions depend on the value of
-         * HvCpuIdFunctionInterface
+         * HVCPUID_INTERFACE
          */
-        HvCpuIdFunctionMsHvVersion                      = 0x40000002,
-        HvCpuIdFunctionMsHvFeatures                     = 0x40000003,
-        HvCpuIdFunctionMsHvEnlightenmentInformation     = 0x40000004,
-        HvCpuIdFunctionMsHvImplementationLimits         = 0x40000005,
+        HVCPUID_VERSION                 = 0x40000002,
+        HVCPUID_FEATURES                        = 0x40000003,
+        HVCPUID_ENLIGHTENMENT_INFO      = 0x40000004,
+        HVCPUID_IMPLEMENTATION_LIMITS           = 0x40000005,
 };
 
 /* Define the virtual APIC registers */
@@ -575,30 +575,30 @@ enum hv_cpuid_function {
 
 /* Define hypervisor message types. */
 enum hv_message_type {
-        HvMessageTypeNone                       = 0x00000000,
+        HVMSG_NONE                      = 0x00000000,
 
         /* Memory access messages. */
-        HvMessageTypeUnmappedGpa                = 0x80000000,
-        HvMessageTypeGpaIntercept               = 0x80000001,
+        HVMSG_UNMAPPED_GPA              = 0x80000000,
+        HVMSG_GPA_INTERCEPT             = 0x80000001,
 
         /* Timer notification messages. */
-        HvMessageTimerExpired                   = 0x80000010,
+        HVMSG_TIMER_EXPIRED                     = 0x80000010,
 
         /* Error messages. */
-        HvMessageTypeInvalidVpRegisterValue     = 0x80000020,
-        HvMessageTypeUnrecoverableException     = 0x80000021,
-        HvMessageTypeUnsupportedFeature         = 0x80000022,
+        HVMSG_INVALID_VP_REGISTER_VALUE = 0x80000020,
+        HVMSG_UNRECOVERABLE_EXCEPTION   = 0x80000021,
+        HVMSG_UNSUPPORTED_FEATURE               = 0x80000022,
 
         /* Trace buffer complete messages. */
-        HvMessageTypeEventLogBufferComplete     = 0x80000040,
+        HVMSG_EVENTLOG_BUFFERCOMPLETE   = 0x80000040,
 
         /* Platform-specific processor intercept messages. */
-        HvMessageTypeX64IoPortIntercept         = 0x80010000,
-        HvMessageTypeX64MsrIntercept            = 0x80010001,
-        HvMessageTypeX64CpuidIntercept          = 0x80010002,
-        HvMessageTypeX64ExceptionIntercept      = 0x80010003,
-        HvMessageTypeX64ApicEoi                 = 0x80010004,
-        HvMessageTypeX64LegacyFpError           = 0x80010005
+        HVMSG_X64_IOPORT_INTERCEPT              = 0x80010000,
+        HVMSG_X64_MSR_INTERCEPT         = 0x80010001,
+        HVMSG_X64_CPUID_INTERCEPT               = 0x80010002,
+        HVMSG_X64_EXCEPTION_INTERCEPT   = 0x80010003,
+        HVMSG_X64_APIC_EOI                      = 0x80010004,
+        HVMSG_X64_LEGACY_FP_ERROR               = 0x80010005
 };
 
 /* Define the number of synthetic interrupt sources. */
@@ -610,103 +610,103 @@ enum hv_message_type {
 
 /* Define connection identifier type. */
 union hv_connection_id {
-        u32 Asu32;
+        u32 asu32;
         struct {
-                u32 Id:24;
-                u32 Reserved:8;
+                u32 id:24;
+                u32 reserved:8;
         } u;
 };
 
 /* Define port identifier type. */
 union hv_port_id {
-        u32 Asu32;
+        u32 asu32;
         struct {
-                u32 Id:24;
-                u32 Reserved:8;
+                u32 id:24;
+                u32 reserved:8;
         } u ;
 };
 
 /* Define port type. */
 enum hv_port_type {
-        HvPortTypeMessage       = 1,
-        HvPortTypeEvent         = 2,
-        HvPortTypeMonitor       = 3
+        HVPORT_MSG      = 1,
+        HVPORT_EVENT            = 2,
+        HVPORT_MONITOR  = 3
 };
 
 /* Define port information structure. */
 struct hv_port_info {
-        enum hv_port_type PortType;
-        u32 Padding;
+        enum hv_port_type port_type;
+        u32 padding;
         union {
                 struct {
-                        u32 TargetSint;
-                        u32 TargetVp;
-                        u64 RsvdZ;
-                } MessagePortInfo;
+                        u32 target_sint;
+                        u32 target_vp;
+                        u64 rsvdz;
+                } message_port_info;
                 struct {
-                        u32 TargetSint;
-                        u32 TargetVp;
-                        u16 BaseFlagNumber;
-                        u16 FlagCount;
-                        u32 RsvdZ;
-                } EventPortInfo;
+                        u32 target_sint;
+                        u32 target_vp;
+                        u16 base_flag_bumber;
+                        u16 flag_count;
+                        u32 rsvdz;
+                } event_port_info;
                 struct {
-                        u64 MonitorAddress;
-                        u64 RsvdZ;
-                } MonitorPortInfo;
+                        u64 monitor_address;
+                        u64 rsvdz;
+                } monitor_port_info;
         };
 };
 
 struct hv_connection_info {
-        enum hv_port_type PortType;
-        u32 Padding;
+        enum hv_port_type port_type;
+        u32 padding;
         union {
                 struct {
-                        u64 RsvdZ;
-                } MessageConnectionInfo;
+                        u64 rsvdz;
+                } message_connection_info;
                 struct {
-                        u64 RsvdZ;
-                } EventConnectionInfo;
+                        u64 rsvdz;
+                } event_connection_info;
                 struct {
-                        u64 MonitorAddress;
-                } MonitorConnectionInfo;
+                        u64 monitor_address;
+                } monitor_connection_info;
         };
 };
 
 /* Define synthetic interrupt controller message flags. */
 union hv_message_flags {
-        u8 Asu8;
+        u8 asu8;
         struct {
-                u8 MessagePending:1;
-                u8 Reserved:7;
+                u8 msg_pending:1;
+                u8 reserved:7;
         };
 };
 
 /* Define synthetic interrupt controller message header. */
 struct hv_message_header {
-        enum hv_message_type MessageType;
-        u8 PayloadSize;
-        union hv_message_flags MessageFlags;
-        u8 Reserved[2];
+        enum hv_message_type message_type;
+        u8 payload_size;
+        union hv_message_flags message_flags;
+        u8 reserved[2];
         union {
-                u64 Sender;
-                union hv_port_id Port;
+                u64 sender;
+                union hv_port_id port;
         };
 };
 
 /* Define timer message payload structure. */
 struct hv_timer_message_payload {
-        u32 TimerIndex;
-        u32 Reserved;
-        u64 ExpirationTime;     /* When the timer expired */
-        u64 DeliveryTime;       /* When the message was delivered */
+        u32 timer_index;
+        u32 reserved;
+        u64 expiration_time;    /* When the timer expired */
+        u64 delivery_time;      /* When the message was delivered */
 };
 
 /* Define synthetic interrupt controller message format. */
 struct hv_message {
-        struct hv_message_header Header;
+        struct hv_message_header header;
         union {
-                u64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
+                u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
         } u ;
 };
 
@@ -715,82 +715,82 @@ struct hv_message {
 
 /* Define the synthetic interrupt message page layout. */
 struct hv_message_page {
-        struct hv_message SintMessage[HV_SYNIC_SINT_COUNT];
+        struct hv_message sint_message[HV_SYNIC_SINT_COUNT];
 };
 
 /* Define the synthetic interrupt controller event flags format. */
 union hv_synic_event_flags {
-        u8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT];
-        u32 Flags32[HV_EVENT_FLAGS_DWORD_COUNT];
+        u8 flags8[HV_EVENT_FLAGS_BYTE_COUNT];
+        u32 flags32[HV_EVENT_FLAGS_DWORD_COUNT];
 };
 
 /* Define the synthetic interrupt flags page layout. */
 struct hv_synic_event_flags_page {
-        union hv_synic_event_flags SintEventFlags[HV_SYNIC_SINT_COUNT];
+        union hv_synic_event_flags sintevent_flags[HV_SYNIC_SINT_COUNT];
 };
 
 /* Define SynIC control register. */
 union hv_synic_scontrol {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 Enable:1;
-                u64 Reserved:63;
+                u64 enable:1;
+                u64 reserved:63;
         };
 };
 
 /* Define synthetic interrupt source. */
 union hv_synic_sint {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 Vector:8;
-                u64 Reserved1:8;
-                u64 Masked:1;
-                u64 AutoEoi:1;
-                u64 Reserved2:46;
+                u64 vector:8;
+                u64 reserved1:8;
+                u64 masked:1;
+                u64 auto_eoi:1;
+                u64 reserved2:46;
         };
 };
 
 /* Define the format of the SIMP register */
 union hv_synic_simp {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 SimpEnabled:1;
-                u64 Preserved:11;
-                u64 BaseSimpGpa:52;
+                u64 simp_enabled:1;
+                u64 preserved:11;
+                u64 base_simp_gpa:52;
         };
 };
 
 /* Define the format of the SIEFP register */
 union hv_synic_siefp {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 SiefpEnabled:1;
-                u64 Preserved:11;
-                u64 BaseSiefpGpa:52;
+                u64 siefp_enabled:1;
+                u64 preserved:11;
+                u64 base_siefp_gpa:52;
         };
 };
 
 /* Definitions for the monitored notification facility */
 union hv_monitor_trigger_group {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u32 Pending;
-                u32 Armed;
+                u32 pending;
+                u32 armed;
         };
 };
 
 struct hv_monitor_parameter {
-        union hv_connection_id ConnectionId;
-        u16 FlagNumber;
-        u16 RsvdZ;
+        union hv_connection_id connectionid;
+        u16 flagnumber;
+        u16 rsvdz;
 };
 
 union hv_monitor_trigger_state {
-        u32 Asu32;
+        u32 asu32;
 
         struct {
-                u32 GroupEnable:4;
-                u32 RsvdZ:28;
+                u32 group_enable:4;
+                u32 rsvdz:28;
         };
 };
 
@@ -814,42 +814,42 @@ union hv_monitor_trigger_state {
 /* | 840 | Rsvd4[0]                                     | */
 /* ------------------------------------------------------ */
 struct hv_monitor_page {
-        union hv_monitor_trigger_state TriggerState;
-        u32 RsvdZ1;
+        union hv_monitor_trigger_state trigger_state;
+        u32 rsvdz1;
 
-        union hv_monitor_trigger_group TriggerGroup[4];
-        u64 RsvdZ2[3];
+        union hv_monitor_trigger_group trigger_group[4];
+        u64 rsvdz2[3];
 
-        s32 NextCheckTime[4][32];
+        s32 next_checktime[4][32];
 
-        u16 Latency[4][32];
-        u64 RsvdZ3[32];
+        u16 latency[4][32];
+        u64 rsvdz3[32];
 
-        struct hv_monitor_parameter Parameter[4][32];
+        struct hv_monitor_parameter parameter[4][32];
 
-        u8 RsvdZ4[1984];
+        u8 rsvdz4[1984];
 };
 
 /* Declare the various hypercall operations. */
 enum hv_call_code {
-        HvCallPostMessage       = 0x005c,
-        HvCallSignalEvent       = 0x005d,
+        HVCALL_POST_MESSAGE     = 0x005c,
+        HVCALL_SIGNAL_EVENT     = 0x005d,
 };
 
-/* Definition of the HvPostMessage hypercall input structure. */
+/* Definition of the hv_post_message hypercall input structure. */
 struct hv_input_post_message {
-        union hv_connection_id ConnectionId;
-        u32 Reserved;
-        enum hv_message_type MessageType;
-        u32 PayloadSize;
-        u64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
+        union hv_connection_id connectionid;
+        u32 reserved;
+        enum hv_message_type message_type;
+        u32 payload_size;
+        u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
 };
 
-/* Definition of the HvSignalEvent hypercall input structure. */
+/* Definition of the hv_signal_event hypercall input structure. */
 struct hv_input_signal_event {
-        union hv_connection_id ConnectionId;
-        u16 FlagNumber;
-        u16 RsvdZ;
+        union hv_connection_id connectionid;
+        u16 flag_number;
+        u16 rsvdz;
 };
 
 /*
@@ -859,16 +859,16 @@ struct hv_input_signal_event {
 
 /* Version info reported by guest OS's */
 enum hv_guest_os_vendor {
-        HvGuestOsVendorMicrosoft        = 0x0001
+        HVGUESTOS_VENDOR_MICROSOFT      = 0x0001
 };
 
 enum hv_guest_os_microsoft_ids {
-        HvGuestOsMicrosoftUndefined     = 0x00,
-        HvGuestOsMicrosoftMSDOS         = 0x01,
-        HvGuestOsMicrosoftWindows3x     = 0x02,
-        HvGuestOsMicrosoftWindows9x     = 0x03,
-        HvGuestOsMicrosoftWindowsNT     = 0x04,
-        HvGuestOsMicrosoftWindowsCE     = 0x05
+        HVGUESTOS_MICROSOFT_UNDEFINED   = 0x00,
+        HVGUESTOS_MICROSOFT_MSDOS               = 0x01,
+        HVGUESTOS_MICROSOFT_WINDOWS3X   = 0x02,
+        HVGUESTOS_MICROSOFT_WINDOWS9X   = 0x03,
+        HVGUESTOS_MICROSOFT_WINDOWSNT   = 0x04,
+        HVGUESTOS_MICROSOFT_WINDOWSCE   = 0x05
 };
 
 /*
@@ -877,14 +877,14 @@ enum hv_guest_os_microsoft_ids {
 #define HV_X64_MSR_GUEST_OS_ID  0x40000000
 
 union hv_x64_msr_guest_os_id_contents {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 BuildNumber:16;
-                u64 ServiceVersion:8; /* Service Pack, etc. */
-                u64 MinorVersion:8;
-                u64 MajorVersion:8;
-                u64 OsId:8; /* enum hv_guest_os_microsoft_ids (if Vendor=MS) */
-                u64 VendorId:16; /* enum hv_guest_os_vendor */
+                u64 build_number:16;
+                u64 service_version:8; /* Service Pack, etc. */
+                u64 minor_version:8;
+                u64 major_version:8;
+                u64 os_id:8; /* enum hv_guest_os_microsoft_ids (if Vendor=MS) */
+                u64 vendor_id:16; /* enum hv_guest_os_vendor */
         };
 };
 
@@ -894,11 +894,11 @@ union hv_x64_msr_guest_os_id_contents {
 #define HV_X64_MSR_HYPERCALL    0x40000001
 
 union hv_x64_msr_hypercall_contents {
-        u64 AsUINT64;
+        u64 as_uint64;
         struct {
-                u64 Enable:1;
-                u64 Reserved:11;
-                u64 GuestPhysicalAddress:52;
+                u64 enable:1;
+                u64 reserved:11;
+                u64 guest_physical_address:52;
         };
 };
 
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c
index a99e900ec4c9..0074581f20e8 100644
--- a/drivers/staging/hv/hv_utils.c
+++ b/drivers/staging/hv/hv_utils.c
@@ -38,12 +38,14 @@
 #include "vmbus_api.h"
 #include "utils.h"
 
+static u8 *shut_txf_buf;
+static u8 *time_txf_buf;
+static u8 *hbeat_txf_buf;
 
 static void shutdown_onchannelcallback(void *context)
 {
         struct vmbus_channel *channel = context;
-        u8 *buf;
-        u32 buflen, recvlen;
+        u32 recvlen;
         u64 requestid;
         u8  execute_shutdown = false;
 
@@ -52,24 +54,23 @@ static void shutdown_onchannelcallback(void *context)
         struct icmsg_hdr *icmsghdrp;
         struct icmsg_negotiate *negop = NULL;
 
-        buflen = PAGE_SIZE;
-        buf = kmalloc(buflen, GFP_ATOMIC);
-
-        vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
+        vmbus_recvpacket(channel, shut_txf_buf,
+                         PAGE_SIZE, &recvlen, &requestid);
 
         if (recvlen > 0) {
                 DPRINT_DBG(VMBUS, "shutdown packet: len=%d, requestid=%lld",
                            recvlen, requestid);
 
-                icmsghdrp = (struct icmsg_hdr *)&buf[
+                icmsghdrp = (struct icmsg_hdr *)&shut_txf_buf[
                         sizeof(struct vmbuspipe_hdr)];
 
                 if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-                        prep_negotiate_resp(icmsghdrp, negop, buf);
+                        prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf);
                 } else {
-                        shutdown_msg = (struct shutdown_msg_data *)&buf[
-                                sizeof(struct vmbuspipe_hdr) +
-                                sizeof(struct icmsg_hdr)];
+                        shutdown_msg =
+                                (struct shutdown_msg_data *)&shut_txf_buf[
+                                        sizeof(struct vmbuspipe_hdr) +
+                                        sizeof(struct icmsg_hdr)];
 
                         switch (shutdown_msg->flags) {
                         case 0:
@@ -93,13 +94,11 @@ static void shutdown_onchannelcallback(void *context)
                 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                         | ICMSGHDRFLAG_RESPONSE;
 
-                vmbus_sendpacket(channel, buf,
+                vmbus_sendpacket(channel, shut_txf_buf,
                                        recvlen, requestid,
                                        VmbusPacketTypeDataInBand, 0);
         }
 
-        kfree(buf);
-
         if (execute_shutdown == true)
                 orderly_poweroff(false);
 }
@@ -150,28 +149,25 @@ static inline void adj_guesttime(u64 hosttime, u8 flags)
 static void timesync_onchannelcallback(void *context)
 {
         struct vmbus_channel *channel = context;
-        u8 *buf;
-        u32 buflen, recvlen;
+        u32 recvlen;
         u64 requestid;
         struct icmsg_hdr *icmsghdrp;
         struct ictimesync_data *timedatap;
 
-        buflen = PAGE_SIZE;
-        buf = kmalloc(buflen, GFP_ATOMIC);
-
-        vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
+        vmbus_recvpacket(channel, time_txf_buf,
+                         PAGE_SIZE, &recvlen, &requestid);
 
         if (recvlen > 0) {
                 DPRINT_DBG(VMBUS, "timesync packet: recvlen=%d, requestid=%lld",
                         recvlen, requestid);
 
-                icmsghdrp = (struct icmsg_hdr *)&buf[
+                icmsghdrp = (struct icmsg_hdr *)&time_txf_buf[
                                 sizeof(struct vmbuspipe_hdr)];
 
                 if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-                        prep_negotiate_resp(icmsghdrp, NULL, buf);
+                        prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf);
                 } else {
-                        timedatap = (struct ictimesync_data *)&buf[
+                        timedatap = (struct ictimesync_data *)&time_txf_buf[
                                 sizeof(struct vmbuspipe_hdr) +
                                 sizeof(struct icmsg_hdr)];
                         adj_guesttime(timedatap->parenttime, timedatap->flags);
@@ -180,12 +176,10 @@ static void timesync_onchannelcallback(void *context)
                 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                         | ICMSGHDRFLAG_RESPONSE;
 
-                vmbus_sendpacket(channel, buf,
+                vmbus_sendpacket(channel, time_txf_buf,
                                 recvlen, requestid,
                                 VmbusPacketTypeDataInBand, 0);
         }
-
-        kfree(buf);
 }
 
 /*
@@ -196,30 +190,28 @@ static void timesync_onchannelcallback(void *context)
 static void heartbeat_onchannelcallback(void *context)
 {
         struct vmbus_channel *channel = context;
-        u8 *buf;
-        u32 buflen, recvlen;
+        u32 recvlen;
         u64 requestid;
         struct icmsg_hdr *icmsghdrp;
         struct heartbeat_msg_data *heartbeat_msg;
 
-        buflen = PAGE_SIZE;
-        buf = kmalloc(buflen, GFP_ATOMIC);
-
-        vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
+        vmbus_recvpacket(channel, hbeat_txf_buf,
+                         PAGE_SIZE, &recvlen, &requestid);
 
         if (recvlen > 0) {
                 DPRINT_DBG(VMBUS, "heartbeat packet: len=%d, requestid=%lld",
                            recvlen, requestid);
 
-                icmsghdrp = (struct icmsg_hdr *)&buf[
+                icmsghdrp = (struct icmsg_hdr *)&hbeat_txf_buf[
                                 sizeof(struct vmbuspipe_hdr)];
 
                 if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-                        prep_negotiate_resp(icmsghdrp, NULL, buf);
+                        prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf);
                 } else {
-                        heartbeat_msg = (struct heartbeat_msg_data *)&buf[
-                                sizeof(struct vmbuspipe_hdr) +
-                                sizeof(struct icmsg_hdr)];
+                        heartbeat_msg =
+                                (struct heartbeat_msg_data *)&hbeat_txf_buf[
+                                        sizeof(struct vmbuspipe_hdr) +
+                                        sizeof(struct icmsg_hdr)];
 
                         DPRINT_DBG(VMBUS, "heartbeat seq = %lld",
                                    heartbeat_msg->seq_num);
@@ -230,12 +222,10 @@ static void heartbeat_onchannelcallback(void *context)
                 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                         | ICMSGHDRFLAG_RESPONSE;
 
-                vmbus_sendpacket(channel, buf,
+                vmbus_sendpacket(channel, hbeat_txf_buf,
                                        recvlen, requestid,
                                        VmbusPacketTypeDataInBand, 0);
         }
-
-        kfree(buf);
 }
 
 static const struct pci_device_id __initconst
@@ -268,15 +258,28 @@ static int __init init_hyperv_utils(void)
         if (!dmi_check_system(hv_utils_dmi_table))
                 return -ENODEV;
 
-        hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
+        shut_txf_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        time_txf_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        hbeat_txf_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+
+        if (!shut_txf_buf || !time_txf_buf || !hbeat_txf_buf) {
+                printk(KERN_INFO
+                       "Unable to allocate memory for receive buffer\n");
+                kfree(shut_txf_buf);
+                kfree(time_txf_buf);
+                kfree(hbeat_txf_buf);
+                return -ENOMEM;
+        }
+
+        hv_cb_utils[HV_SHUTDOWN_MSG].channel->onchannel_callback =
                 &shutdown_onchannelcallback;
         hv_cb_utils[HV_SHUTDOWN_MSG].callback = &shutdown_onchannelcallback;
 
-        hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
+        hv_cb_utils[HV_TIMESYNC_MSG].channel->onchannel_callback =
                 &timesync_onchannelcallback;
         hv_cb_utils[HV_TIMESYNC_MSG].callback = &timesync_onchannelcallback;
 
-        hv_cb_utils[HV_HEARTBEAT_MSG].channel->OnChannelCallback =
+        hv_cb_utils[HV_HEARTBEAT_MSG].channel->onchannel_callback =
                 &heartbeat_onchannelcallback;
         hv_cb_utils[HV_HEARTBEAT_MSG].callback = &heartbeat_onchannelcallback;
 
@@ -287,17 +290,21 @@ static void exit_hyperv_utils(void)
 {
         printk(KERN_INFO "De-Registered HyperV Utility Driver\n");
 
-        hv_cb_utils[HV_SHUTDOWN_MSG].channel->OnChannelCallback =
+        hv_cb_utils[HV_SHUTDOWN_MSG].channel->onchannel_callback =
                 &chn_cb_negotiate;
         hv_cb_utils[HV_SHUTDOWN_MSG].callback = &chn_cb_negotiate;
 
-        hv_cb_utils[HV_TIMESYNC_MSG].channel->OnChannelCallback =
+        hv_cb_utils[HV_TIMESYNC_MSG].channel->onchannel_callback =
                 &chn_cb_negotiate;
         hv_cb_utils[HV_TIMESYNC_MSG].callback = &chn_cb_negotiate;
 
-        hv_cb_utils[HV_HEARTBEAT_MSG].channel->OnChannelCallback =
+        hv_cb_utils[HV_HEARTBEAT_MSG].channel->onchannel_callback =
                 &chn_cb_negotiate;
         hv_cb_utils[HV_HEARTBEAT_MSG].callback = &chn_cb_negotiate;
+
+        kfree(shut_txf_buf);
+        kfree(time_txf_buf);
+        kfree(hbeat_txf_buf);
 }
 
 module_init(init_hyperv_utils);
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 4c2632cb19e9..df9cd131e953 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -31,147 +31,149 @@
 
 
 /* Globals */
-static const char *gDriverName = "netvsc";
+static const char *driver_name = "netvsc";
 
 /* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
-static const struct hv_guid gNetVscDeviceType = {
+static const struct hv_guid netvsc_device_type = {
         .data = {
                 0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
                 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
         }
 };
 
-static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
+static int netvsc_device_add(struct hv_device *device, void *additional_info);
 
-static int NetVscOnDeviceRemove(struct hv_device *Device);
+static int netvsc_device_remove(struct hv_device *device);
 
-static void NetVscOnCleanup(struct hv_driver *Driver);
+static void netvsc_cleanup(struct hv_driver *driver);
 
-static void NetVscOnChannelCallback(void *context);
+static void netvsc_channel_cb(void *context);
 
-static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device);
+static int netvsc_init_send_buf(struct hv_device *device);
 
-static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device);
+static int netvsc_init_recv_buf(struct hv_device *device);
 
-static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice);
+static int netvsc_destroy_send_buf(struct netvsc_device *net_device);
 
-static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice);
+static int netvsc_destroy_recv_buf(struct netvsc_device *net_device);
 
-static int NetVscConnectToVsp(struct hv_device *Device);
+static int netvsc_connect_vsp(struct hv_device *device);
 
-static void NetVscOnSendCompletion(struct hv_device *Device,
-                                   struct vmpacket_descriptor *Packet);
+static void netvsc_send_completion(struct hv_device *device,
+                                   struct vmpacket_descriptor *packet);
 
-static int NetVscOnSend(struct hv_device *Device,
-                        struct hv_netvsc_packet *Packet);
+static int netvsc_send(struct hv_device *device,
+                        struct hv_netvsc_packet *packet);
 
-static void NetVscOnReceive(struct hv_device *Device,
-                            struct vmpacket_descriptor *Packet);
+static void netvsc_receive(struct hv_device *device,
+                            struct vmpacket_descriptor *packet);
 
-static void NetVscOnReceiveCompletion(void *Context);
+static void netvsc_receive_completion(void *context);
 
-static void NetVscSendReceiveCompletion(struct hv_device *Device,
-                                        u64 TransactionId);
+static void netvsc_send_recv_completion(struct hv_device *device,
+                                        u64 transaction_id);
 
 
-static struct netvsc_device *AllocNetDevice(struct hv_device *Device)
+static struct netvsc_device *alloc_net_device(struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL);
-        if (!netDevice)
+        net_device = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL);
+        if (!net_device)
                 return NULL;
 
         /* Set to 2 to allow both inbound and outbound traffic */
-        atomic_cmpxchg(&netDevice->RefCount, 0, 2);
+        atomic_cmpxchg(&net_device->refcnt, 0, 2);
 
-        netDevice->Device = Device;
-        Device->Extension = netDevice;
+        net_device->dev = device;
+        device->Extension = net_device;
 
-        return netDevice;
+        return net_device;
 }
 
-static void FreeNetDevice(struct netvsc_device *Device)
+static void free_net_device(struct netvsc_device *device)
 {
-        WARN_ON(atomic_read(&Device->RefCount) == 0);
-        Device->Device->Extension = NULL;
-        kfree(Device);
+        WARN_ON(atomic_read(&device->refcnt) == 0);
+        device->dev->Extension = NULL;
+        kfree(device);
 }
 
 
 /* Get the net device object iff exists and its refcount > 1 */
-static struct netvsc_device *GetOutboundNetDevice(struct hv_device *Device)
+static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = Device->Extension;
-        if (netDevice && atomic_read(&netDevice->RefCount) > 1)
-                atomic_inc(&netDevice->RefCount);
+        net_device = device->Extension;
+        if (net_device && atomic_read(&net_device->refcnt) > 1)
+                atomic_inc(&net_device->refcnt);
         else
-                netDevice = NULL;
+                net_device = NULL;
 
-        return netDevice;
+        return net_device;
 }
 
 /* Get the net device object iff exists and its refcount > 0 */
-static struct netvsc_device *GetInboundNetDevice(struct hv_device *Device)
+static struct netvsc_device *get_inbound_net_device(struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = Device->Extension;
-        if (netDevice && atomic_read(&netDevice->RefCount))
-                atomic_inc(&netDevice->RefCount);
+        net_device = device->Extension;
+        if (net_device && atomic_read(&net_device->refcnt))
+                atomic_inc(&net_device->refcnt);
         else
-                netDevice = NULL;
+                net_device = NULL;
 
-        return netDevice;
+        return net_device;
 }
 
-static void PutNetDevice(struct hv_device *Device)
+static void put_net_device(struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = Device->Extension;
+        net_device = device->Extension;
         /* ASSERT(netDevice); */
 
-        atomic_dec(&netDevice->RefCount);
+        atomic_dec(&net_device->refcnt);
 }
 
-static struct netvsc_device *ReleaseOutboundNetDevice(struct hv_device *Device)
+static struct netvsc_device *release_outbound_net_device(
+                struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = Device->Extension;
-        if (netDevice == NULL)
+        net_device = device->Extension;
+        if (net_device == NULL)
                 return NULL;
 
         /* Busy wait until the ref drop to 2, then set it to 1 */
-        while (atomic_cmpxchg(&netDevice->RefCount, 2, 1) != 2)
+        while (atomic_cmpxchg(&net_device->refcnt, 2, 1) != 2)
                 udelay(100);
 
-        return netDevice;
+        return net_device;
 }
 
-static struct netvsc_device *ReleaseInboundNetDevice(struct hv_device *Device)
+static struct netvsc_device *release_inbound_net_device(
+                struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
 
-        netDevice = Device->Extension;
-        if (netDevice == NULL)
+        net_device = device->Extension;
+        if (net_device == NULL)
                 return NULL;
 
         /* Busy wait until the ref drop to 1, then set it to 0 */
-        while (atomic_cmpxchg(&netDevice->RefCount, 1, 0) != 1)
+        while (atomic_cmpxchg(&net_device->refcnt, 1, 0) != 1)
                 udelay(100);
 
-        Device->Extension = NULL;
-        return netDevice;
+        device->Extension = NULL;
+        return net_device;
 }
 
 /*
- * NetVscInitialize - Main entry point
+ * netvsc_initialize - Main entry point
  */
-int NetVscInitialize(struct hv_driver *drv)
+int netvsc_initialize(struct hv_driver *drv)
 {
         struct netvsc_driver *driver = (struct netvsc_driver *)drv;
 
@@ -185,8 +187,8 @@ int NetVscInitialize(struct hv_driver *drv)
         /* Make sure we are at least 2 pages since 1 page is used for control */
         /* ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); */
 
-        drv->name = gDriverName;
-        memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(struct hv_guid));
+        drv->name = driver_name;
+        memcpy(&drv->deviceType, &netvsc_device_type, sizeof(struct hv_guid));
 
         /* Make sure it is set by the caller */
         /* FIXME: These probably should still be tested in some way */
@@ -194,24 +196,24 @@ int NetVscInitialize(struct hv_driver *drv)
         /* ASSERT(driver->OnLinkStatusChanged); */
 
         /* Setup the dispatch table */
-        driver->Base.OnDeviceAdd        = NetVscOnDeviceAdd;
-        driver->Base.OnDeviceRemove     = NetVscOnDeviceRemove;
-        driver->Base.OnCleanup          = NetVscOnCleanup;
+        driver->base.OnDeviceAdd        = netvsc_device_add;
+        driver->base.OnDeviceRemove     = netvsc_device_remove;
+        driver->base.OnCleanup          = netvsc_cleanup;
 
-        driver->OnSend                  = NetVscOnSend;
+        driver->send                    = netvsc_send;
 
-        RndisFilterInit(driver);
+        rndis_filter_init(driver);
         return 0;
 }
 
-static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
+static int netvsc_init_recv_buf(struct hv_device *device)
 {
         int ret = 0;
-        struct netvsc_device *netDevice;
-        struct nvsp_message *initPacket;
+        struct netvsc_device *net_device;
+        struct nvsp_message *init_packet;
 
-        netDevice = GetOutboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_outbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return -1;
@@ -220,12 +222,12 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
         /* page-size grandularity */
         /* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */
 
-        netDevice->ReceiveBuffer =
-                osd_PageAlloc(netDevice->ReceiveBufferSize >> PAGE_SHIFT);
-        if (!netDevice->ReceiveBuffer) {
+        net_device->recv_buf =
+                osd_page_alloc(net_device->recv_buf_size >> PAGE_SHIFT);
+        if (!net_device->recv_buf) {
                 DPRINT_ERR(NETVSC,
                            "unable to allocate receive buffer of size %d",
-                           netDevice->ReceiveBufferSize);
+                           net_device->recv_buf_size);
                 ret = -1;
                 goto Cleanup;
         }
@@ -240,32 +242,34 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
          * channel.  Note: This call uses the vmbus connection rather
          * than the channel to establish the gpadl handle.
          */
-        ret = vmbus_establish_gpadl(Device->channel, netDevice->ReceiveBuffer,
-                                    netDevice->ReceiveBufferSize,
-                                    &netDevice->ReceiveBufferGpadlHandle);
+        ret = vmbus_establish_gpadl(device->channel, net_device->recv_buf,
+                                    net_device->recv_buf_size,
+                                    &net_device->recv_buf_gpadl_handle);
         if (ret != 0) {
                 DPRINT_ERR(NETVSC,
                            "unable to establish receive buffer's gpadl");
                 goto Cleanup;
         }
 
-        /* osd_WaitEventWait(ext->ChannelInitEvent); */
+        /* osd_waitevent_wait(ext->ChannelInitEvent); */
 
         /* Notify the NetVsp of the gpadl handle */
         DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendReceiveBuffer...");
 
-        initPacket = &netDevice->ChannelInitPacket;
+        init_packet = &net_device->channel_init_pkt;
 
-        memset(initPacket, 0, sizeof(struct nvsp_message));
+        memset(init_packet, 0, sizeof(struct nvsp_message));
 
-        initPacket->Header.MessageType = NvspMessage1TypeSendReceiveBuffer;
-        initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->ReceiveBufferGpadlHandle;
-        initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;
+        init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_RECV_BUF;
+        init_packet->msg.v1_msg.send_recv_buf.
+                gpadl_handle = net_device->recv_buf_gpadl_handle;
+        init_packet->msg.v1_msg.
+                send_recv_buf.id = NETVSC_RECEIVE_BUFFER_ID;
 
         /* Send the gpadl notification request */
-        ret = vmbus_sendpacket(Device->channel, initPacket,
+        ret = vmbus_sendpacket(device->channel, init_packet,
                                sizeof(struct nvsp_message),
-                               (unsigned long)initPacket,
+                               (unsigned long)init_packet,
                                VmbusPacketTypeDataInBand,
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret != 0) {
@@ -274,13 +278,15 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(netDevice->ChannelInitEvent);
+        osd_waitevent_wait(net_device->channel_init_event);
 
         /* Check the response */
-        if (initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status != NvspStatusSuccess) {
+        if (init_packet->msg.v1_msg.
+            send_recv_buf_complete.status != NVSP_STAT_SUCCESS) {
                 DPRINT_ERR(NETVSC, "Unable to complete receive buffer "
                            "initialzation with NetVsp - status %d",
-                           initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status);
+                           init_packet->msg.v1_msg.
+                           send_recv_buf_complete.status);
                 ret = -1;
                 goto Cleanup;
         }
@@ -289,32 +295,36 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
         /* ASSERT(netDevice->ReceiveSectionCount == 0); */
         /* ASSERT(netDevice->ReceiveSections == NULL); */
 
-        netDevice->ReceiveSectionCount = initPacket->Messages.Version1Messages.SendReceiveBufferComplete.NumSections;
+        net_device->recv_section_cnt = init_packet->msg.
+                v1_msg.send_recv_buf_complete.num_sections;
 
-        netDevice->ReceiveSections = kmalloc(netDevice->ReceiveSectionCount * sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL);
-        if (netDevice->ReceiveSections == NULL) {
+        net_device->recv_section = kmalloc(net_device->recv_section_cnt
+                * sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL);
+        if (net_device->recv_section == NULL) {
                 ret = -1;
                 goto Cleanup;
         }
 
-        memcpy(netDevice->ReceiveSections,
-                initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Sections,
-                netDevice->ReceiveSectionCount * sizeof(struct nvsp_1_receive_buffer_section));
+        memcpy(net_device->recv_section,
+                init_packet->msg.v1_msg.
+               send_recv_buf_complete.sections,
+                net_device->recv_section_cnt *
+               sizeof(struct nvsp_1_receive_buffer_section));
 
         DPRINT_INFO(NETVSC, "Receive sections info (count %d, offset %d, "
                     "endoffset %d, suballoc size %d, num suballocs %d)",
-                    netDevice->ReceiveSectionCount,
-                    netDevice->ReceiveSections[0].Offset,
-                    netDevice->ReceiveSections[0].EndOffset,
-                    netDevice->ReceiveSections[0].SubAllocationSize,
-                    netDevice->ReceiveSections[0].NumSubAllocations);
+                    net_device->recv_section_cnt,
+                    net_device->recv_section[0].offset,
+                    net_device->recv_section[0].end_offset,
+                    net_device->recv_section[0].sub_alloc_size,
+                    net_device->recv_section[0].num_sub_allocs);
 
         /*
          * For 1st release, there should only be 1 section that represents the
          * entire receive buffer
          */
-        if (netDevice->ReceiveSectionCount != 1 ||
-            netDevice->ReceiveSections->Offset != 0) {
+        if (net_device->recv_section_cnt != 1 ||
+            net_device->recv_section->offset != 0) {
                 ret = -1;
                 goto Cleanup;
         }
@@ -322,26 +332,26 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
         goto Exit;
 
 Cleanup:
-        NetVscDestroyReceiveBuffer(netDevice);
+        netvsc_destroy_recv_buf(net_device);
 
 Exit:
-        PutNetDevice(Device);
+        put_net_device(device);
         return ret;
 }
 
-static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
+static int netvsc_init_send_buf(struct hv_device *device)
 {
         int ret = 0;
-        struct netvsc_device *netDevice;
-        struct nvsp_message *initPacket;
+        struct netvsc_device *net_device;
+        struct nvsp_message *init_packet;
 
-        netDevice = GetOutboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_outbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return -1;
         }
-        if (netDevice->SendBufferSize <= 0) {
+        if (net_device->send_buf_size <= 0) {
                 ret = -EINVAL;
                 goto Cleanup;
         }
@@ -349,11 +359,11 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
         /* page-size grandularity */
         /* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */
 
-        netDevice->SendBuffer =
-                osd_PageAlloc(netDevice->SendBufferSize >> PAGE_SHIFT);
-        if (!netDevice->SendBuffer) {
+        net_device->send_buf =
+                osd_page_alloc(net_device->send_buf_size >> PAGE_SHIFT);
+        if (!net_device->send_buf) {
                 DPRINT_ERR(NETVSC, "unable to allocate send buffer of size %d",
-                           netDevice->SendBufferSize);
+                           net_device->send_buf_size);
                 ret = -1;
                 goto Cleanup;
         }
@@ -367,31 +377,33 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
          * channel.  Note: This call uses the vmbus connection rather
          * than the channel to establish the gpadl handle.
          */
-        ret = vmbus_establish_gpadl(Device->channel, netDevice->SendBuffer,
-                                    netDevice->SendBufferSize,
-                                    &netDevice->SendBufferGpadlHandle);
+        ret = vmbus_establish_gpadl(device->channel, net_device->send_buf,
+                                    net_device->send_buf_size,
+                                    &net_device->send_buf_gpadl_handle);
         if (ret != 0) {
                 DPRINT_ERR(NETVSC, "unable to establish send buffer's gpadl");
                 goto Cleanup;
         }
 
-        /* osd_WaitEventWait(ext->ChannelInitEvent); */
+        /* osd_waitevent_wait(ext->ChannelInitEvent); */
 
         /* Notify the NetVsp of the gpadl handle */
         DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendSendBuffer...");
 
-        initPacket = &netDevice->ChannelInitPacket;
+        init_packet = &net_device->channel_init_pkt;
 
-        memset(initPacket, 0, sizeof(struct nvsp_message));
+        memset(init_packet, 0, sizeof(struct nvsp_message));
 
-        initPacket->Header.MessageType = NvspMessage1TypeSendSendBuffer;
-        initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->SendBufferGpadlHandle;
-        initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_SEND_BUFFER_ID;
+        init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_SEND_BUF;
+        init_packet->msg.v1_msg.send_recv_buf.
+                gpadl_handle = net_device->send_buf_gpadl_handle;
+        init_packet->msg.v1_msg.send_recv_buf.id =
+                NETVSC_SEND_BUFFER_ID;
 
         /* Send the gpadl notification request */
-        ret = vmbus_sendpacket(Device->channel, initPacket,
+        ret = vmbus_sendpacket(device->channel, init_packet,
                                sizeof(struct nvsp_message),
-                               (unsigned long)initPacket,
+                               (unsigned long)init_packet,
                                VmbusPacketTypeDataInBand,
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret != 0) {
@@ -400,32 +412,35 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(netDevice->ChannelInitEvent);
+        osd_waitevent_wait(net_device->channel_init_event);
 
         /* Check the response */
-        if (initPacket->Messages.Version1Messages.SendSendBufferComplete.Status != NvspStatusSuccess) {
+        if (init_packet->msg.v1_msg.
+            send_send_buf_complete.status != NVSP_STAT_SUCCESS) {
                 DPRINT_ERR(NETVSC, "Unable to complete send buffer "
                            "initialzation with NetVsp - status %d",
-                           initPacket->Messages.Version1Messages.SendSendBufferComplete.Status);
+                           init_packet->msg.v1_msg.
+                           send_send_buf_complete.status);
                 ret = -1;
                 goto Cleanup;
         }
 
-        netDevice->SendSectionSize = initPacket->Messages.Version1Messages.SendSendBufferComplete.SectionSize;
+        net_device->send_section_size = init_packet->
+        msg.v1_msg.send_send_buf_complete.section_size;
 
         goto Exit;
 
 Cleanup:
-        NetVscDestroySendBuffer(netDevice);
+        netvsc_destroy_send_buf(net_device);
 
 Exit:
-        PutNetDevice(Device);
+        put_net_device(device);
         return ret;
 }
 
-static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
+static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
 {
-        struct nvsp_message *revokePacket;
+        struct nvsp_message *revoke_packet;
         int ret = 0;
 
         /*
@@ -434,20 +449,23 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
          * NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
          * to send a revoke msg here
          */
-        if (NetDevice->ReceiveSectionCount) {
+        if (net_device->recv_section_cnt) {
                 DPRINT_INFO(NETVSC,
                             "Sending NvspMessage1TypeRevokeReceiveBuffer...");
 
                 /* Send the revoke receive buffer */
-                revokePacket = &NetDevice->RevokePacket;
-                memset(revokePacket, 0, sizeof(struct nvsp_message));
+                revoke_packet = &net_device->revoke_packet;
+                memset(revoke_packet, 0, sizeof(struct nvsp_message));
 
-                revokePacket->Header.MessageType = NvspMessage1TypeRevokeReceiveBuffer;
-                revokePacket->Messages.Version1Messages.RevokeReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;
+                revoke_packet->hdr.msg_type =
+                        NVSP_MSG1_TYPE_REVOKE_RECV_BUF;
+                revoke_packet->msg.v1_msg.
+                revoke_recv_buf.id = NETVSC_RECEIVE_BUFFER_ID;
 
-                ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket,
+                ret = vmbus_sendpacket(net_device->dev->channel,
+                                       revoke_packet,
                                        sizeof(struct nvsp_message),
-                                       (unsigned long)revokePacket,
+                                       (unsigned long)revoke_packet,
                                        VmbusPacketTypeDataInBand, 0);
                 /*
                  * If we failed here, we might as well return and
@@ -461,11 +479,11 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
         }
 
         /* Teardown the gpadl on the vsp end */
-        if (NetDevice->ReceiveBufferGpadlHandle) {
+        if (net_device->recv_buf_gpadl_handle) {
                 DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL...");
 
-                ret = vmbus_teardown_gpadl(NetDevice->Device->channel,
-                                           NetDevice->ReceiveBufferGpadlHandle);
+                ret = vmbus_teardown_gpadl(net_device->dev->channel,
+                           net_device->recv_buf_gpadl_handle);
 
                 /* If we failed here, we might as well return and have a leak rather than continue and a bugchk */
                 if (ret != 0) {
@@ -473,30 +491,30 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
                                    "unable to teardown receive buffer's gpadl");
                         return -1;
                 }
-                NetDevice->ReceiveBufferGpadlHandle = 0;
+                net_device->recv_buf_gpadl_handle = 0;
         }
 
-        if (NetDevice->ReceiveBuffer) {
+        if (net_device->recv_buf) {
                 DPRINT_INFO(NETVSC, "Freeing up receive buffer...");
 
                 /* Free up the receive buffer */
-                osd_PageFree(NetDevice->ReceiveBuffer,
-                             NetDevice->ReceiveBufferSize >> PAGE_SHIFT);
-                NetDevice->ReceiveBuffer = NULL;
+                osd_page_free(net_device->recv_buf,
+                             net_device->recv_buf_size >> PAGE_SHIFT);
+                net_device->recv_buf = NULL;
         }
 
-        if (NetDevice->ReceiveSections) {
-                NetDevice->ReceiveSectionCount = 0;
-                kfree(NetDevice->ReceiveSections);
-                NetDevice->ReceiveSections = NULL;
+        if (net_device->recv_section) {
+                net_device->recv_section_cnt = 0;
+                kfree(net_device->recv_section);
+                net_device->recv_section = NULL;
         }
 
         return ret;
 }
 
-static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
+static int netvsc_destroy_send_buf(struct netvsc_device *net_device)
 {
-        struct nvsp_message *revokePacket;
+        struct nvsp_message *revoke_packet;
         int ret = 0;
 
         /*
@@ -505,20 +523,23 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
          *  NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
          *  to send a revoke msg here
          */
-        if (NetDevice->SendSectionSize) {
+        if (net_device->send_section_size) {
                 DPRINT_INFO(NETVSC,
                             "Sending NvspMessage1TypeRevokeSendBuffer...");
 
                 /* Send the revoke send buffer */
-                revokePacket = &NetDevice->RevokePacket;
-                memset(revokePacket, 0, sizeof(struct nvsp_message));
+                revoke_packet = &net_device->revoke_packet;
+                memset(revoke_packet, 0, sizeof(struct nvsp_message));
 
-                revokePacket->Header.MessageType = NvspMessage1TypeRevokeSendBuffer;
-                revokePacket->Messages.Version1Messages.RevokeSendBuffer.Id = NETVSC_SEND_BUFFER_ID;
+                revoke_packet->hdr.msg_type =
+                        NVSP_MSG1_TYPE_REVOKE_SEND_BUF;
+                revoke_packet->msg.v1_msg.
+                        revoke_send_buf.id = NETVSC_SEND_BUFFER_ID;
 
-                ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket,
+                ret = vmbus_sendpacket(net_device->dev->channel,
+                                       revoke_packet,
                                        sizeof(struct nvsp_message),
-                                       (unsigned long)revokePacket,
+                                       (unsigned long)revoke_packet,
                                        VmbusPacketTypeDataInBand, 0);
                 /*
                  * If we failed here, we might as well return and have a leak
@@ -532,10 +553,10 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
         }
 
         /* Teardown the gpadl on the vsp end */
-        if (NetDevice->SendBufferGpadlHandle) {
+        if (net_device->send_buf_gpadl_handle) {
                 DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL...");
-                ret = vmbus_teardown_gpadl(NetDevice->Device->channel,
-                                           NetDevice->SendBufferGpadlHandle);
+                ret = vmbus_teardown_gpadl(net_device->dev->channel,
+                                           net_device->send_buf_gpadl_handle);
 
                 /*
                  * If we failed here, we might as well return and have a leak
@@ -546,49 +567,51 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
                                    "gpadl");
                         return -1;
                 }
-                NetDevice->SendBufferGpadlHandle = 0;
+                net_device->send_buf_gpadl_handle = 0;
         }
 
-        if (NetDevice->SendBuffer) {
+        if (net_device->send_buf) {
                 DPRINT_INFO(NETVSC, "Freeing up send buffer...");
 
                 /* Free up the receive buffer */
-                osd_PageFree(NetDevice->SendBuffer,
-                             NetDevice->SendBufferSize >> PAGE_SHIFT);
-                NetDevice->SendBuffer = NULL;
+                osd_page_free(net_device->send_buf,
+                             net_device->send_buf_size >> PAGE_SHIFT);
+                net_device->send_buf = NULL;
         }
 
         return ret;
 }
 
 
-static int NetVscConnectToVsp(struct hv_device *Device)
+static int netvsc_connect_vsp(struct hv_device *device)
 {
         int ret;
-        struct netvsc_device *netDevice;
-        struct nvsp_message *initPacket;
-        int ndisVersion;
+        struct netvsc_device *net_device;
+        struct nvsp_message *init_packet;
+        int ndis_version;
 
-        netDevice = GetOutboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_outbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return -1;
         }
 
-        initPacket = &netDevice->ChannelInitPacket;
+        init_packet = &net_device->channel_init_pkt;
 
-        memset(initPacket, 0, sizeof(struct nvsp_message));
-        initPacket->Header.MessageType = NvspMessageTypeInit;
-        initPacket->Messages.InitMessages.Init.MinProtocolVersion = NVSP_MIN_PROTOCOL_VERSION;
-        initPacket->Messages.InitMessages.Init.MaxProtocolVersion = NVSP_MAX_PROTOCOL_VERSION;
+        memset(init_packet, 0, sizeof(struct nvsp_message));
+        init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT;
+        init_packet->msg.init_msg.init.min_protocol_ver =
+                NVSP_MIN_PROTOCOL_VERSION;
+        init_packet->msg.init_msg.init.max_protocol_ver =
+                NVSP_MAX_PROTOCOL_VERSION;
 
         DPRINT_INFO(NETVSC, "Sending NvspMessageTypeInit...");
 
         /* Send the init request */
-        ret = vmbus_sendpacket(Device->channel, initPacket,
+        ret = vmbus_sendpacket(device->channel, init_packet,
                                sizeof(struct nvsp_message),
-                               (unsigned long)initPacket,
+                               (unsigned long)init_packet,
                                VmbusPacketTypeDataInBand,
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
 
@@ -597,47 +620,52 @@ static int NetVscConnectToVsp(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(netDevice->ChannelInitEvent);
+        osd_waitevent_wait(net_device->channel_init_event);
 
         /* Now, check the response */
         /* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */
         DPRINT_INFO(NETVSC, "NvspMessageTypeInit status(%d) max mdl chain (%d)",
-                initPacket->Messages.InitMessages.InitComplete.Status,
-                initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength);
+                init_packet->msg.init_msg.init_complete.status,
+                init_packet->msg.init_msg.
+                    init_complete.max_mdl_chain_len);
 
-        if (initPacket->Messages.InitMessages.InitComplete.Status !=
-            NvspStatusSuccess) {
+        if (init_packet->msg.init_msg.init_complete.status !=
+            NVSP_STAT_SUCCESS) {
                 DPRINT_ERR(NETVSC,
                         "unable to initialize with netvsp (status 0x%x)",
-                        initPacket->Messages.InitMessages.InitComplete.Status);
+                        init_packet->msg.init_msg.init_complete.status);
                 ret = -1;
                 goto Cleanup;
         }
 
-        if (initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion != NVSP_PROTOCOL_VERSION_1) {
+        if (init_packet->msg.init_msg.init_complete.
+            negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) {
                 DPRINT_ERR(NETVSC, "unable to initialize with netvsp "
                            "(version expected 1 got %d)",
-                           initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion);
+                           init_packet->msg.init_msg.
+                           init_complete.negotiated_protocol_ver);
                 ret = -1;
                 goto Cleanup;
         }
         DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendNdisVersion...");
 
         /* Send the ndis version */
-        memset(initPacket, 0, sizeof(struct nvsp_message));
+        memset(init_packet, 0, sizeof(struct nvsp_message));
 
-        ndisVersion = 0x00050000;
+        ndis_version = 0x00050000;
 
-        initPacket->Header.MessageType = NvspMessage1TypeSendNdisVersion;
-        initPacket->Messages.Version1Messages.SendNdisVersion.NdisMajorVersion =
-                                (ndisVersion & 0xFFFF0000) >> 16;
-        initPacket->Messages.Version1Messages.SendNdisVersion.NdisMinorVersion =
-                                ndisVersion & 0xFFFF;
+        init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_NDIS_VER;
+        init_packet->msg.v1_msg.
+                send_ndis_ver.ndis_major_ver =
+                                (ndis_version & 0xFFFF0000) >> 16;
+        init_packet->msg.v1_msg.
+                send_ndis_ver.ndis_minor_ver =
+                                ndis_version & 0xFFFF;
 
         /* Send the init request */
-        ret = vmbus_sendpacket(Device->channel, initPacket,
+        ret = vmbus_sendpacket(device->channel, init_packet,
                                sizeof(struct nvsp_message),
-                               (unsigned long)initPacket,
+                               (unsigned long)init_packet,
                                VmbusPacketTypeDataInBand, 0);
         if (ret != 0) {
                 DPRINT_ERR(NETVSC,
@@ -651,51 +679,52 @@ static int NetVscConnectToVsp(struct hv_device *Device)
          * packet) since our Vmbus always set the
          * VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED flag
          */
-         /* osd_WaitEventWait(NetVscChannel->ChannelInitEvent); */
+         /* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */
 
         /* Post the big receive buffer to NetVSP */
-        ret = NetVscInitializeReceiveBufferWithNetVsp(Device);
+        ret = netvsc_init_recv_buf(device);
         if (ret == 0)
-                ret = NetVscInitializeSendBufferWithNetVsp(Device);
+                ret = netvsc_init_send_buf(device);
 
 Cleanup:
-        PutNetDevice(Device);
+        put_net_device(device);
         return ret;
 }
 
-static void NetVscDisconnectFromVsp(struct netvsc_device *NetDevice)
+static void NetVscDisconnectFromVsp(struct netvsc_device *net_device)
 {
-        NetVscDestroyReceiveBuffer(NetDevice);
-        NetVscDestroySendBuffer(NetDevice);
+        netvsc_destroy_recv_buf(net_device);
+        netvsc_destroy_send_buf(net_device);
 }
 
 /*
- * NetVscOnDeviceAdd - Callback when the device belonging to this driver is added
+ * netvsc_device_add - Callback when the device belonging to this
+ * driver is added
  */
-static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
+static int netvsc_device_add(struct hv_device *device, void *additional_info)
 {
         int ret = 0;
         int i;
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
         struct hv_netvsc_packet *packet, *pos;
-        struct netvsc_driver *netDriver =
-                                (struct netvsc_driver *)Device->Driver;
+        struct netvsc_driver *net_driver =
+                                (struct netvsc_driver *)device->Driver;
 
-        netDevice = AllocNetDevice(Device);
-        if (!netDevice) {
+        net_device = alloc_net_device(device);
+        if (!net_device) {
                 ret = -1;
                 goto Cleanup;
         }
 
-        DPRINT_DBG(NETVSC, "netvsc channel object allocated - %p", netDevice);
+        DPRINT_DBG(NETVSC, "netvsc channel object allocated - %p", net_device);
 
         /* Initialize the NetVSC channel extension */
-        netDevice->ReceiveBufferSize = NETVSC_RECEIVE_BUFFER_SIZE;
-        spin_lock_init(&netDevice->receive_packet_list_lock);
+        net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
+        spin_lock_init(&net_device->recv_pkt_list_lock);
 
-        netDevice->SendBufferSize = NETVSC_SEND_BUFFER_SIZE;
+        net_device->send_buf_size = NETVSC_SEND_BUFFER_SIZE;
 
-        INIT_LIST_HEAD(&netDevice->ReceivePacketList);
+        INIT_LIST_HEAD(&net_device->recv_pkt_list);
 
         for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) {
                 packet = kzalloc(sizeof(struct hv_netvsc_packet) +
@@ -707,19 +736,19 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
                                    NETVSC_RECEIVE_PACKETLIST_COUNT, i);
                         break;
                 }
-                list_add_tail(&packet->ListEntry,
-                              &netDevice->ReceivePacketList);
+                list_add_tail(&packet->list_ent,
+                              &net_device->recv_pkt_list);
         }
-        netDevice->ChannelInitEvent = osd_WaitEventCreate();
-        if (!netDevice->ChannelInitEvent) {
+        net_device->channel_init_event = osd_waitevent_create();
+        if (!net_device->channel_init_event) {
                 ret = -ENOMEM;
                 goto Cleanup;
         }
 
         /* Open the channel */
-        ret = vmbus_open(Device->channel, netDriver->RingBufferSize,
-                         netDriver->RingBufferSize, NULL, 0,
-                         NetVscOnChannelCallback, Device);
+        ret = vmbus_open(device->channel, net_driver->ring_buf_size,
+                         net_driver->ring_buf_size, NULL, 0,
+                         netvsc_channel_cb, device);
 
         if (ret != 0) {
                 DPRINT_ERR(NETVSC, "unable to open channel: %d", ret);
@@ -731,7 +760,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         DPRINT_INFO(NETVSC, "*** NetVSC channel opened successfully! ***");
 
         /* Connect with the NetVsp */
-        ret = NetVscConnectToVsp(Device);
+        ret = netvsc_connect_vsp(device);
         if (ret != 0) {
                 DPRINT_ERR(NETVSC, "unable to connect to NetVSP - %d", ret);
                 ret = -1;
@@ -745,174 +774,178 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
 
 close:
         /* Now, we can close the channel safely */
-        vmbus_close(Device->channel);
+        vmbus_close(device->channel);
 
 Cleanup:
 
-        if (netDevice) {
-                kfree(netDevice->ChannelInitEvent);
+        if (net_device) {
+                kfree(net_device->channel_init_event);
 
                 list_for_each_entry_safe(packet, pos,
-                                         &netDevice->ReceivePacketList,
-                                         ListEntry) {
-                        list_del(&packet->ListEntry);
+                                         &net_device->recv_pkt_list,
+                                         list_ent) {
+                        list_del(&packet->list_ent);
                         kfree(packet);
                 }
 
-                ReleaseOutboundNetDevice(Device);
-                ReleaseInboundNetDevice(Device);
+                release_outbound_net_device(device);
+                release_inbound_net_device(device);
 
-                FreeNetDevice(netDevice);
+                free_net_device(net_device);
         }
 
         return ret;
 }
 
 /*
- * NetVscOnDeviceRemove - Callback when the root bus device is removed
+ * netvsc_device_remove - Callback when the root bus device is removed
  */
-static int NetVscOnDeviceRemove(struct hv_device *Device)
+static int netvsc_device_remove(struct hv_device *device)
 {
-        struct netvsc_device *netDevice;
-        struct hv_netvsc_packet *netvscPacket, *pos;
+        struct netvsc_device *net_device;
+        struct hv_netvsc_packet *netvsc_packet, *pos;
 
         DPRINT_INFO(NETVSC, "Disabling outbound traffic on net device (%p)...",
-                    Device->Extension);
+                    device->Extension);
 
         /* Stop outbound traffic ie sends and receives completions */
-        netDevice = ReleaseOutboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = release_outbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "No net device present!!");
                 return -1;
         }
 
         /* Wait for all send completions */
-        while (atomic_read(&netDevice->NumOutstandingSends)) {
+        while (atomic_read(&net_device->num_outstanding_sends)) {
                 DPRINT_INFO(NETVSC, "waiting for %d requests to complete...",
-                            atomic_read(&netDevice->NumOutstandingSends));
+                            atomic_read(&net_device->num_outstanding_sends));
                 udelay(100);
         }
 
         DPRINT_INFO(NETVSC, "Disconnecting from netvsp...");
 
-        NetVscDisconnectFromVsp(netDevice);
+        NetVscDisconnectFromVsp(net_device);
 
         DPRINT_INFO(NETVSC, "Disabling inbound traffic on net device (%p)...",
-                    Device->Extension);
+                    device->Extension);
 
         /* Stop inbound traffic ie receives and sends completions */
-        netDevice = ReleaseInboundNetDevice(Device);
+        net_device = release_inbound_net_device(device);
 
         /* At this point, no one should be accessing netDevice except in here */
-        DPRINT_INFO(NETVSC, "net device (%p) safe to remove", netDevice);
+        DPRINT_INFO(NETVSC, "net device (%p) safe to remove", net_device);
 
         /* Now, we can close the channel safely */
-        vmbus_close(Device->channel);
+        vmbus_close(device->channel);
 
         /* Release all resources */
-        list_for_each_entry_safe(netvscPacket, pos,
-                                 &netDevice->ReceivePacketList, ListEntry) {
-                list_del(&netvscPacket->ListEntry);
-                kfree(netvscPacket);
+        list_for_each_entry_safe(netvsc_packet, pos,
+                                 &net_device->recv_pkt_list, list_ent) {
+                list_del(&netvsc_packet->list_ent);
+                kfree(netvsc_packet);
         }
 
-        kfree(netDevice->ChannelInitEvent);
-        FreeNetDevice(netDevice);
+        kfree(net_device->channel_init_event);
+        free_net_device(net_device);
         return 0;
 }
 
 /*
- * NetVscOnCleanup - Perform any cleanup when the driver is removed
+ * netvsc_cleanup - Perform any cleanup when the driver is removed
  */
-static void NetVscOnCleanup(struct hv_driver *drv)
+static void netvsc_cleanup(struct hv_driver *drv)
 {
 }
 
-static void NetVscOnSendCompletion(struct hv_device *Device,
-                                   struct vmpacket_descriptor *Packet)
+static void netvsc_send_completion(struct hv_device *device,
+                                   struct vmpacket_descriptor *packet)
 {
-        struct netvsc_device *netDevice;
-        struct nvsp_message *nvspPacket;
-        struct hv_netvsc_packet *nvscPacket;
+        struct netvsc_device *net_device;
+        struct nvsp_message *nvsp_packet;
+        struct hv_netvsc_packet *nvsc_packet;
 
-        netDevice = GetInboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_inbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return;
         }
 
-        nvspPacket = (struct nvsp_message *)((unsigned long)Packet + (Packet->DataOffset8 << 3));
+        nvsp_packet = (struct nvsp_message *)((unsigned long)packet +
+                        (packet->DataOffset8 << 3));
 
         DPRINT_DBG(NETVSC, "send completion packet - type %d",
-                   nvspPacket->Header.MessageType);
+                   nvsp_packet->hdr.msg_type);
 
-        if ((nvspPacket->Header.MessageType == NvspMessageTypeInitComplete) ||
-            (nvspPacket->Header.MessageType ==
-             NvspMessage1TypeSendReceiveBufferComplete) ||
-            (nvspPacket->Header.MessageType ==
-             NvspMessage1TypeSendSendBufferComplete)) {
+        if ((nvsp_packet->hdr.msg_type == NVSP_MSG_TYPE_INIT_COMPLETE) ||
+            (nvsp_packet->hdr.msg_type ==
+             NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE) ||
+            (nvsp_packet->hdr.msg_type ==
+             NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE)) {
                 /* Copy the response back */
-                memcpy(&netDevice->ChannelInitPacket, nvspPacket,
+                memcpy(&net_device->channel_init_pkt, nvsp_packet,
                        sizeof(struct nvsp_message));
-                osd_WaitEventSet(netDevice->ChannelInitEvent);
-        } else if (nvspPacket->Header.MessageType ==
-                   NvspMessage1TypeSendRNDISPacketComplete) {
+                osd_waitevent_set(net_device->channel_init_event);
+        } else if (nvsp_packet->hdr.msg_type ==
+                   NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE) {
                 /* Get the send context */
-                nvscPacket = (struct hv_netvsc_packet *)(unsigned long)Packet->TransactionId;
+                nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
+                        packet->TransactionId;
                 /* ASSERT(nvscPacket); */
 
                 /* Notify the layer above us */
-                nvscPacket->Completion.Send.OnSendCompletion(nvscPacket->Completion.Send.SendCompletionContext);
+                nvsc_packet->completion.send.send_completion(
+                        nvsc_packet->completion.send.send_completion_ctx);
 
-                atomic_dec(&netDevice->NumOutstandingSends);
+                atomic_dec(&net_device->num_outstanding_sends);
         } else {
                 DPRINT_ERR(NETVSC, "Unknown send completion packet type - "
-                           "%d received!!", nvspPacket->Header.MessageType);
+                           "%d received!!", nvsp_packet->hdr.msg_type);
         }
 
-        PutNetDevice(Device);
+        put_net_device(device);
 }
 
-static int NetVscOnSend(struct hv_device *Device,
-                        struct hv_netvsc_packet *Packet)
+static int netvsc_send(struct hv_device *device,
+                        struct hv_netvsc_packet *packet)
 {
-        struct netvsc_device *netDevice;
+        struct netvsc_device *net_device;
         int ret = 0;
 
         struct nvsp_message sendMessage;
 
-        netDevice = GetOutboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_outbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
-                           "ignoring outbound packets", netDevice);
+                           "ignoring outbound packets", net_device);
                 return -2;
         }
 
-        sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket;
-        if (Packet->IsDataPacket) {
+        sendMessage.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
+        if (packet->is_data_pkt) {
                 /* 0 is RMC_DATA; */
-                sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 0;
+                sendMessage.msg.v1_msg.send_rndis_pkt.channel_type = 0;
         } else {
                 /* 1 is RMC_CONTROL; */
-                sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 1;
+                sendMessage.msg.v1_msg.send_rndis_pkt.channel_type = 1;
         }
 
         /* Not using send buffer section */
-        sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex = 0xFFFFFFFF;
-        sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize = 0;
-
-        if (Packet->PageBufferCount) {
-                ret = vmbus_sendpacket_pagebuffer(Device->channel,
-                                                  Packet->PageBuffers,
-                                                  Packet->PageBufferCount,
+        sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_index =
+                0xFFFFFFFF;
+        sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
+
+        if (packet->page_buf_cnt) {
+                ret = vmbus_sendpacket_pagebuffer(device->channel,
+                                                  packet->page_buf,
+                                                  packet->page_buf_cnt,
                                                   &sendMessage,
                                                   sizeof(struct nvsp_message),
-                                                  (unsigned long)Packet);
+                                                  (unsigned long)packet);
         } else {
-                ret = vmbus_sendpacket(Device->channel, &sendMessage,
+                ret = vmbus_sendpacket(device->channel, &sendMessage,
                                        sizeof(struct nvsp_message),
-                                       (unsigned long)Packet,
+                                       (unsigned long)packet,
                                        VmbusPacketTypeDataInBand,
                                        VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
 
@@ -920,31 +953,31 @@ static int NetVscOnSend(struct hv_device *Device,
 
         if (ret != 0)
                 DPRINT_ERR(NETVSC, "Unable to send packet %p ret %d",
-                           Packet, ret);
+                           packet, ret);
 
-        atomic_inc(&netDevice->NumOutstandingSends);
-        PutNetDevice(Device);
+        atomic_inc(&net_device->num_outstanding_sends);
+        put_net_device(device);
         return ret;
 }
 
-static void NetVscOnReceive(struct hv_device *Device,
-                            struct vmpacket_descriptor *Packet)
+static void netvsc_receive(struct hv_device *device,
+                            struct vmpacket_descriptor *packet)
 {
-        struct netvsc_device *netDevice;
-        struct vmtransfer_page_packet_header *vmxferpagePacket;
-        struct nvsp_message *nvspPacket;
-        struct hv_netvsc_packet *netvscPacket = NULL;
+        struct netvsc_device *net_device;
+        struct vmtransfer_page_packet_header *vmxferpage_packet;
+        struct nvsp_message *nvsp_packet;
+        struct hv_netvsc_packet *netvsc_packet = NULL;
         unsigned long start;
-        unsigned long end, endVirtual;
+        unsigned long end, end_virtual;
         /* struct netvsc_driver *netvscDriver; */
-        struct xferpage_packet *xferpagePacket = NULL;
+        struct xferpage_packet *xferpage_packet = NULL;
         int i, j;
-        int count = 0, bytesRemain = 0;
+        int count = 0, bytes_remain = 0;
         unsigned long flags;
         LIST_HEAD(listHead);
 
-        netDevice = GetInboundNetDevice(Device);
-        if (!netDevice) {
+        net_device = get_inbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return;
@@ -954,39 +987,40 @@ static void NetVscOnReceive(struct hv_device *Device,
          * All inbound packets other than send completion should be xfer page
          * packet
          */
-        if (Packet->Type != VmbusPacketTypeDataUsingTransferPages) {
+        if (packet->Type != VmbusPacketTypeDataUsingTransferPages) {
                 DPRINT_ERR(NETVSC, "Unknown packet type received - %d",
-                           Packet->Type);
-                PutNetDevice(Device);
+                           packet->Type);
+                put_net_device(device);
                 return;
         }
 
-        nvspPacket = (struct nvsp_message *)((unsigned long)Packet +
-                        (Packet->DataOffset8 << 3));
+        nvsp_packet = (struct nvsp_message *)((unsigned long)packet +
+                        (packet->DataOffset8 << 3));
 
         /* Make sure this is a valid nvsp packet */
-        if (nvspPacket->Header.MessageType != NvspMessage1TypeSendRNDISPacket) {
+        if (nvsp_packet->hdr.msg_type !=
+            NVSP_MSG1_TYPE_SEND_RNDIS_PKT) {
                 DPRINT_ERR(NETVSC, "Unknown nvsp packet type received - %d",
-                           nvspPacket->Header.MessageType);
-                PutNetDevice(Device);
+                           nvsp_packet->hdr.msg_type);
+                put_net_device(device);
                 return;
         }
 
         DPRINT_DBG(NETVSC, "NVSP packet received - type %d",
-                   nvspPacket->Header.MessageType);
+                   nvsp_packet->hdr.msg_type);
 
-        vmxferpagePacket = (struct vmtransfer_page_packet_header *)Packet;
+        vmxferpage_packet = (struct vmtransfer_page_packet_header *)packet;
 
-        if (vmxferpagePacket->TransferPageSetId != NETVSC_RECEIVE_BUFFER_ID) {
+        if (vmxferpage_packet->TransferPageSetId != NETVSC_RECEIVE_BUFFER_ID) {
                 DPRINT_ERR(NETVSC, "Invalid xfer page set id - "
                            "expecting %x got %x", NETVSC_RECEIVE_BUFFER_ID,
-                           vmxferpagePacket->TransferPageSetId);
-                PutNetDevice(Device);
+                           vmxferpage_packet->TransferPageSetId);
+                put_net_device(device);
                 return;
         }
 
         DPRINT_DBG(NETVSC, "xfer page - range count %d",
-                   vmxferpagePacket->RangeCount);
+                   vmxferpage_packet->RangeCount);
 
         /*
          * Grab free packets (range count + 1) to represent this xfer
@@ -994,13 +1028,13 @@ static void NetVscOnReceive(struct hv_device *Device,
          * We grab it here so that we know exactly how many we can
          * fulfil
          */
-        spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);
-        while (!list_empty(&netDevice->ReceivePacketList)) {
-                list_move_tail(netDevice->ReceivePacketList.next, &listHead);
-                if (++count == vmxferpagePacket->RangeCount + 1)
+        spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+        while (!list_empty(&net_device->recv_pkt_list)) {
+                list_move_tail(net_device->recv_pkt_list.next, &listHead);
+                if (++count == vmxferpage_packet->RangeCount + 1)
                         break;
         }
-        spin_unlock_irqrestore(&netDevice->receive_packet_list_lock, flags);
+        spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
 
         /*
          * We need at least 2 netvsc pkts (1 to represent the xfer
@@ -1010,140 +1044,149 @@ static void NetVscOnReceive(struct hv_device *Device,
         if (count < 2) {
                 DPRINT_ERR(NETVSC, "Got only %d netvsc pkt...needed %d pkts. "
                            "Dropping this xfer page packet completely!",
-                           count, vmxferpagePacket->RangeCount + 1);
+                           count, vmxferpage_packet->RangeCount + 1);
 
                 /* Return it to the freelist */
-                spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);
+                spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
                 for (i = count; i != 0; i--) {
                         list_move_tail(listHead.next,
-                                       &netDevice->ReceivePacketList);
+                                       &net_device->recv_pkt_list);
                 }
-                spin_unlock_irqrestore(&netDevice->receive_packet_list_lock,
+                spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
                                        flags);
 
-                NetVscSendReceiveCompletion(Device,
-                                            vmxferpagePacket->d.TransactionId);
+                netvsc_send_recv_completion(device,
+                                            vmxferpage_packet->d.TransactionId);
 
-                PutNetDevice(Device);
+                put_net_device(device);
                 return;
         }
 
         /* Remove the 1st packet to represent the xfer page packet itself */
-        xferpagePacket = (struct xferpage_packet *)listHead.next;
-        list_del(&xferpagePacket->ListEntry);
+        xferpage_packet = (struct xferpage_packet *)listHead.next;
+        list_del(&xferpage_packet->list_ent);
 
         /* This is how much we can satisfy */
-        xferpagePacket->Count = count - 1;
+        xferpage_packet->count = count - 1;
         /* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */
         /*      vmxferpagePacket->RangeCount); */
 
-        if (xferpagePacket->Count != vmxferpagePacket->RangeCount) {
+        if (xferpage_packet->count != vmxferpage_packet->RangeCount) {
                 DPRINT_INFO(NETVSC, "Needed %d netvsc pkts to satisy this xfer "
-                            "page...got %d", vmxferpagePacket->RangeCount,
-                            xferpagePacket->Count);
+                            "page...got %d", vmxferpage_packet->RangeCount,
+                            xferpage_packet->count);
         }
 
         /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
         for (i = 0; i < (count - 1); i++) {
-                netvscPacket = (struct hv_netvsc_packet *)listHead.next;
-                list_del(&netvscPacket->ListEntry);
+                netvsc_packet = (struct hv_netvsc_packet *)listHead.next;
+                list_del(&netvsc_packet->list_ent);
 
                 /* Initialize the netvsc packet */
-                netvscPacket->XferPagePacket = xferpagePacket;
-                netvscPacket->Completion.Recv.OnReceiveCompletion =
-                                        NetVscOnReceiveCompletion;
-                netvscPacket->Completion.Recv.ReceiveCompletionContext =
-                                        netvscPacket;
-                netvscPacket->Device = Device;
+                netvsc_packet->xfer_page_pkt = xferpage_packet;
+                netvsc_packet->completion.recv.recv_completion =
+                                        netvsc_receive_completion;
+                netvsc_packet->completion.recv.recv_completion_ctx =
+                                        netvsc_packet;
+                netvsc_packet->device = device;
                 /* Save this so that we can send it back */
-                netvscPacket->Completion.Recv.ReceiveCompletionTid =
-                                        vmxferpagePacket->d.TransactionId;
+                netvsc_packet->completion.recv.recv_completion_tid =
+                                        vmxferpage_packet->d.TransactionId;
 
-                netvscPacket->TotalDataBufferLength =
-                                        vmxferpagePacket->Ranges[i].ByteCount;
-                netvscPacket->PageBufferCount = 1;
+                netvsc_packet->total_data_buflen =
+                                        vmxferpage_packet->Ranges[i].ByteCount;
+                netvsc_packet->page_buf_cnt = 1;
 
                 /* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */
                 /*      vmxferpagePacket->Ranges[i].ByteCount < */
                 /*      netDevice->ReceiveBufferSize); */
 
-                netvscPacket->PageBuffers[0].Length =
-                                        vmxferpagePacket->Ranges[i].ByteCount;
+                netvsc_packet->page_buf[0].Length =
+                                        vmxferpage_packet->Ranges[i].ByteCount;
 
-                start = virt_to_phys((void *)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset));
+                start = virt_to_phys((void *)((unsigned long)net_device->
+                recv_buf + vmxferpage_packet->Ranges[i].ByteOffset));
 
-                netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT;
-                endVirtual = (unsigned long)netDevice->ReceiveBuffer
-                    + vmxferpagePacket->Ranges[i].ByteOffset
-                    + vmxferpagePacket->Ranges[i].ByteCount - 1;
-                end = virt_to_phys((void *)endVirtual);
+                netvsc_packet->page_buf[0].Pfn = start >> PAGE_SHIFT;
+                end_virtual = (unsigned long)net_device->recv_buf
+                    + vmxferpage_packet->Ranges[i].ByteOffset
+                    + vmxferpage_packet->Ranges[i].ByteCount - 1;
+                end = virt_to_phys((void *)end_virtual);
 
                 /* Calculate the page relative offset */
-                netvscPacket->PageBuffers[0].Offset =
-                        vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE - 1);
+                netvsc_packet->page_buf[0].Offset =
+                        vmxferpage_packet->Ranges[i].ByteOffset &
+                        (PAGE_SIZE - 1);
                 if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) {
                         /* Handle frame across multiple pages: */
-                        netvscPacket->PageBuffers[0].Length =
-                                (netvscPacket->PageBuffers[0].Pfn << PAGE_SHIFT)
+                        netvsc_packet->page_buf[0].Length =
+                                (netvsc_packet->page_buf[0].Pfn <<
+                                 PAGE_SHIFT)
                                 + PAGE_SIZE - start;
-                        bytesRemain = netvscPacket->TotalDataBufferLength -
-                                        netvscPacket->PageBuffers[0].Length;
+                        bytes_remain = netvsc_packet->total_data_buflen -
+                                        netvsc_packet->page_buf[0].Length;
                         for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) {
-                                netvscPacket->PageBuffers[j].Offset = 0;
-                                if (bytesRemain <= PAGE_SIZE) {
-                                        netvscPacket->PageBuffers[j].Length = bytesRemain;
-                                        bytesRemain = 0;
+                                netvsc_packet->page_buf[j].Offset = 0;
+                                if (bytes_remain <= PAGE_SIZE) {
+                                        netvsc_packet->page_buf[j].Length =
+                                                bytes_remain;
+                                        bytes_remain = 0;
                                 } else {
-                                        netvscPacket->PageBuffers[j].Length = PAGE_SIZE;
-                                        bytesRemain -= PAGE_SIZE;
+                                        netvsc_packet->page_buf[j].Length =
+                                                PAGE_SIZE;
+                                        bytes_remain -= PAGE_SIZE;
                                 }
-                                netvscPacket->PageBuffers[j].Pfn =
-                                    virt_to_phys((void *)(endVirtual - bytesRemain)) >> PAGE_SHIFT;
-                                netvscPacket->PageBufferCount++;
-                                if (bytesRemain == 0)
+                                netvsc_packet->page_buf[j].Pfn =
+                                    virt_to_phys((void *)(end_virtual -
+                                                bytes_remain)) >> PAGE_SHIFT;
+                                netvsc_packet->page_buf_cnt++;
+                                if (bytes_remain == 0)
                                         break;
                         }
                         /* ASSERT(bytesRemain == 0); */
                 }
                 DPRINT_DBG(NETVSC, "[%d] - (abs offset %u len %u) => "
                            "(pfn %llx, offset %u, len %u)", i,
-                           vmxferpagePacket->Ranges[i].ByteOffset,
-                           vmxferpagePacket->Ranges[i].ByteCount,
-                           netvscPacket->PageBuffers[0].Pfn,
-                           netvscPacket->PageBuffers[0].Offset,
-                           netvscPacket->PageBuffers[0].Length);
+                           vmxferpage_packet->Ranges[i].ByteOffset,
+                           vmxferpage_packet->Ranges[i].ByteCount,
+                           netvsc_packet->page_buf[0].Pfn,
+                           netvsc_packet->page_buf[0].Offset,
+                           netvsc_packet->page_buf[0].Length);
 
                 /* Pass it to the upper layer */
-                ((struct netvsc_driver *)Device->Driver)->OnReceiveCallback(Device, netvscPacket);
+                ((struct netvsc_driver *)device->Driver)->
+                        recv_cb(device, netvsc_packet);
 
-                NetVscOnReceiveCompletion(netvscPacket->Completion.Recv.ReceiveCompletionContext);
+                netvsc_receive_completion(netvsc_packet->
+                                completion.recv.recv_completion_ctx);
         }
 
         /* ASSERT(list_empty(&listHead)); */
 
-        PutNetDevice(Device);
+        put_net_device(device);
 }
 
-static void NetVscSendReceiveCompletion(struct hv_device *Device,
-                                        u64 TransactionId)
+static void netvsc_send_recv_completion(struct hv_device *device,
+                                        u64 transaction_id)
 {
         struct nvsp_message recvcompMessage;
         int retries = 0;
         int ret;
 
         DPRINT_DBG(NETVSC, "Sending receive completion pkt - %llx",
-                   TransactionId);
+                   transaction_id);
 
-        recvcompMessage.Header.MessageType =
-                                NvspMessage1TypeSendRNDISPacketComplete;
+        recvcompMessage.hdr.msg_type =
+                                NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE;
 
         /* FIXME: Pass in the status */
-        recvcompMessage.Messages.Version1Messages.SendRNDISPacketComplete.Status = NvspStatusSuccess;
+        recvcompMessage.msg.v1_msg.send_rndis_pkt_complete.status =
+                NVSP_STAT_SUCCESS;
 
 retry_send_cmplt:
         /* Send the completion */
-        ret = vmbus_sendpacket(Device->channel, &recvcompMessage,
-                               sizeof(struct nvsp_message), TransactionId,
+        ret = vmbus_sendpacket(device->channel, &recvcompMessage,
+                               sizeof(struct nvsp_message), transaction_id,
                                VmbusPacketTypeCompletion, 0);
         if (ret == 0) {
                 /* success */
@@ -1152,7 +1195,7 @@ retry_send_cmplt:
                 /* no more room...wait a bit and attempt to retry 3 times */
                 retries++;
                 DPRINT_ERR(NETVSC, "unable to send receive completion pkt "
-                           "(tid %llx)...retrying %d", TransactionId, retries);
+                           "(tid %llx)...retrying %d", transaction_id, retries);
 
                 if (retries < 4) {
                         udelay(100);
@@ -1160,22 +1203,22 @@ retry_send_cmplt:
                 } else {
                         DPRINT_ERR(NETVSC, "unable to send receive completion "
                                   "pkt (tid %llx)...give up retrying",
-                                  TransactionId);
+                                  transaction_id);
                 }
         } else {
                 DPRINT_ERR(NETVSC, "unable to send receive completion pkt - "
-                           "%llx", TransactionId);
+                           "%llx", transaction_id);
         }
 }
 
 /* Send a receive completion packet to RNDIS device (ie NetVsp) */
-static void NetVscOnReceiveCompletion(void *Context)
+static void netvsc_receive_completion(void *context)
 {
-        struct hv_netvsc_packet *packet = Context;
-        struct hv_device *device = (struct hv_device *)packet->Device;
-        struct netvsc_device *netDevice;
-        u64 transactionId = 0;
-        bool fSendReceiveComp = false;
+        struct hv_netvsc_packet *packet = context;
+        struct hv_device *device = (struct hv_device *)packet->device;
+        struct netvsc_device *net_device;
+        u64 transaction_id = 0;
+        bool fsend_receive_comp = false;
         unsigned long flags;
 
         /* ASSERT(packet->XferPagePacket); */
@@ -1185,49 +1228,49 @@ static void NetVscOnReceiveCompletion(void *Context)
          * send out receive completion, we are using GetInboundNetDevice()
          * since we may have disable outbound traffic already.
          */
-        netDevice = GetInboundNetDevice(device);
-        if (!netDevice) {
+        net_device = get_inbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
                            "device being destroyed?");
                 return;
         }
 
         /* Overloading use of the lock. */
-        spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);
+        spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
 
         /* ASSERT(packet->XferPagePacket->Count > 0); */
-        packet->XferPagePacket->Count--;
+        packet->xfer_page_pkt->count--;
 
         /*
          * Last one in the line that represent 1 xfer page packet.
          * Return the xfer page packet itself to the freelist
          */
-        if (packet->XferPagePacket->Count == 0) {
-                fSendReceiveComp = true;
-                transactionId = packet->Completion.Recv.ReceiveCompletionTid;
-                list_add_tail(&packet->XferPagePacket->ListEntry,
-                              &netDevice->ReceivePacketList);
+        if (packet->xfer_page_pkt->count == 0) {
+                fsend_receive_comp = true;
+                transaction_id = packet->completion.recv.recv_completion_tid;
+                list_add_tail(&packet->xfer_page_pkt->list_ent,
+                              &net_device->recv_pkt_list);
 
         }
 
         /* Put the packet back */
-        list_add_tail(&packet->ListEntry, &netDevice->ReceivePacketList);
-        spin_unlock_irqrestore(&netDevice->receive_packet_list_lock, flags);
+        list_add_tail(&packet->list_ent, &net_device->recv_pkt_list);
+        spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
 
         /* Send a receive completion for the xfer page packet */
-        if (fSendReceiveComp)
-                NetVscSendReceiveCompletion(device, transactionId);
+        if (fsend_receive_comp)
+                netvsc_send_recv_completion(device, transaction_id);
 
-        PutNetDevice(device);
+        put_net_device(device);
 }
 
-static void NetVscOnChannelCallback(void *Context)
+static void netvsc_channel_cb(void *context)
 {
         int ret;
-        struct hv_device *device = Context;
-        struct netvsc_device *netDevice;
-        u32 bytesRecvd;
-        u64 requestId;
+        struct hv_device *device = context;
+        struct netvsc_device *net_device;
+        u32 bytes_recvd;
+        u64 request_id;
         unsigned char *packet;
         struct vmpacket_descriptor *desc;
         unsigned char *buffer;
@@ -1241,37 +1284,37 @@ static void NetVscOnChannelCallback(void *Context)
                 return;
         buffer = packet;
 
-        netDevice = GetInboundNetDevice(device);
-        if (!netDevice) {
+        net_device = get_inbound_net_device(device);
+        if (!net_device) {
                 DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
-                           "ignoring inbound packets", netDevice);
+                           "ignoring inbound packets", net_device);
                 goto out;
         }
 
         do {
                 ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
-                                           &bytesRecvd, &requestId);
+                                           &bytes_recvd, &request_id);
                 if (ret == 0) {
-                        if (bytesRecvd > 0) {
+                        if (bytes_recvd > 0) {
                                 DPRINT_DBG(NETVSC, "receive %d bytes, tid %llx",
-                                           bytesRecvd, requestId);
+                                           bytes_recvd, request_id);
 
                                 desc = (struct vmpacket_descriptor *)buffer;
                                 switch (desc->Type) {
                                 case VmbusPacketTypeCompletion:
-                                        NetVscOnSendCompletion(device, desc);
+                                        netvsc_send_completion(device, desc);
                                         break;
 
                                 case VmbusPacketTypeDataUsingTransferPages:
-                                        NetVscOnReceive(device, desc);
+                                        netvsc_receive(device, desc);
                                         break;
 
                                 default:
                                         DPRINT_ERR(NETVSC,
                                                    "unhandled packet type %d, "
                                                    "tid %llx len %d\n",
-                                                   desc->Type, requestId,
-                                                   bytesRecvd);
+                                                   desc->Type, request_id,
+                                                   bytes_recvd);
                                         break;
                                 }
 
@@ -1293,20 +1336,20 @@ static void NetVscOnChannelCallback(void *Context)
                         }
                 } else if (ret == -2) {
                         /* Handle large packet */
-                        buffer = kmalloc(bytesRecvd, GFP_ATOMIC);
+                        buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
                         if (buffer == NULL) {
                                 /* Try again next time around */
                                 DPRINT_ERR(NETVSC,
                                            "unable to allocate buffer of size "
-                                           "(%d)!!", bytesRecvd);
+                                           "(%d)!!", bytes_recvd);
                                 break;
                         }
 
-                        bufferlen = bytesRecvd;
+                        bufferlen = bytes_recvd;
                 }
         } while (1);
 
-        PutNetDevice(device);
+        put_net_device(device);
 out:
         kfree(buffer);
         return;
diff --git a/drivers/staging/hv/netvsc.h b/drivers/staging/hv/netvsc.h
index c71dce5b3f7c..932a77ccdc04 100644
--- a/drivers/staging/hv/netvsc.h
+++ b/drivers/staging/hv/netvsc.h
@@ -38,48 +38,48 @@
 #define NVSP_MAX_PROTOCOL_VERSION       NVSP_PROTOCOL_VERSION_1
 
 enum {
-        NvspMessageTypeNone = 0,
+        NVSP_MSG_TYPE_NONE = 0,
 
         /* Init Messages */
-        NvspMessageTypeInit                     = 1,
-        NvspMessageTypeInitComplete             = 2,
+        NVSP_MSG_TYPE_INIT                      = 1,
+        NVSP_MSG_TYPE_INIT_COMPLETE             = 2,
 
-        NvspVersionMessageStart                 = 100,
+        NVSP_VERSION_MSG_START                  = 100,
 
         /* Version 1 Messages */
-        NvspMessage1TypeSendNdisVersion         = NvspVersionMessageStart,
+        NVSP_MSG1_TYPE_SEND_NDIS_VER            = NVSP_VERSION_MSG_START,
 
-        NvspMessage1TypeSendReceiveBuffer,
-        NvspMessage1TypeSendReceiveBufferComplete,
-        NvspMessage1TypeRevokeReceiveBuffer,
+        NVSP_MSG1_TYPE_SEND_RECV_BUF,
+        NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE,
+        NVSP_MSG1_TYPE_REVOKE_RECV_BUF,
 
-        NvspMessage1TypeSendSendBuffer,
-        NvspMessage1TypeSendSendBufferComplete,
-        NvspMessage1TypeRevokeSendBuffer,
+        NVSP_MSG1_TYPE_SEND_SEND_BUF,
+        NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE,
+        NVSP_MSG1_TYPE_REVOKE_SEND_BUF,
 
-        NvspMessage1TypeSendRNDISPacket,
-        NvspMessage1TypeSendRNDISPacketComplete,
+        NVSP_MSG1_TYPE_SEND_RNDIS_PKT,
+        NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE,
 
         /*
          * This should be set to the number of messages for the version with
          * the maximum number of messages.
          */
-        NvspNumMessagePerVersion                = 9,
+        NVSP_NUM_MSG_PER_VERSION                = 9,
 };
 
 enum {
-        NvspStatusNone = 0,
-        NvspStatusSuccess,
-        NvspStatusFailure,
-        NvspStatusProtocolVersionRangeTooNew,
-        NvspStatusProtocolVersionRangeTooOld,
-        NvspStatusInvalidRndisPacket,
-        NvspStatusBusy,
-        NvspStatusMax,
+        NVSP_STAT_NONE = 0,
+        NVSP_STAT_SUCCESS,
+        NVSP_STAT_FAIL,
+        NVSP_STAT_PROTOCOL_TOO_NEW,
+        NVSP_STAT_PROTOCOL_TOO_OLD,
+        NVSP_STAT_INVALID_RNDIS_PKT,
+        NVSP_STAT_BUSY,
+        NVSP_STAT_MAX,
 };
 
 struct nvsp_message_header {
-        u32 MessageType;
+        u32 msg_type;
 };
 
 /* Init Messages */
@@ -90,8 +90,8 @@ struct nvsp_message_header {
  * versioning (i.e. this message will be the same for ever).
  */
 struct nvsp_message_init {
-        u32 MinProtocolVersion;
-        u32 MaxProtocolVersion;
+        u32 min_protocol_ver;
+        u32 max_protocol_ver;
 } __attribute__((packed));
 
 /*
@@ -100,14 +100,14 @@ struct nvsp_message_init {
  * (i.e. this message will be the same for ever).
  */
 struct nvsp_message_init_complete {
-        u32 NegotiatedProtocolVersion;
-        u32 MaximumMdlChainLength;
-        u32 Status;
+        u32 negotiated_protocol_ver;
+        u32 max_mdl_chain_len;
+        u32 status;
 } __attribute__((packed));
 
 union nvsp_message_init_uber {
-        struct nvsp_message_init Init;
-        struct nvsp_message_init_complete InitComplete;
+        struct nvsp_message_init init;
+        struct nvsp_message_init_complete init_complete;
 } __attribute__((packed));
 
 /* Version 1 Messages */
@@ -117,8 +117,8 @@ union nvsp_message_init_uber {
  * can use this information when handling OIDs sent by the VSC.
  */
 struct nvsp_1_message_send_ndis_version {
-        u32 NdisMajorVersion;
-        u32 NdisMinorVersion;
+        u32 ndis_major_ver;
+        u32 ndis_minor_ver;
 } __attribute__((packed));
 
 /*
@@ -126,15 +126,15 @@ struct nvsp_1_message_send_ndis_version {
  * can then use the receive buffer to send data to the VSC.
  */
 struct nvsp_1_message_send_receive_buffer {
-        u32 GpadlHandle;
-        u16 Id;
+        u32 gpadl_handle;
+        u16 id;
 } __attribute__((packed));
 
 struct nvsp_1_receive_buffer_section {
-        u32 Offset;
-        u32 SubAllocationSize;
-        u32 NumSubAllocations;
-        u32 EndOffset;
+        u32 offset;
+        u32 sub_alloc_size;
+        u32 num_sub_allocs;
+        u32 end_offset;
 } __attribute__((packed));
 
 /*
@@ -143,8 +143,8 @@ struct nvsp_1_receive_buffer_section {
  * buffer.
  */
 struct nvsp_1_message_send_receive_buffer_complete {
-        u32 Status;
-        u32 NumSections;
+        u32 status;
+        u32 num_sections;
 
         /*
          * The receive buffer is split into two parts, a large suballocation
@@ -165,7 +165,7 @@ struct nvsp_1_message_send_receive_buffer_complete {
          *  LargeOffset                            SmallOffset
          */
 
-        struct nvsp_1_receive_buffer_section Sections[1];
+        struct nvsp_1_receive_buffer_section sections[1];
 } __attribute__((packed));
 
 /*
@@ -174,7 +174,7 @@ struct nvsp_1_message_send_receive_buffer_complete {
  * again.
  */
 struct nvsp_1_message_revoke_receive_buffer {
-        u16 Id;
+        u16 id;
 };
 
 /*
@@ -182,8 +182,8 @@ struct nvsp_1_message_revoke_receive_buffer {
  * can then use the send buffer to send data to the VSP.
  */
 struct nvsp_1_message_send_send_buffer {
-        u32 GpadlHandle;
-        u16 Id;
+        u32 gpadl_handle;
+        u16 id;
 } __attribute__((packed));
 
 /*
@@ -192,7 +192,7 @@ struct nvsp_1_message_send_send_buffer {
  * buffer.
  */
 struct nvsp_1_message_send_send_buffer_complete {
-        u32 Status;
+        u32 status;
 
         /*
          * The VSC gets to choose the size of the send buffer and the VSP gets
@@ -200,7 +200,7 @@ struct nvsp_1_message_send_send_buffer_complete {
          * dynamic reconfigurations when the cost of GPA-direct buffers
          * decreases.
          */
-        u32 SectionSize;
+        u32 section_size;
 } __attribute__((packed));
 
 /*
@@ -208,7 +208,7 @@ struct nvsp_1_message_send_send_buffer_complete {
  * completes this transaction, the vsp should never use the send buffer again.
  */
 struct nvsp_1_message_revoke_send_buffer {
-        u16 Id;
+        u16 id;
 };
 
 /*
@@ -221,7 +221,7 @@ struct nvsp_1_message_send_rndis_packet {
          * channels of communication. However, the Network VSP only has one.
          * Therefore, the channel travels with the RNDIS packet.
          */
-        u32 ChannelType;
+        u32 channel_type;
 
         /*
          * This field is used to send part or all of the data through a send
@@ -229,8 +229,8 @@ struct nvsp_1_message_send_rndis_packet {
          * index is 0xFFFFFFFF, then the send buffer is not being used and all
          * of the data was sent through other VMBus mechanisms.
          */
-        u32 SendBufferSectionIndex;
-        u32 SendBufferSectionSize;
+        u32 send_buf_section_index;
+        u32 send_buf_section_size;
 } __attribute__((packed));
 
 /*
@@ -239,35 +239,35 @@ struct nvsp_1_message_send_rndis_packet {
  * message cannot use any resources associated with the original RNDIS packet.
  */
 struct nvsp_1_message_send_rndis_packet_complete {
-        u32 Status;
+        u32 status;
 };
 
 union nvsp_1_message_uber {
-        struct nvsp_1_message_send_ndis_version SendNdisVersion;
+        struct nvsp_1_message_send_ndis_version send_ndis_ver;
 
-        struct nvsp_1_message_send_receive_buffer SendReceiveBuffer;
+        struct nvsp_1_message_send_receive_buffer send_recv_buf;
         struct nvsp_1_message_send_receive_buffer_complete
-                                                SendReceiveBufferComplete;
-        struct nvsp_1_message_revoke_receive_buffer RevokeReceiveBuffer;
+                                                send_recv_buf_complete;
+        struct nvsp_1_message_revoke_receive_buffer revoke_recv_buf;
 
-        struct nvsp_1_message_send_send_buffer SendSendBuffer;
-        struct nvsp_1_message_send_send_buffer_complete SendSendBufferComplete;
-        struct nvsp_1_message_revoke_send_buffer RevokeSendBuffer;
+        struct nvsp_1_message_send_send_buffer send_send_buf;
+        struct nvsp_1_message_send_send_buffer_complete send_send_buf_complete;
+        struct nvsp_1_message_revoke_send_buffer revoke_send_buf;
 
-        struct nvsp_1_message_send_rndis_packet SendRNDISPacket;
+        struct nvsp_1_message_send_rndis_packet send_rndis_pkt;
         struct nvsp_1_message_send_rndis_packet_complete
-                                                SendRNDISPacketComplete;
+                                                send_rndis_pkt_complete;
 } __attribute__((packed));
 
 union nvsp_all_messages {
-        union nvsp_message_init_uber InitMessages;
-        union nvsp_1_message_uber Version1Messages;
+        union nvsp_message_init_uber init_msg;
+        union nvsp_1_message_uber v1_msg;
 } __attribute__((packed));
 
 /* ALL Messages */
 struct nvsp_message {
-        struct nvsp_message_header Header;
-        union nvsp_all_messages Messages;
+        struct nvsp_message_header hdr;
+        union nvsp_all_messages msg;
 } __attribute__((packed));
 
 
@@ -293,39 +293,39 @@ struct nvsp_message {
 
 /* Per netvsc channel-specific */
 struct netvsc_device {
-        struct hv_device *Device;
+        struct hv_device *dev;
 
-        atomic_t RefCount;
-        atomic_t NumOutstandingSends;
+        atomic_t refcnt;
+        atomic_t num_outstanding_sends;
         /*
          * List of free preallocated hv_netvsc_packet to represent receive
          * packet
          */
-        struct list_head ReceivePacketList;
-        spinlock_t receive_packet_list_lock;
+        struct list_head recv_pkt_list;
+        spinlock_t recv_pkt_list_lock;
 
         /* Send buffer allocated by us but manages by NetVSP */
-        void *SendBuffer;
-        u32 SendBufferSize;
-        u32 SendBufferGpadlHandle;
-        u32 SendSectionSize;
+        void *send_buf;
+        u32 send_buf_size;
+        u32 send_buf_gpadl_handle;
+        u32 send_section_size;
 
         /* Receive buffer allocated by us but manages by NetVSP */
-        void *ReceiveBuffer;
-        u32 ReceiveBufferSize;
-        u32 ReceiveBufferGpadlHandle;
-        u32 ReceiveSectionCount;
-        struct nvsp_1_receive_buffer_section *ReceiveSections;
+        void *recv_buf;
+        u32 recv_buf_size;
+        u32 recv_buf_gpadl_handle;
+        u32 recv_section_cnt;
+        struct nvsp_1_receive_buffer_section *recv_section;
 
         /* Used for NetVSP initialization protocol */
-        struct osd_waitevent *ChannelInitEvent;
-        struct nvsp_message ChannelInitPacket;
+        struct osd_waitevent *channel_init_event;
+        struct nvsp_message channel_init_pkt;
 
-        struct nvsp_message RevokePacket;
+        struct nvsp_message revoke_packet;
         /* unsigned char HwMacAddr[HW_MACADDR_LEN]; */
 
         /* Holds rndis device info */
-        void *Extension;
+        void *extension;
 };
 
 #endif /* _NETVSC_H_ */
diff --git a/drivers/staging/hv/netvsc_api.h b/drivers/staging/hv/netvsc_api.h
index 4b5b3ac458c8..b4bed3636594 100644
--- a/drivers/staging/hv/netvsc_api.h
+++ b/drivers/staging/hv/netvsc_api.h
@@ -32,10 +32,10 @@ struct hv_netvsc_packet;
 
 /* Represent the xfer page packet which contains 1 or more netvsc packet */
 struct xferpage_packet {
-        struct list_head ListEntry;
+        struct list_head list_ent;
 
         /* # of netvsc packets this xfer packet contains */
-        u32 Count;
+        u32 count;
 };
 
 /* The number of pages which are enough to cover jumbo frame buffer. */
@@ -47,70 +47,70 @@ struct xferpage_packet {
  */
 struct hv_netvsc_packet {
         /* Bookkeeping stuff */
-        struct list_head ListEntry;
+        struct list_head list_ent;
 
-        struct hv_device *Device;
-        bool IsDataPacket;
+        struct hv_device *device;
+        bool is_data_pkt;
 
         /*
          * Valid only for receives when we break a xfer page packet
          * into multiple netvsc packets
          */
-        struct xferpage_packet *XferPagePacket;
+        struct xferpage_packet *xfer_page_pkt;
 
         union {
                 struct{
-                        u64 ReceiveCompletionTid;
-                        void *ReceiveCompletionContext;
-                        void (*OnReceiveCompletion)(void *context);
-                } Recv;
+                        u64 recv_completion_tid;
+                        void *recv_completion_ctx;
+                        void (*recv_completion)(void *context);
+                } recv;
                 struct{
-                        u64 SendCompletionTid;
-                        void *SendCompletionContext;
-                        void (*OnSendCompletion)(void *context);
-                } Send;
-        } Completion;
+                        u64 send_completion_tid;
+                        void *send_completion_ctx;
+                        void (*send_completion)(void *context);
+                } send;
+        } completion;
 
-        /* This points to the memory after PageBuffers */
-        void *Extension;
+        /* This points to the memory after page_buf */
+        void *extension;
 
-        u32 TotalDataBufferLength;
+        u32 total_data_buflen;
         /* Points to the send/receive buffer where the ethernet frame is */
-        u32 PageBufferCount;
-        struct hv_page_buffer PageBuffers[NETVSC_PACKET_MAXPAGE];
+        u32 page_buf_cnt;
+        struct hv_page_buffer page_buf[NETVSC_PACKET_MAXPAGE];
 };
 
 /* Represents the net vsc driver */
 struct netvsc_driver {
         /* Must be the first field */
         /* Which is a bug FIXME! */
-        struct hv_driver Base;
+        struct hv_driver base;
 
-        u32 RingBufferSize;
-        u32 RequestExtSize;
+        u32 ring_buf_size;
+        u32 req_ext_size;
 
         /*
          * This is set by the caller to allow us to callback when we
          * receive a packet from the "wire"
          */
-        int (*OnReceiveCallback)(struct hv_device *dev,
+        int (*recv_cb)(struct hv_device *dev,
                                  struct hv_netvsc_packet *packet);
-        void (*OnLinkStatusChanged)(struct hv_device *dev, u32 Status);
+        void (*link_status_change)(struct hv_device *dev, u32 status);
 
         /* Specific to this driver */
-        int (*OnSend)(struct hv_device *dev, struct hv_netvsc_packet *packet);
+        int (*send)(struct hv_device *dev, struct hv_netvsc_packet *packet);
 
-        void *Context;
+        void *ctx;
 };
 
 struct netvsc_device_info {
-    unsigned char MacAddr[6];
-    bool LinkState;     /* 0 - link up, 1 - link down */
+        unsigned char mac_adr[6];
+        bool link_state;        /* 0 - link up, 1 - link down */
 };
 
 /* Interface */
-int NetVscInitialize(struct hv_driver *drv);
-int RndisFilterOnOpen(struct hv_device *Device);
-int RndisFilterOnClose(struct hv_device *Device);
+int netvsc_initialize(struct hv_driver *drv);
+int rndis_filter_open(struct hv_device *dev);
+int rndis_filter_close(struct hv_device *dev);
 
 #endif /* _NETVSC_API_H_ */
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 141535295a41..0147b407512c 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -66,6 +66,9 @@ MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
 /* The one and only one */
 static struct netvsc_driver_context g_netvsc_drv;
 
+/* no-op so the netdev core doesn't return -EINVAL when modifying the the
+ * multicast address list in SIOCADDMULTI. hv is setup to get all multicast
+ * when it calls RndisFilterOnOpen() */
 static void netvsc_set_multicast_list(struct net_device *net)
 {
 }
@@ -78,7 +81,7 @@ static int netvsc_open(struct net_device *net)
 
         if (netif_carrier_ok(net)) {
                 /* Open up the device */
-                ret = RndisFilterOnOpen(device_obj);
+                ret = rndis_filter_open(device_obj);
                 if (ret != 0) {
                         DPRINT_ERR(NETVSC_DRV,
                                    "unable to open device (ret %d).", ret);
@@ -101,7 +104,7 @@ static int netvsc_close(struct net_device *net)
 
         netif_stop_queue(net);
 
-        ret = RndisFilterOnClose(device_obj);
+        ret = rndis_filter_close(device_obj);
         if (ret != 0)
                 DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret);
 
@@ -112,7 +115,7 @@ static void netvsc_xmit_completion(void *context)
 {
         struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
         struct sk_buff *skb = (struct sk_buff *)
-                (unsigned long)packet->Completion.Send.SendCompletionTid;
+                (unsigned long)packet->completion.send.send_completion_tid;
 
         kfree(packet);
 
@@ -151,7 +154,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         /* Allocate a netvsc packet based on # of frags. */
         packet = kzalloc(sizeof(struct hv_netvsc_packet) +
                          (num_pages * sizeof(struct hv_page_buffer)) +
-                         net_drv_obj->RequestExtSize, GFP_ATOMIC);
+                         net_drv_obj->req_ext_size, GFP_ATOMIC);
         if (!packet) {
                 /* out of memory, silently drop packet */
                 DPRINT_ERR(NETVSC_DRV, "unable to allocate hv_netvsc_packet");
@@ -161,40 +164,40 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                 return NETDEV_TX_OK;
         }
 
-        packet->Extension = (void *)(unsigned long)packet +
+        packet->extension = (void *)(unsigned long)packet +
                                 sizeof(struct hv_netvsc_packet) +
                                     (num_pages * sizeof(struct hv_page_buffer));
 
         /* Setup the rndis header */
-        packet->PageBufferCount = num_pages;
+        packet->page_buf_cnt = num_pages;
 
         /* TODO: Flush all write buffers/ memory fence ??? */
         /* wmb(); */
 
         /* Initialize it from the skb */
-        packet->TotalDataBufferLength   = skb->len;
+        packet->total_data_buflen       = skb->len;
 
         /* Start filling in the page buffers starting after RNDIS buffer. */
-        packet->PageBuffers[1].Pfn = virt_to_phys(skb->data) >> PAGE_SHIFT;
-        packet->PageBuffers[1].Offset
+        packet->page_buf[1].Pfn = virt_to_phys(skb->data) >> PAGE_SHIFT;
+        packet->page_buf[1].Offset
                 = (unsigned long)skb->data & (PAGE_SIZE - 1);
-        packet->PageBuffers[1].Length = skb_headlen(skb);
+        packet->page_buf[1].Length = skb_headlen(skb);
 
         /* Additional fragments are after SKB data */
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 skb_frag_t *f = &skb_shinfo(skb)->frags[i];
 
-                packet->PageBuffers[i+2].Pfn = page_to_pfn(f->page);
-                packet->PageBuffers[i+2].Offset = f->page_offset;
-                packet->PageBuffers[i+2].Length = f->size;
+                packet->page_buf[i+2].Pfn = page_to_pfn(f->page);
+                packet->page_buf[i+2].Offset = f->page_offset;
+                packet->page_buf[i+2].Length = f->size;
         }
 
         /* Set the completion routine */
-        packet->Completion.Send.OnSendCompletion = netvsc_xmit_completion;
-        packet->Completion.Send.SendCompletionContext = packet;
-        packet->Completion.Send.SendCompletionTid = (unsigned long)skb;
+        packet->completion.send.send_completion = netvsc_xmit_completion;
+        packet->completion.send.send_completion_ctx = packet;
+        packet->completion.send.send_completion_tid = (unsigned long)skb;
 
-        ret = net_drv_obj->OnSend(&net_device_ctx->device_ctx->device_obj,
+        ret = net_drv_obj->send(&net_device_ctx->device_ctx->device_obj,
                                   packet);
         if (ret == 0) {
                 net->stats.tx_bytes += skb->len;
@@ -260,7 +263,7 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
         }
 
         /* Allocate a skb - TODO direct I/O to pages? */
-        skb = netdev_alloc_skb_ip_align(net, packet->TotalDataBufferLength);
+        skb = netdev_alloc_skb_ip_align(net, packet->total_data_buflen);
         if (unlikely(!skb)) {
                 ++net->stats.rx_dropped;
                 return 0;
@@ -273,17 +276,17 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
          * Copy to skb. This copy is needed here since the memory pointed by
          * hv_netvsc_packet cannot be deallocated
          */
-        for (i = 0; i < packet->PageBufferCount; i++) {
-                data = kmap_atomic(pfn_to_page(packet->PageBuffers[i].Pfn),
+        for (i = 0; i < packet->page_buf_cnt; i++) {
+                data = kmap_atomic(pfn_to_page(packet->page_buf[i].Pfn),
                                                KM_IRQ1);
                 data = (void *)(unsigned long)data +
-                                packet->PageBuffers[i].Offset;
+                                packet->page_buf[i].Offset;
 
-                memcpy(skb_put(skb, packet->PageBuffers[i].Length), data,
-                       packet->PageBuffers[i].Length);
+                memcpy(skb_put(skb, packet->page_buf[i].Length), data,
+                       packet->page_buf[i].Length);
 
                 kunmap_atomic((void *)((unsigned long)data -
-                                       packet->PageBuffers[i].Offset), KM_IRQ1);
+                                       packet->page_buf[i].Offset), KM_IRQ1);
         }
 
         local_irq_restore(flags);
@@ -346,7 +349,7 @@ static int netvsc_probe(struct device *device)
         struct netvsc_device_info device_info;
         int ret;
 
-        if (!net_drv_obj->Base.OnDeviceAdd)
+        if (!net_drv_obj->base.OnDeviceAdd)
                 return -1;
 
         net = alloc_etherdev(sizeof(struct net_device_context));
@@ -363,7 +366,7 @@ static int netvsc_probe(struct device *device)
         dev_set_drvdata(device, net);
 
         /* Notify the netvsc driver of the new device */
-        ret = net_drv_obj->Base.OnDeviceAdd(device_obj, &device_info);
+        ret = net_drv_obj->base.OnDeviceAdd(device_obj, &device_info);
         if (ret != 0) {
                 free_netdev(net);
                 dev_set_drvdata(device, NULL);
@@ -382,10 +385,10 @@ static int netvsc_probe(struct device *device)
          * out of sync with the device's link status
          */
         if (!netif_carrier_ok(net))
-                if (!device_info.LinkState)
+                if (!device_info.link_state)
                         netif_carrier_on(net);
 
-        memcpy(net->dev_addr, device_info.MacAddr, ETH_ALEN);
+        memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
 
         net->netdev_ops = &device_ops;
 
@@ -398,7 +401,7 @@ static int netvsc_probe(struct device *device)
         ret = register_netdev(net);
         if (ret != 0) {
                 /* Remove the device and release the resource */
-                net_drv_obj->Base.OnDeviceRemove(device_obj);
+                net_drv_obj->base.OnDeviceRemove(device_obj);
                 free_netdev(net);
         }
 
@@ -422,7 +425,7 @@ static int netvsc_remove(struct device *device)
                 return 0;
         }
 
-        if (!net_drv_obj->Base.OnDeviceRemove)
+        if (!net_drv_obj->base.OnDeviceRemove)
                 return -1;
 
         /* Stop outbound asap */
@@ -435,7 +438,7 @@ static int netvsc_remove(struct device *device)
          * Call to the vsc driver to let it know that the device is being
          * removed
          */
-        ret = net_drv_obj->Base.OnDeviceRemove(device_obj);
+        ret = net_drv_obj->base.OnDeviceRemove(device_obj);
         if (ret != 0) {
                 /* TODO: */
                 DPRINT_ERR(NETVSC, "unable to remove vsc device (ret %d)", ret);
@@ -481,8 +484,8 @@ static void netvsc_drv_exit(void)
                 device_unregister(current_dev);
         }
 
-        if (netvsc_drv_obj->Base.OnCleanup)
-                netvsc_drv_obj->Base.OnCleanup(&netvsc_drv_obj->Base);
+        if (netvsc_drv_obj->base.OnCleanup)
+                netvsc_drv_obj->base.OnCleanup(&netvsc_drv_obj->base);
 
         vmbus_child_driver_unregister(drv_ctx);
 
@@ -495,15 +498,15 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct driver_context *drv_ctx = &g_netvsc_drv.drv_ctx;
         int ret;
 
-        net_drv_obj->RingBufferSize = ring_size * PAGE_SIZE;
-        net_drv_obj->OnReceiveCallback = netvsc_recv_callback;
-        net_drv_obj->OnLinkStatusChanged = netvsc_linkstatus_callback;
+        net_drv_obj->ring_buf_size = ring_size * PAGE_SIZE;
+        net_drv_obj->recv_cb = netvsc_recv_callback;
+        net_drv_obj->link_status_change = netvsc_linkstatus_callback;
 
         /* Callback to client driver to complete the initialization */
-        drv_init(&net_drv_obj->Base);
+        drv_init(&net_drv_obj->base);
 
-        drv_ctx->driver.name = net_drv_obj->Base.name;
-        memcpy(&drv_ctx->class_id, &net_drv_obj->Base.deviceType,
+        drv_ctx->driver.name = net_drv_obj->base.name;
+        memcpy(&drv_ctx->class_id, &net_drv_obj->base.deviceType,
                sizeof(struct hv_guid));
 
         drv_ctx->probe = netvsc_probe;
@@ -536,7 +539,7 @@ static int __init netvsc_init(void)
         if (!dmi_check_system(hv_netvsc_dmi_table))
                 return -ENODEV;
 
-        return netvsc_drv_init(NetVscInitialize);
+        return netvsc_drv_init(netvsc_initialize);
 }
 
 static void __exit netvsc_exit(void)
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 8c3eb278a81f..b5a3940331b3 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -43,13 +43,7 @@
 #include <linux/slab.h>
 #include "osd.h"
 
-struct osd_callback_struct {
-        struct work_struct work;
-        void (*callback)(void *);
-        void *data;
-};
-
-void *osd_VirtualAllocExec(unsigned int size)
+void *osd_virtual_alloc_exec(unsigned int size)
 {
 #ifdef __x86_64__
         return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL_EXEC);
@@ -60,7 +54,7 @@ void *osd_VirtualAllocExec(unsigned int size)
 }
 
 /**
- * osd_PageAlloc() - Allocate pages
+ * osd_page_alloc() - Allocate pages
  * @count:      Total number of Kernel pages you want to allocate
  *
  * Tries to allocate @count number of consecutive free kernel pages.
@@ -68,7 +62,7 @@ void *osd_VirtualAllocExec(unsigned int size)
  * If successfull it will return pointer to the @count pages.
  * Mainly used by Hyper-V drivers.
  */
-void *osd_PageAlloc(unsigned int count)
+void *osd_page_alloc(unsigned int count)
 {
         void *p;
 
@@ -85,26 +79,26 @@ void *osd_PageAlloc(unsigned int count)
         /* if (p) memset(p, 0, PAGE_SIZE); */
         /* return p; */
 }
-EXPORT_SYMBOL_GPL(osd_PageAlloc);
+EXPORT_SYMBOL_GPL(osd_page_alloc);
 
 /**
- * osd_PageFree() - Free pages
+ * osd_page_free() - Free pages
  * @page:       Pointer to the first page to be freed
  * @count:      Total number of Kernel pages you free
  *
- * Frees the pages allocated by osd_PageAlloc()
+ * Frees the pages allocated by osd_page_alloc()
  * Mainly used by Hyper-V drivers.
  */
-void osd_PageFree(void *page, unsigned int count)
+void osd_page_free(void *page, unsigned int count)
 {
         free_pages((unsigned long)page, get_order(count * PAGE_SIZE));
         /*struct page* p = virt_to_page(page);
         __free_page(p);*/
 }
-EXPORT_SYMBOL_GPL(osd_PageFree);
+EXPORT_SYMBOL_GPL(osd_page_free);
 
 /**
- * osd_WaitEventCreate() - Create the event queue
+ * osd_waitevent_create() - Create the event queue
  *
  * Allocates memory for a &struct osd_waitevent. And then calls
  * init_waitqueue_head to set up the wait queue for the event.
@@ -114,7 +108,7 @@ EXPORT_SYMBOL_GPL(osd_PageFree);
  * Returns pointer to &struct osd_waitevent
  * Mainly used by Hyper-V drivers.
  */
-struct osd_waitevent *osd_WaitEventCreate(void)
+struct osd_waitevent *osd_waitevent_create(void)
 {
         struct osd_waitevent *wait = kmalloc(sizeof(struct osd_waitevent),
                                              GFP_KERNEL);
@@ -125,14 +119,14 @@ struct osd_waitevent *osd_WaitEventCreate(void)
         init_waitqueue_head(&wait->event);
         return wait;
 }
-EXPORT_SYMBOL_GPL(osd_WaitEventCreate);
+EXPORT_SYMBOL_GPL(osd_waitevent_create);
 
 
 /**
- * osd_WaitEventSet() - Wake up the process
- * @waitEvent: Structure to event to be woken up
+ * osd_waitevent_set() - Wake up the process
+ * @wait_event: Structure to event to be woken up
  *
- * @waitevent is of type &struct osd_waitevent
+ * @wait_event is of type &struct osd_waitevent
  *
  * Wake up the sleeping process so it can do some work.
  * And set condition indicator in &struct osd_waitevent to indicate
@@ -140,18 +134,18 @@ EXPORT_SYMBOL_GPL(osd_WaitEventCreate);
  *
  * Only used by Network and Storage Hyper-V drivers.
  */
-void osd_WaitEventSet(struct osd_waitevent *waitEvent)
+void osd_waitevent_set(struct osd_waitevent *wait_event)
 {
-        waitEvent->condition = 1;
-        wake_up_interruptible(&waitEvent->event);
+        wait_event->condition = 1;
+        wake_up_interruptible(&wait_event->event);
 }
-EXPORT_SYMBOL_GPL(osd_WaitEventSet);
+EXPORT_SYMBOL_GPL(osd_waitevent_set);
 
 /**
- * osd_WaitEventWait() - Wait for event till condition is true
- * @waitEvent: Structure to event to be put to sleep
+ * osd_waitevent_wait() - Wait for event till condition is true
+ * @wait_event: Structure to event to be put to sleep
  *
- * @waitevent is of type &struct osd_waitevent
+ * @wait_event is of type &struct osd_waitevent
  *
  * Set up the process to sleep until waitEvent->condition get true.
  * And set condition indicator in &struct osd_waitevent to indicate
@@ -161,25 +155,25 @@ EXPORT_SYMBOL_GPL(osd_WaitEventSet);
  *
  * Mainly used by Hyper-V drivers.
  */
-int osd_WaitEventWait(struct osd_waitevent *waitEvent)
+int osd_waitevent_wait(struct osd_waitevent *wait_event)
 {
         int ret = 0;
 
-        ret = wait_event_interruptible(waitEvent->event,
-                                       waitEvent->condition);
-        waitEvent->condition = 0;
+        ret = wait_event_interruptible(wait_event->event,
+                                       wait_event->condition);
+        wait_event->condition = 0;
         return ret;
 }
-EXPORT_SYMBOL_GPL(osd_WaitEventWait);
+EXPORT_SYMBOL_GPL(osd_waitevent_wait);
 
 /**
- * osd_WaitEventWaitEx() - Wait for event or timeout for process wakeup
- * @waitEvent: Structure to event to be put to sleep
- * @TimeoutInMs:       Total number of Milliseconds to wait before waking up
+ * osd_waitevent_waitex() - Wait for event or timeout for process wakeup
+ * @wait_event: Structure to event to be put to sleep
+ * @timeout_in_ms:       Total number of Milliseconds to wait before waking up
  *
- * @waitevent is of type &struct osd_waitevent
+ * @wait_event is of type &struct osd_waitevent
  * Set up the process to sleep until @waitEvent->condition get true or
- * @TimeoutInMs (Time out in Milliseconds) has been reached.
+ * @timeout_in_ms (Time out in Milliseconds) has been reached.
  * And set condition indicator in &struct osd_waitevent to indicate
  * the process is in a sleeping state.
  *
@@ -187,42 +181,14 @@ EXPORT_SYMBOL_GPL(osd_WaitEventWait);
  *
  * Mainly used by Hyper-V drivers.
  */
-int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs)
+int osd_waitevent_waitex(struct osd_waitevent *wait_event, u32 timeout_in_ms)
 {
         int ret = 0;
 
-        ret = wait_event_interruptible_timeout(waitEvent->event,
-                                               waitEvent->condition,
-                                               msecs_to_jiffies(TimeoutInMs));
-        waitEvent->condition = 0;
+        ret = wait_event_interruptible_timeout(wait_event->event,
+                                               wait_event->condition,
+                                               msecs_to_jiffies(timeout_in_ms));
+        wait_event->condition = 0;
         return ret;
 }
-EXPORT_SYMBOL_GPL(osd_WaitEventWaitEx);
-
-static void osd_callback_work(struct work_struct *work)
-{
-        struct osd_callback_struct *cb = container_of(work,
-                                                struct osd_callback_struct,
-                                                work);
-        (cb->callback)(cb->data);
-        kfree(cb);
-}
-
-int osd_schedule_callback(struct workqueue_struct *wq,
-                          void (*func)(void *),
-                          void *data)
-{
-        struct osd_callback_struct *cb;
-
-        cb = kmalloc(sizeof(*cb), GFP_KERNEL);
-        if (!cb) {
-                printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");
-                return -1;
-        }
-
-        cb->callback = func;
-        cb->data = data;
-        INIT_WORK(&cb->work, osd_callback_work);
-        return queue_work(wq, &cb->work);
-}
-
+EXPORT_SYMBOL_GPL(osd_waitevent_waitex);
diff --git a/drivers/staging/hv/osd.h b/drivers/staging/hv/osd.h
index ce064e8ea644..870ef0768833 100644
--- a/drivers/staging/hv/osd.h
+++ b/drivers/staging/hv/osd.h
@@ -50,21 +50,17 @@ struct osd_waitevent {
 
 /* Osd routines */
 
-extern void *osd_VirtualAllocExec(unsigned int size);
+extern void *osd_virtual_alloc_exec(unsigned int size);
 
-extern void *osd_PageAlloc(unsigned int count);
-extern void osd_PageFree(void *page, unsigned int count);
+extern void *osd_page_alloc(unsigned int count);
+extern void osd_page_free(void *page, unsigned int count);
 
-extern struct osd_waitevent *osd_WaitEventCreate(void);
-extern void osd_WaitEventSet(struct osd_waitevent *waitEvent);
-extern int osd_WaitEventWait(struct osd_waitevent *waitEvent);
+extern struct osd_waitevent *osd_waitevent_create(void);
+extern void osd_waitevent_set(struct osd_waitevent *wait_event);
+extern int osd_waitevent_wait(struct osd_waitevent *wait_event);
 
-/* If >0, waitEvent got signaled. If ==0, timeout. If < 0, error */
-extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent,
-                               u32 TimeoutInMs);
-
-int osd_schedule_callback(struct workqueue_struct *wq,
-                          void (*func)(void *),
-                          void *data);
+/* If >0, wait_event got signaled. If ==0, timeout. If < 0, error */
+extern int osd_waitevent_waitex(struct osd_waitevent *wait_event,
+                               u32 timeout_in_ms);
 
 #endif /* _OSD_H_ */
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index d78c569ac94a..4d53392f1e60 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -38,7 +38,7 @@
 /*++
 
 Name:
-        GetRingBufferAvailBytes()
+        get_ringbuffer_availbytes()
 
 Description:
         Get number of bytes available to read and to write to
@@ -46,33 +46,34 @@ Description:
 
 --*/
 static inline void
-GetRingBufferAvailBytes(struct hv_ring_buffer_info *rbi, u32 *read, u32 *write)
+get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
+                          u32 *read, u32 *write)
 {
         u32 read_loc, write_loc;
 
         /* Capture the read/write indices before they changed */
-        read_loc = rbi->RingBuffer->ReadIndex;
-        write_loc = rbi->RingBuffer->WriteIndex;
+        read_loc = rbi->ring_buffer->read_index;
+        write_loc = rbi->ring_buffer->write_index;
 
-        *write = BYTES_AVAIL_TO_WRITE(read_loc, write_loc, rbi->RingDataSize);
-        *read = rbi->RingDataSize - *write;
+        *write = BYTES_AVAIL_TO_WRITE(read_loc, write_loc, rbi->ring_datasize);
+        *read = rbi->ring_datasize - *write;
 }
 
 /*++
 
 Name:
-        GetNextWriteLocation()
+        get_next_write_location()
 
 Description:
         Get the next write location for the specified ring buffer
 
 --*/
 static inline u32
-GetNextWriteLocation(struct hv_ring_buffer_info *RingInfo)
+get_next_write_location(struct hv_ring_buffer_info *ring_info)
 {
-        u32 next = RingInfo->RingBuffer->WriteIndex;
+        u32 next = ring_info->ring_buffer->write_index;
 
-        /* ASSERT(next < RingInfo->RingDataSize); */
+        /* ASSERT(next < ring_info->RingDataSize); */
 
         return next;
 }
@@ -80,34 +81,34 @@ GetNextWriteLocation(struct hv_ring_buffer_info *RingInfo)
 /*++
 
 Name:
-        SetNextWriteLocation()
+        set_next_write_location()
 
 Description:
         Set the next write location for the specified ring buffer
 
 --*/
 static inline void
-SetNextWriteLocation(struct hv_ring_buffer_info *RingInfo,
-                     u32 NextWriteLocation)
+set_next_write_location(struct hv_ring_buffer_info *ring_info,
+                     u32 next_write_location)
 {
-        RingInfo->RingBuffer->WriteIndex = NextWriteLocation;
+        ring_info->ring_buffer->write_index = next_write_location;
 }
 
 /*++
 
 Name:
-        GetNextReadLocation()
+        get_next_read_location()
 
 Description:
         Get the next read location for the specified ring buffer
 
 --*/
 static inline u32
-GetNextReadLocation(struct hv_ring_buffer_info *RingInfo)
+get_next_read_location(struct hv_ring_buffer_info *ring_info)
 {
-        u32 next = RingInfo->RingBuffer->ReadIndex;
+        u32 next = ring_info->ring_buffer->read_index;
 
-        /* ASSERT(next < RingInfo->RingDataSize); */
+        /* ASSERT(next < ring_info->RingDataSize); */
 
         return next;
 }
@@ -115,7 +116,7 @@ GetNextReadLocation(struct hv_ring_buffer_info *RingInfo)
 /*++
 
 Name:
-        GetNextReadLocationWithOffset()
+        get_next_readlocation_withoffset()
 
 Description:
         Get the next read location + offset for the specified ring buffer.
@@ -123,13 +124,14 @@ Description:
 
 --*/
 static inline u32
-GetNextReadLocationWithOffset(struct hv_ring_buffer_info *RingInfo, u32 Offset)
+get_next_readlocation_withoffset(struct hv_ring_buffer_info *ring_info,
+                                 u32 offset)
 {
-        u32 next = RingInfo->RingBuffer->ReadIndex;
+        u32 next = ring_info->ring_buffer->read_index;
 
-        /* ASSERT(next < RingInfo->RingDataSize); */
-        next += Offset;
-        next %= RingInfo->RingDataSize;
+        /* ASSERT(next < ring_info->RingDataSize); */
+        next += offset;
+        next %= ring_info->ring_datasize;
 
         return next;
 }
@@ -137,141 +139,145 @@ GetNextReadLocationWithOffset(struct hv_ring_buffer_info *RingInfo, u32 Offset)
 /*++
 
 Name:
-        SetNextReadLocation()
+        set_next_read_location()
 
 Description:
         Set the next read location for the specified ring buffer
 
 --*/
 static inline void
-SetNextReadLocation(struct hv_ring_buffer_info *RingInfo, u32 NextReadLocation)
+set_next_read_location(struct hv_ring_buffer_info *ring_info,
+                    u32 next_read_location)
 {
-        RingInfo->RingBuffer->ReadIndex = NextReadLocation;
+        ring_info->ring_buffer->read_index = next_read_location;
 }
 
 
 /*++
 
 Name:
-        GetRingBuffer()
+        get_ring_buffer()
 
 Description:
         Get the start of the ring buffer
 
 --*/
 static inline void *
-GetRingBuffer(struct hv_ring_buffer_info *RingInfo)
+get_ring_buffer(struct hv_ring_buffer_info *ring_info)
 {
-        return (void *)RingInfo->RingBuffer->Buffer;
+        return (void *)ring_info->ring_buffer->buffer;
 }
 
 
 /*++
 
 Name:
-        GetRingBufferSize()
+        get_ring_buffersize()
 
 Description:
         Get the size of the ring buffer
 
 --*/
 static inline u32
-GetRingBufferSize(struct hv_ring_buffer_info *RingInfo)
+get_ring_buffersize(struct hv_ring_buffer_info *ring_info)
 {
-        return RingInfo->RingDataSize;
+        return ring_info->ring_datasize;
 }
 
 /*++
 
 Name:
-        GetRingBufferIndices()
+        get_ring_bufferindices()
 
 Description:
         Get the read and write indices as u64 of the specified ring buffer
 
 --*/
 static inline u64
-GetRingBufferIndices(struct hv_ring_buffer_info *RingInfo)
+get_ring_bufferindices(struct hv_ring_buffer_info *ring_info)
 {
-        return (u64)RingInfo->RingBuffer->WriteIndex << 32;
+        return (u64)ring_info->ring_buffer->write_index << 32;
 }
 
 
 /*++
 
 Name:
-        DumpRingInfo()
+        dump_ring_info()
 
 Description:
         Dump out to console the ring buffer info
 
 --*/
-void DumpRingInfo(struct hv_ring_buffer_info *RingInfo, char *Prefix)
+void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix)
 {
-        u32 bytesAvailToWrite;
-        u32 bytesAvailToRead;
+        u32 bytes_avail_towrite;
+        u32 bytes_avail_toread;
 
-        GetRingBufferAvailBytes(RingInfo,
-        &bytesAvailToRead,
-        &bytesAvailToWrite);
+        get_ringbuffer_availbytes(ring_info,
+        &bytes_avail_toread,
+        &bytes_avail_towrite);
 
         DPRINT(VMBUS,
                 DEBUG_RING_LVL,
                 "%s <<ringinfo %p buffer %p avail write %u "
                 "avail read %u read idx %u write idx %u>>",
-                Prefix,
-                RingInfo,
-                RingInfo->RingBuffer->Buffer,
-                bytesAvailToWrite,
-                bytesAvailToRead,
-                RingInfo->RingBuffer->ReadIndex,
-                RingInfo->RingBuffer->WriteIndex);
+                prefix,
+                ring_info,
+                ring_info->ring_buffer->buffer,
+                bytes_avail_towrite,
+                bytes_avail_toread,
+                ring_info->ring_buffer->read_index,
+                ring_info->ring_buffer->write_index);
 }
 
 
 /* Internal routines */
 
 static u32
-CopyToRingBuffer(
-        struct hv_ring_buffer_info      *RingInfo,
-        u32                             StartWriteOffset,
-        void                            *Src,
-        u32                             SrcLen);
+copyto_ringbuffer(
+        struct hv_ring_buffer_info      *ring_info,
+        u32                             start_write_offset,
+        void                            *src,
+        u32                             srclen);
 
 static u32
-CopyFromRingBuffer(
-        struct hv_ring_buffer_info      *RingInfo,
-        void                            *Dest,
-        u32                             DestLen,
-        u32                             StartReadOffset);
+copyfrom_ringbuffer(
+        struct hv_ring_buffer_info      *ring_info,
+        void                            *dest,
+        u32                             destlen,
+        u32                             start_read_offset);
 
 
 
 /*++
 
 Name:
-        RingBufferGetDebugInfo()
+        ringbuffer_get_debuginfo()
 
 Description:
         Get various debug metrics for the specified ring buffer
 
 --*/
-void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
+void ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,
                             struct hv_ring_buffer_debug_info *debug_info)
 {
-        u32 bytesAvailToWrite;
-        u32 bytesAvailToRead;
-
-        if (RingInfo->RingBuffer) {
-                GetRingBufferAvailBytes(RingInfo,
-                                        &bytesAvailToRead,
-                                        &bytesAvailToWrite);
-
-                debug_info->BytesAvailToRead = bytesAvailToRead;
-                debug_info->BytesAvailToWrite = bytesAvailToWrite;
-                debug_info->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex;
-                debug_info->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex;
-                debug_info->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask;
+        u32 bytes_avail_towrite;
+        u32 bytes_avail_toread;
+
+        if (ring_info->ring_buffer) {
+                get_ringbuffer_availbytes(ring_info,
+                                        &bytes_avail_toread,
+                                        &bytes_avail_towrite);
+
+                debug_info->bytes_avail_toread = bytes_avail_toread;
+                debug_info->bytes_avail_towrite = bytes_avail_towrite;
+                debug_info->current_read_index =
+                        ring_info->ring_buffer->read_index;
+                debug_info->current_write_index =
+                        ring_info->ring_buffer->write_index;
+                debug_info->current_interrupt_mask =
+                        ring_info->ring_buffer->interrupt_mask;
         }
 }
 
@@ -279,40 +285,42 @@ void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
 /*++
 
 Name:
-        GetRingBufferInterruptMask()
+        get_ringbuffer_interrupt_mask()
 
 Description:
         Get the interrupt mask for the specified ring buffer
 
 --*/
-u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *rbi)
+u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *rbi)
 {
-        return rbi->RingBuffer->InterruptMask;
+        return rbi->ring_buffer->interrupt_mask;
 }
 
 /*++
 
 Name:
-        RingBufferInit()
+        ringbuffer_init()
 
 Description:
         Initialize the ring buffer
 
 --*/
-int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 BufferLen)
+int ringbuffer_init(struct hv_ring_buffer_info *ring_info,
+                   void *buffer, u32 buflen)
 {
         if (sizeof(struct hv_ring_buffer) != PAGE_SIZE)
                 return -EINVAL;
 
-        memset(RingInfo, 0, sizeof(struct hv_ring_buffer_info));
+        memset(ring_info, 0, sizeof(struct hv_ring_buffer_info));
 
-        RingInfo->RingBuffer = (struct hv_ring_buffer *)Buffer;
-        RingInfo->RingBuffer->ReadIndex = RingInfo->RingBuffer->WriteIndex = 0;
+        ring_info->ring_buffer = (struct hv_ring_buffer *)buffer;
+        ring_info->ring_buffer->read_index =
+                ring_info->ring_buffer->write_index = 0;
 
-        RingInfo->RingSize = BufferLen;
-        RingInfo->RingDataSize = BufferLen - sizeof(struct hv_ring_buffer);
+        ring_info->ring_size = buflen;
+        ring_info->ring_datasize = buflen - sizeof(struct hv_ring_buffer);
 
-        spin_lock_init(&RingInfo->ring_lock);
+        spin_lock_init(&ring_info->ring_lock);
 
         return 0;
 }
@@ -320,97 +328,97 @@ int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 Buffe
 /*++
 
 Name:
-        RingBufferCleanup()
+        ringbuffer_cleanup()
 
 Description:
         Cleanup the ring buffer
 
 --*/
-void RingBufferCleanup(struct hv_ring_buffer_info *RingInfo)
+void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)
 {
 }
 
 /*++
 
 Name:
-        RingBufferWrite()
+        ringbuffer_write()
 
 Description:
         Write to the ring buffer
 
 --*/
-int RingBufferWrite(struct hv_ring_buffer_info *OutRingInfo,
+int ringbuffer_write(struct hv_ring_buffer_info *outring_info,
                     struct scatterlist *sglist, u32 sgcount)
 {
         int i = 0;
-        u32 byteAvailToWrite;
-        u32 byteAvailToRead;
-        u32 totalBytesToWrite = 0;
+        u32 bytes_avail_towrite;
+        u32 bytes_avail_toread;
+        u32 totalbytes_towrite = 0;
 
         struct scatterlist *sg;
-        volatile u32 nextWriteLocation;
-        u64 prevIndices = 0;
+        volatile u32 next_write_location;
+        u64 prev_indices = 0;
         unsigned long flags;
 
         for_each_sg(sglist, sg, sgcount, i)
         {
-                totalBytesToWrite += sg->length;
+                totalbytes_towrite += sg->length;
         }
 
-        totalBytesToWrite += sizeof(u64);
+        totalbytes_towrite += sizeof(u64);
 
-        spin_lock_irqsave(&OutRingInfo->ring_lock, flags);
+        spin_lock_irqsave(&outring_info->ring_lock, flags);
 
-        GetRingBufferAvailBytes(OutRingInfo,
-                                &byteAvailToRead,
-                                &byteAvailToWrite);
+        get_ringbuffer_availbytes(outring_info,
+                                &bytes_avail_toread,
+                                &bytes_avail_towrite);
 
-        DPRINT_DBG(VMBUS, "Writing %u bytes...", totalBytesToWrite);
+        DPRINT_DBG(VMBUS, "Writing %u bytes...", totalbytes_towrite);
 
-        /* DumpRingInfo(OutRingInfo, "BEFORE "); */
+        /* Dumpring_info(Outring_info, "BEFORE "); */
 
         /* If there is only room for the packet, assume it is full. */
         /* Otherwise, the next time around, we think the ring buffer */
         /* is empty since the read index == write index */
-        if (byteAvailToWrite <= totalBytesToWrite) {
+        if (bytes_avail_towrite <= totalbytes_towrite) {
                 DPRINT_DBG(VMBUS,
                         "No more space left on outbound ring buffer "
                         "(needed %u, avail %u)",
-                        totalBytesToWrite,
-                        byteAvailToWrite);
+                        totalbytes_towrite,
+                        bytes_avail_towrite);
 
-                spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags);
+                spin_unlock_irqrestore(&outring_info->ring_lock, flags);
                 return -1;
         }
 
         /* Write to the ring buffer */
-        nextWriteLocation = GetNextWriteLocation(OutRingInfo);
+        next_write_location = get_next_write_location(outring_info);
 
         for_each_sg(sglist, sg, sgcount, i)
         {
-                nextWriteLocation = CopyToRingBuffer(OutRingInfo,
-                                                     nextWriteLocation,
+                next_write_location = copyto_ringbuffer(outring_info,
+                                                     next_write_location,
                                                      sg_virt(sg),
                                                      sg->length);
         }
 
         /* Set previous packet start */
-        prevIndices = GetRingBufferIndices(OutRingInfo);
+        prev_indices = get_ring_bufferindices(outring_info);
 
-        nextWriteLocation = CopyToRingBuffer(OutRingInfo,
-                                             nextWriteLocation,
-                                             &prevIndices,
+        next_write_location = copyto_ringbuffer(outring_info,
+                                             next_write_location,
+                                             &prev_indices,
                                              sizeof(u64));
 
         /* Make sure we flush all writes before updating the writeIndex */
         mb();
 
         /* Now, update the write location */
-        SetNextWriteLocation(OutRingInfo, nextWriteLocation);
+        set_next_write_location(outring_info, next_write_location);
 
-        /* DumpRingInfo(OutRingInfo, "AFTER "); */
+        /* Dumpring_info(Outring_info, "AFTER "); */
 
-        spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags);
+        spin_unlock_irqrestore(&outring_info->ring_lock, flags);
         return 0;
 }
 
@@ -418,47 +426,48 @@ int RingBufferWrite(struct hv_ring_buffer_info *OutRingInfo,
 /*++
 
 Name:
-        RingBufferPeek()
+        ringbuffer_peek()
 
 Description:
         Read without advancing the read index
 
 --*/
-int RingBufferPeek(struct hv_ring_buffer_info *InRingInfo, void *Buffer, u32 BufferLen)
+int ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,
+                   void *Buffer, u32 buflen)
 {
-        u32 bytesAvailToWrite;
-        u32 bytesAvailToRead;
-        u32 nextReadLocation = 0;
+        u32 bytes_avail_towrite;
+        u32 bytes_avail_toread;
+        u32 next_read_location = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&InRingInfo->ring_lock, flags);
+        spin_lock_irqsave(&Inring_info->ring_lock, flags);
 
-        GetRingBufferAvailBytes(InRingInfo,
-                                &bytesAvailToRead,
-                                &bytesAvailToWrite);
+        get_ringbuffer_availbytes(Inring_info,
+                                &bytes_avail_toread,
+                                &bytes_avail_towrite);
 
         /* Make sure there is something to read */
-        if (bytesAvailToRead < BufferLen) {
+        if (bytes_avail_toread < buflen) {
                 /* DPRINT_DBG(VMBUS,
                         "got callback but not enough to read "
                         "<avail to read %d read size %d>!!",
-                        bytesAvailToRead,
+                        bytes_avail_toread,
                         BufferLen); */
 
-                spin_unlock_irqrestore(&InRingInfo->ring_lock, flags);
+                spin_unlock_irqrestore(&Inring_info->ring_lock, flags);
 
                 return -1;
         }
 
         /* Convert to byte offset */
-        nextReadLocation = GetNextReadLocation(InRingInfo);
+        next_read_location = get_next_read_location(Inring_info);
 
-        nextReadLocation = CopyFromRingBuffer(InRingInfo,
+        next_read_location = copyfrom_ringbuffer(Inring_info,
                                                 Buffer,
-                                                BufferLen,
-                                                nextReadLocation);
+                                                buflen,
+                                                next_read_location);
 
-        spin_unlock_irqrestore(&InRingInfo->ring_lock, flags);
+        spin_unlock_irqrestore(&Inring_info->ring_lock, flags);
 
         return 0;
 }
@@ -467,58 +476,59 @@ int RingBufferPeek(struct hv_ring_buffer_info *InRingInfo, void *Buffer, u32 Buf
 /*++
 
 Name:
-        RingBufferRead()
+        ringbuffer_read()
 
 Description:
         Read and advance the read index
 
 --*/
-int RingBufferRead(struct hv_ring_buffer_info *InRingInfo, void *Buffer,
-                   u32 BufferLen, u32 Offset)
+int ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer,
+                   u32 buflen, u32 offset)
 {
-        u32 bytesAvailToWrite;
-        u32 bytesAvailToRead;
-        u32 nextReadLocation = 0;
-        u64 prevIndices = 0;
+        u32 bytes_avail_towrite;
+        u32 bytes_avail_toread;
+        u32 next_read_location = 0;
+        u64 prev_indices = 0;
         unsigned long flags;
 
-        if (BufferLen <= 0)
+        if (buflen <= 0)
                 return -EINVAL;
 
-        spin_lock_irqsave(&InRingInfo->ring_lock, flags);
+        spin_lock_irqsave(&inring_info->ring_lock, flags);
 
-        GetRingBufferAvailBytes(InRingInfo,
-                                &bytesAvailToRead,
-                                &bytesAvailToWrite);
+        get_ringbuffer_availbytes(inring_info,
+                                &bytes_avail_toread,
+                                &bytes_avail_towrite);
 
-        DPRINT_DBG(VMBUS, "Reading %u bytes...", BufferLen);
+        DPRINT_DBG(VMBUS, "Reading %u bytes...", buflen);
 
-        /* DumpRingInfo(InRingInfo, "BEFORE "); */
+        /* Dumpring_info(Inring_info, "BEFORE "); */
 
         /* Make sure there is something to read */
-        if (bytesAvailToRead < BufferLen) {
+        if (bytes_avail_toread < buflen) {
                 DPRINT_DBG(VMBUS,
                         "got callback but not enough to read "
                         "<avail to read %d read size %d>!!",
-                        bytesAvailToRead,
-                        BufferLen);
+                        bytes_avail_toread,
+                        buflen);
 
-                spin_unlock_irqrestore(&InRingInfo->ring_lock, flags);
+                spin_unlock_irqrestore(&inring_info->ring_lock, flags);
 
                 return -1;
         }
 
-        nextReadLocation = GetNextReadLocationWithOffset(InRingInfo, Offset);
+        next_read_location =
+                get_next_readlocation_withoffset(inring_info, offset);
 
-        nextReadLocation = CopyFromRingBuffer(InRingInfo,
-                                                Buffer,
-                                                BufferLen,
-                                                nextReadLocation);
+        next_read_location = copyfrom_ringbuffer(inring_info,
+                                                buffer,
+                                                buflen,
+                                                next_read_location);
 
-        nextReadLocation = CopyFromRingBuffer(InRingInfo,
-                                                &prevIndices,
+        next_read_location = copyfrom_ringbuffer(inring_info,
+                                                &prev_indices,
                                                 sizeof(u64),
-                                                nextReadLocation);
+                                                next_read_location);
 
         /* Make sure all reads are done before we update the read index since */
         /* the writer may start writing to the read area once the read index */
@@ -526,11 +536,11 @@ int RingBufferRead(struct hv_ring_buffer_info *InRingInfo, void *Buffer,
         mb();
 
         /* Update the read index */
-        SetNextReadLocation(InRingInfo, nextReadLocation);
+        set_next_read_location(inring_info, next_read_location);
 
-        /* DumpRingInfo(InRingInfo, "AFTER "); */
+        /* Dumpring_info(Inring_info, "AFTER "); */
 
-        spin_unlock_irqrestore(&InRingInfo->ring_lock, flags);
+        spin_unlock_irqrestore(&inring_info->ring_lock, flags);
 
         return 0;
 }
@@ -539,7 +549,7 @@ int RingBufferRead(struct hv_ring_buffer_info *InRingInfo, void *Buffer,
 /*++
 
 Name:
-        CopyToRingBuffer()
+        copyto_ringbuffer()
 
 Description:
         Helper routine to copy from source to ring buffer.
@@ -547,37 +557,37 @@ Description:
 
 --*/
 static u32
-CopyToRingBuffer(
-        struct hv_ring_buffer_info      *RingInfo,
-        u32                             StartWriteOffset,
-        void                            *Src,
-        u32                             SrcLen)
+copyto_ringbuffer(
+        struct hv_ring_buffer_info      *ring_info,
+        u32                             start_write_offset,
+        void                            *src,
+        u32                             srclen)
 {
-        void *ringBuffer = GetRingBuffer(RingInfo);
-        u32 ringBufferSize = GetRingBufferSize(RingInfo);
-        u32 fragLen;
+        void *ring_buffer = get_ring_buffer(ring_info);
+        u32 ring_buffer_size = get_ring_buffersize(ring_info);
+        u32 frag_len;
 
         /* wrap-around detected! */
-        if (SrcLen > ringBufferSize - StartWriteOffset) {
+        if (srclen > ring_buffer_size - start_write_offset) {
                 DPRINT_DBG(VMBUS, "wrap-around detected!");
 
-                fragLen = ringBufferSize - StartWriteOffset;
-                memcpy(ringBuffer + StartWriteOffset, Src, fragLen);
-                memcpy(ringBuffer, Src + fragLen, SrcLen - fragLen);
+                frag_len = ring_buffer_size - start_write_offset;
+                memcpy(ring_buffer + start_write_offset, src, frag_len);
+                memcpy(ring_buffer, src + frag_len, srclen - frag_len);
         } else
-                memcpy(ringBuffer + StartWriteOffset, Src, SrcLen);
+                memcpy(ring_buffer + start_write_offset, src, srclen);
 
-        StartWriteOffset += SrcLen;
-        StartWriteOffset %= ringBufferSize;
+        start_write_offset += srclen;
+        start_write_offset %= ring_buffer_size;
 
-        return StartWriteOffset;
+        return start_write_offset;
 }
 
 
 /*++
 
 Name:
-        CopyFromRingBuffer()
+        copyfrom_ringbuffer()
 
 Description:
         Helper routine to copy to source from ring buffer.
@@ -585,34 +595,34 @@ Description:
 
 --*/
 static u32
-CopyFromRingBuffer(
-        struct hv_ring_buffer_info      *RingInfo,
-        void                            *Dest,
-        u32                             DestLen,
-        u32                             StartReadOffset)
+copyfrom_ringbuffer(
+        struct hv_ring_buffer_info      *ring_info,
+        void                            *dest,
+        u32                             destlen,
+        u32                             start_read_offset)
 {
-        void *ringBuffer = GetRingBuffer(RingInfo);
-        u32 ringBufferSize = GetRingBufferSize(RingInfo);
+        void *ring_buffer = get_ring_buffer(ring_info);
+        u32 ring_buffer_size = get_ring_buffersize(ring_info);
 
-        u32 fragLen;
+        u32 frag_len;
 
         /* wrap-around detected at the src */
-        if (DestLen > ringBufferSize - StartReadOffset) {
+        if (destlen > ring_buffer_size - start_read_offset) {
                 DPRINT_DBG(VMBUS, "src wrap-around detected!");
 
-                fragLen = ringBufferSize - StartReadOffset;
+                frag_len = ring_buffer_size - start_read_offset;
 
-                memcpy(Dest, ringBuffer + StartReadOffset, fragLen);
-                memcpy(Dest + fragLen, ringBuffer, DestLen - fragLen);
+                memcpy(dest, ring_buffer + start_read_offset, frag_len);
+                memcpy(dest + frag_len, ring_buffer, destlen - frag_len);
         } else
 
-                memcpy(Dest, ringBuffer + StartReadOffset, DestLen);
+                memcpy(dest, ring_buffer + start_read_offset, destlen);
 
 
-        StartReadOffset += DestLen;
-        StartReadOffset %= ringBufferSize;
+        start_read_offset += destlen;
+        start_read_offset %= ring_buffer_size;
 
-        return StartReadOffset;
+        return start_read_offset;
 }
 
 
diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h
index a7f1717c6a56..7bd6ecf2f015 100644
--- a/drivers/staging/hv/ring_buffer.h
+++ b/drivers/staging/hv/ring_buffer.h
@@ -29,18 +29,18 @@
 
 struct hv_ring_buffer {
         /* Offset in bytes from the start of ring data below */
-        volatile u32 WriteIndex;
+        volatile u32 write_index;
 
         /* Offset in bytes from the start of ring data below */
-        volatile u32 ReadIndex;
+        volatile u32 read_index;
 
-        volatile u32 InterruptMask;
+        volatile u32 interrupt_mask;
 
         /* Pad it to PAGE_SIZE so that data starts on page boundary */
-        u8      Reserved[4084];
+        u8      reserved[4084];
 
         /* NOTE:
-         * The InterruptMask field is used only for channels but since our
+         * The interrupt_mask field is used only for channels but since our
          * vmbus connection also uses this data structure and its data starts
          * here, we commented out this field.
          */
@@ -50,24 +50,24 @@ struct hv_ring_buffer {
          * Ring data starts here + RingDataStartOffset
          * !!! DO NOT place any fields below this !!!
          */
-        u8 Buffer[0];
+        u8 buffer[0];
 } __attribute__((packed));
 
 struct hv_ring_buffer_info {
-        struct hv_ring_buffer *RingBuffer;
-        u32 RingSize;                   /* Include the shared header */
+        struct hv_ring_buffer *ring_buffer;
+        u32 ring_size;                  /* Include the shared header */
         spinlock_t ring_lock;
 
-        u32 RingDataSize;               /* < ringSize */
-        u32 RingDataStartOffset;
+        u32 ring_datasize;              /* < ring_size */
+        u32 ring_data_startoffset;
 };
 
 struct hv_ring_buffer_debug_info {
-        u32 CurrentInterruptMask;
-        u32 CurrentReadIndex;
-        u32 CurrentWriteIndex;
-        u32 BytesAvailToRead;
-        u32 BytesAvailToWrite;
+        u32 current_interrupt_mask;
+        u32 current_read_index;
+        u32 current_write_index;
+        u32 bytes_avail_toread;
+        u32 bytes_avail_towrite;
 };
 
 
@@ -75,28 +75,28 @@ struct hv_ring_buffer_debug_info {
 /* Interface */
 
 
-int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer,
-                   u32 BufferLen);
+int ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer,
+                   u32 buflen);
 
-void RingBufferCleanup(struct hv_ring_buffer_info *RingInfo);
+void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);
 
-int RingBufferWrite(struct hv_ring_buffer_info *RingInfo,
+int ringbuffer_write(struct hv_ring_buffer_info *ring_info,
                     struct scatterlist *sglist,
                     u32 sgcount);
 
-int RingBufferPeek(struct hv_ring_buffer_info *RingInfo, void *Buffer,
-                   u32 BufferLen);
+int ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
+                   u32 buflen);
 
-int RingBufferRead(struct hv_ring_buffer_info *RingInfo,
-                   void *Buffer,
-                   u32 BufferLen,
-                   u32 Offset);
+int ringbuffer_read(struct hv_ring_buffer_info *ring_info,
+                   void *buffer,
+                   u32 buflen,
+                   u32 offset);
 
-u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *RingInfo);
+u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info);
 
-void DumpRingInfo(struct hv_ring_buffer_info *RingInfo, char *Prefix);
+void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix);
 
-void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
+void ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,
                             struct hv_ring_buffer_debug_info *debug_info);
 
 #endif /* _RING_BUFFER_H_ */
diff --git a/drivers/staging/hv/rndis.h b/drivers/staging/hv/rndis.h
index 723e1f15b90d..014de047b86d 100644
--- a/drivers/staging/hv/rndis.h
+++ b/drivers/staging/hv/rndis.h
@@ -288,24 +288,24 @@
 #define RNDIS_DF_RAW_DATA                       0x00000004
 
 /*  Remote NDIS medium types. */
-#define RNdisMedium802_3                        0x00000000
-#define RNdisMedium802_5                        0x00000001
-#define RNdisMediumFddi                         0x00000002
-#define RNdisMediumWan                          0x00000003
-#define RNdisMediumLocalTalk                    0x00000004
-#define RNdisMediumArcnetRaw                    0x00000006
-#define RNdisMediumArcnet878_2                  0x00000007
-#define RNdisMediumAtm                          0x00000008
-#define RNdisMediumWirelessWan                  0x00000009
-#define RNdisMediumIrda                         0x0000000a
-#define RNdisMediumCoWan                        0x0000000b
+#define RNDIS_MEDIUM_802_3                      0x00000000
+#define RNDIS_MEDIUM_802_5                      0x00000001
+#define RNDIS_MEDIUM_FDDI                               0x00000002
+#define RNDIS_MEDIUM_WAN                                0x00000003
+#define RNDIS_MEDIUM_LOCAL_TALK                 0x00000004
+#define RNDIS_MEDIUM_ARCNET_RAW                 0x00000006
+#define RNDIS_MEDIUM_ARCNET_878_2                       0x00000007
+#define RNDIS_MEDIUM_ATM                                0x00000008
+#define RNDIS_MEDIUM_WIRELESS_WAN                       0x00000009
+#define RNDIS_MEDIUM_IRDA                               0x0000000a
+#define RNDIS_MEDIUM_CO_WAN                     0x0000000b
 /* Not a real medium, defined as an upper-bound */
-#define RNdisMediumMax                          0x0000000d
+#define RNDIS_MEDIUM_MAX                                0x0000000d
 
 
 /* Remote NDIS medium connection states. */
-#define RNdisMediaStateConnected                0x00000000
-#define RNdisMediaStateDisconnected             0x00000001
+#define RNDIS_MEDIA_STATE_CONNECTED             0x00000000
+#define RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001
 
 /*  Remote NDIS version numbers */
 #define RNDIS_MAJOR_VERSION                     0x00000001
@@ -314,106 +314,106 @@
 
 /* NdisInitialize message */
 struct rndis_initialize_request {
-        u32 RequestId;
-        u32 MajorVersion;
-        u32 MinorVersion;
-        u32 MaxTransferSize;
+        u32 req_id;
+        u32 major_ver;
+        u32 minor_ver;
+        u32 max_xfer_size;
 };
 
 /* Response to NdisInitialize */
 struct rndis_initialize_complete {
-        u32 RequestId;
-        u32 Status;
-        u32 MajorVersion;
-        u32 MinorVersion;
-        u32 DeviceFlags;
-        u32 Medium;
-        u32 MaxPacketsPerMessage;
-        u32 MaxTransferSize;
-        u32 PacketAlignmentFactor;
-        u32 AFListOffset;
-        u32 AFListSize;
+        u32 req_id;
+        u32 status;
+        u32 major_ver;
+        u32 minor_ver;
+        u32 dev_flags;
+        u32 medium;
+        u32 max_pkt_per_msg;
+        u32 max_xfer_size;
+        u32 pkt_alignment_factor;
+        u32 af_list_offset;
+        u32 af_list_size;
 };
 
 /* Call manager devices only: Information about an address family */
 /* supported by the device is appended to the response to NdisInitialize. */
 struct rndis_co_address_family {
-        u32 AddressFamily;
-        u32 MajorVersion;
-        u32 MinorVersion;
+        u32 address_family;
+        u32 major_ver;
+        u32 minor_ver;
 };
 
 /* NdisHalt message */
 struct rndis_halt_request {
-        u32 RequestId;
+        u32 req_id;
 };
 
 /* NdisQueryRequest message */
 struct rndis_query_request {
-        u32 RequestId;
-        u32 Oid;
-        u32 InformationBufferLength;
-        u32 InformationBufferOffset;
-        u32 DeviceVcHandle;
+        u32 req_id;
+        u32 oid;
+        u32 info_buflen;
+        u32 info_buf_offset;
+        u32 dev_vc_handle;
 };
 
 /* Response to NdisQueryRequest */
 struct rndis_query_complete {
-        u32 RequestId;
-        u32 Status;
-        u32 InformationBufferLength;
-        u32 InformationBufferOffset;
+        u32 req_id;
+        u32 status;
+        u32 info_buflen;
+        u32 info_buf_offset;
 };
 
 /* NdisSetRequest message */
 struct rndis_set_request {
-        u32 RequestId;
-        u32 Oid;
-        u32 InformationBufferLength;
-        u32 InformationBufferOffset;
-        u32 DeviceVcHandle;
+        u32 req_id;
+        u32 oid;
+        u32 info_buflen;
+        u32 info_buf_offset;
+        u32 dev_vc_handle;
 };
 
 /* Response to NdisSetRequest */
 struct rndis_set_complete {
-        u32 RequestId;
-        u32 Status;
+        u32 req_id;
+        u32 status;
 };
 
 /* NdisReset message */
 struct rndis_reset_request {
-        u32 Reserved;
+        u32 reserved;
 };
 
 /* Response to NdisReset */
 struct rndis_reset_complete {
-        u32 Status;
-        u32 AddressingReset;
+        u32 status;
+        u32 addressing_reset;
 };
 
 /* NdisMIndicateStatus message */
 struct rndis_indicate_status {
-        u32 Status;
-        u32 StatusBufferLength;
-        u32 StatusBufferOffset;
+        u32 status;
+        u32 status_buflen;
+        u32 status_buf_offset;
 };
 
 /* Diagnostic information passed as the status buffer in */
 /* struct rndis_indicate_status messages signifying error conditions. */
 struct rndis_diagnostic_info {
-        u32 DiagStatus;
-        u32 ErrorOffset;
+        u32 diag_status;
+        u32 error_offset;
 };
 
 /* NdisKeepAlive message */
 struct rndis_keepalive_request {
-        u32 RequestId;
+        u32 req_id;
 };
 
 /* Response to NdisKeepAlive */
 struct rndis_keepalive_complete {
-        u32 RequestId;
-        u32 Status;
+        u32 req_id;
+        u32 status;
 };
 
 /*
@@ -422,39 +422,39 @@ struct rndis_keepalive_complete {
  * to 0 for connectionless data, otherwise it contains the VC handle.
  */
 struct rndis_packet {
-        u32 DataOffset;
-        u32 DataLength;
-        u32 OOBDataOffset;
-        u32 OOBDataLength;
-        u32 NumOOBDataElements;
-        u32 PerPacketInfoOffset;
-        u32 PerPacketInfoLength;
-        u32 VcHandle;
-        u32 Reserved;
+        u32 data_offset;
+        u32 data_len;
+        u32 oob_data_offset;
+        u32 oob_data_len;
+        u32 num_oob_data_elements;
+        u32 per_pkt_info_offset;
+        u32 per_pkt_info_len;
+        u32 vc_handle;
+        u32 reserved;
 };
 
 /* Optional Out of Band data associated with a Data message. */
 struct rndis_oobd {
-        u32 Size;
-        u32 Type;
-        u32 ClassInformationOffset;
+        u32 size;
+        u32 type;
+        u32 class_info_offset;
 };
 
 /* Packet extension field contents associated with a Data message. */
 struct rndis_per_packet_info {
-        u32 Size;
-        u32 Type;
-        u32 PerPacketInformationOffset;
+        u32 size;
+        u32 type;
+        u32 per_pkt_info_offset;
 };
 
 /* Format of Information buffer passed in a SetRequest for the OID */
 /* OID_GEN_RNDIS_CONFIG_PARAMETER. */
 struct rndis_config_parameter_info {
-        u32 ParameterNameOffset;
-        u32 ParameterNameLength;
-        u32 ParameterType;
-        u32 ParameterValueOffset;
-        u32 ParameterValueLength;
+        u32 parameter_name_offset;
+        u32 parameter_name_length;
+        u32 parameter_type;
+        u32 parameter_value_offset;
+        u32 parameter_value_length;
 };
 
 /* Values for ParameterType in struct rndis_config_parameter_info */
@@ -466,187 +466,188 @@ struct rndis_config_parameter_info {
 
 /* CoNdisMiniportCreateVc message */
 struct rcondis_mp_create_vc {
-        u32 RequestId;
-        u32 NdisVcHandle;
+        u32 req_id;
+        u32 ndis_vc_handle;
 };
 
 /* Response to CoNdisMiniportCreateVc */
 struct rcondis_mp_create_vc_complete {
-        u32 RequestId;
-        u32 DeviceVcHandle;
-        u32 Status;
+        u32 req_id;
+        u32 dev_vc_handle;
+        u32 status;
 };
 
 /* CoNdisMiniportDeleteVc message */
 struct rcondis_mp_delete_vc {
-        u32 RequestId;
-        u32 DeviceVcHandle;
+        u32 req_id;
+        u32 dev_vc_handle;
 };
 
 /* Response to CoNdisMiniportDeleteVc */
 struct rcondis_mp_delete_vc_complete {
-        u32 RequestId;
-        u32 Status;
+        u32 req_id;
+        u32 status;
 };
 
 /* CoNdisMiniportQueryRequest message */
 struct rcondis_mp_query_request {
-        u32 RequestId;
-        u32 RequestType;
-        u32 Oid;
-        u32 DeviceVcHandle;
-        u32 InformationBufferLength;
-        u32 InformationBufferOffset;
+        u32 req_id;
+        u32 request_type;
+        u32 oid;
+        u32 dev_vc_handle;
+        u32 info_buflen;
+        u32 info_buf_offset;
 };
 
 /* CoNdisMiniportSetRequest message */
 struct rcondis_mp_set_request {
-        u32 RequestId;
-        u32 RequestType;
-        u32 Oid;
-        u32 DeviceVcHandle;
-        u32 InformationBufferLength;
-        u32 InformationBufferOffset;
+        u32 req_id;
+        u32 request_type;
+        u32 oid;
+        u32 dev_vc_handle;
+        u32 info_buflen;
+        u32 info_buf_offset;
 };
 
 /* CoNdisIndicateStatus message */
 struct rcondis_indicate_status {
-        u32 NdisVcHandle;
-        u32 Status;
-        u32 StatusBufferLength;
-        u32 StatusBufferOffset;
+        u32 ndis_vc_handle;
+        u32 status;
+        u32 status_buflen;
+        u32 status_buf_offset;
 };
 
 /* CONDIS Call/VC parameters */
 struct rcondis_specific_parameters {
-        u32 ParameterType;
-        u32 ParameterLength;
-        u32 ParameterOffset;
+        u32 parameter_type;
+        u32 parameter_length;
+        u32 parameter_lffset;
 };
 
 struct rcondis_media_parameters {
-        u32 Flags;
-        u32 Reserved1;
-        u32 Reserved2;
-        struct rcondis_specific_parameters MediaSpecific;
+        u32 flags;
+        u32 reserved1;
+        u32 reserved2;
+        struct rcondis_specific_parameters media_specific;
 };
 
 struct rndis_flowspec {
-        u32 TokenRate;
-        u32 TokenBucketSize;
-        u32 PeakBandwidth;
-        u32 Latency;
-        u32 DelayVariation;
-        u32 ServiceType;
-        u32 MaxSduSize;
-        u32 MinimumPolicedSize;
+        u32 token_rate;
+        u32 token_bucket_size;
+        u32 peak_bandwidth;
+        u32 latency;
+        u32 delay_variation;
+        u32 service_type;
+        u32 max_sdu_size;
+        u32 minimum_policed_size;
 };
 
 struct rcondis_call_manager_parameters {
-        struct rndis_flowspec Transmit;
-        struct rndis_flowspec Receive;
-        struct rcondis_specific_parameters CallMgrSpecific;
+        struct rndis_flowspec transmit;
+        struct rndis_flowspec receive;
+        struct rcondis_specific_parameters call_mgr_specific;
 };
 
 /* CoNdisMiniportActivateVc message */
 struct rcondis_mp_activate_vc_request {
-        u32 RequestId;
-        u32 Flags;
-        u32 DeviceVcHandle;
-        u32 MediaParamsOffset;
-        u32 MediaParamsLength;
-        u32 CallMgrParamsOffset;
-        u32 CallMgrParamsLength;
+        u32 req_id;
+        u32 flags;
+        u32 dev_vc_handle;
+        u32 media_params_offset;
+        u32 media_params_length;
+        u32 call_mgr_params_offset;
+        u32 call_mgr_params_length;
 };
 
 /* Response to CoNdisMiniportActivateVc */
 struct rcondis_mp_activate_vc_complete {
-        u32 RequestId;
-        u32 Status;
+        u32 req_id;
+        u32 status;
 };
 
 /* CoNdisMiniportDeactivateVc message */
 struct rcondis_mp_deactivate_vc_request {
-        u32 RequestId;
-        u32 Flags;
-        u32 DeviceVcHandle;
+        u32 req_id;
+        u32 flags;
+        u32 dev_vc_handle;
 };
 
 /* Response to CoNdisMiniportDeactivateVc */
 struct rcondis_mp_deactivate_vc_complete {
-        u32 RequestId;
-        u32 Status;
+        u32 req_id;
+        u32 status;
 };
 
 
 /* union with all of the RNDIS messages */
 union rndis_message_container {
-        struct rndis_packet Packet;
-        struct rndis_initialize_request InitializeRequest;
-        struct rndis_halt_request HaltRequest;
-        struct rndis_query_request QueryRequest;
-        struct rndis_set_request SetRequest;
-        struct rndis_reset_request ResetRequest;
-        struct rndis_keepalive_request KeepaliveRequest;
-        struct rndis_indicate_status IndicateStatus;
-        struct rndis_initialize_complete InitializeComplete;
-        struct rndis_query_complete QueryComplete;
-        struct rndis_set_complete SetComplete;
-        struct rndis_reset_complete ResetComplete;
-        struct rndis_keepalive_complete KeepaliveComplete;
-        struct rcondis_mp_create_vc CoMiniportCreateVc;
-        struct rcondis_mp_delete_vc CoMiniportDeleteVc;
-        struct rcondis_indicate_status CoIndicateStatus;
-        struct rcondis_mp_activate_vc_request CoMiniportActivateVc;
-        struct rcondis_mp_deactivate_vc_request CoMiniportDeactivateVc;
-        struct rcondis_mp_create_vc_complete CoMiniportCreateVcComplete;
-        struct rcondis_mp_delete_vc_complete CoMiniportDeleteVcComplete;
-        struct rcondis_mp_activate_vc_complete CoMiniportActivateVcComplete;
-        struct rcondis_mp_deactivate_vc_complete CoMiniportDeactivateVcComplete;
+        struct rndis_packet pkt;
+        struct rndis_initialize_request init_req;
+        struct rndis_halt_request halt_req;
+        struct rndis_query_request query_req;
+        struct rndis_set_request set_req;
+        struct rndis_reset_request reset_req;
+        struct rndis_keepalive_request keep_alive_req;
+        struct rndis_indicate_status indicate_status;
+        struct rndis_initialize_complete init_complete;
+        struct rndis_query_complete query_complete;
+        struct rndis_set_complete set_complete;
+        struct rndis_reset_complete reset_complete;
+        struct rndis_keepalive_complete keep_alive_complete;
+        struct rcondis_mp_create_vc co_miniport_create_vc;
+        struct rcondis_mp_delete_vc co_miniport_delete_vc;
+        struct rcondis_indicate_status co_indicate_status;
+        struct rcondis_mp_activate_vc_request co_miniport_activate_vc;
+        struct rcondis_mp_deactivate_vc_request co_miniport_deactivate_vc;
+        struct rcondis_mp_create_vc_complete co_miniport_create_vc_complete;
+        struct rcondis_mp_delete_vc_complete co_miniport_delete_vc_complete;
+        struct rcondis_mp_activate_vc_complete co_miniport_activate_vc_complete;
+        struct rcondis_mp_deactivate_vc_complete
+                co_miniport_deactivate_vc_complete;
 };
 
 /* Remote NDIS message format */
 struct rndis_message {
-        u32 NdisMessageType;
+        u32 ndis_msg_type;
 
         /* Total length of this message, from the beginning */
         /* of the sruct rndis_message, in bytes. */
-        u32 MessageLength;
+        u32 msg_len;
 
         /* Actual message */
-        union rndis_message_container Message;
+        union rndis_message_container msg;
 };
 
 /* Handy macros */
 
 /* get the size of an RNDIS message. Pass in the message type, */
 /* struct rndis_set_request, struct rndis_packet for example */
-#define RNDIS_MESSAGE_SIZE(Message)                             \
-        (sizeof(Message) + (sizeof(struct rndis_message) -      \
+#define RNDIS_MESSAGE_SIZE(msg)                         \
+        (sizeof(msg) + (sizeof(struct rndis_message) -  \
          sizeof(union rndis_message_container)))
 
 /* get pointer to info buffer with message pointer */
-#define MESSAGE_TO_INFO_BUFFER(Message)                         \
-        (((unsigned char *)(Message)) + Message->InformationBufferOffset)
+#define MESSAGE_TO_INFO_BUFFER(msg)                             \
+        (((unsigned char *)(msg)) + msg->info_buf_offset)
 
 /* get pointer to status buffer with message pointer */
-#define MESSAGE_TO_STATUS_BUFFER(Message)                       \
-        (((unsigned char *)(Message)) + Message->StatusBufferOffset)
+#define MESSAGE_TO_STATUS_BUFFER(msg)                   \
+        (((unsigned char *)(msg)) + msg->status_buf_offset)
 
 /* get pointer to OOBD buffer with message pointer */
-#define MESSAGE_TO_OOBD_BUFFER(Message)                         \
-        (((unsigned char *)(Message)) + Message->OOBDataOffset)
+#define MESSAGE_TO_OOBD_BUFFER(msg)                             \
+        (((unsigned char *)(msg)) + msg->oob_data_offset)
 
 /* get pointer to data buffer with message pointer */
-#define MESSAGE_TO_DATA_BUFFER(Message)                         \
-        (((unsigned char *)(Message)) + Message->PerPacketInfoOffset)
+#define MESSAGE_TO_DATA_BUFFER(msg)                             \
+        (((unsigned char *)(msg)) + msg->per_pkt_info_offset)
 
 /* get pointer to contained message from NDIS_MESSAGE pointer */
-#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(RndisMessage)          \
-        ((void *) &RndisMessage->Message)
+#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(rndis_msg)             \
+        ((void *) &rndis_msg->msg)
 
 /* get pointer to contained message from NDIS_MESSAGE pointer */
-#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(RndisMessage)      \
-        ((void *) RndisMessage)
+#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(rndis_msg) \
+        ((void *) rndis_msg)
 
 #endif /* _RNDIS_H_ */
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index fa2141f454f0..53676dcbf381 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -32,7 +32,7 @@
 /* Data types */
 struct rndis_filter_driver_object {
         /* The original driver */
-        struct netvsc_driver InnerDriver;
+        struct netvsc_driver inner_drv;
 };
 
 enum rndis_device_state {
@@ -43,63 +43,63 @@ enum rndis_device_state {
 };
 
 struct rndis_device {
-        struct netvsc_device *NetDevice;
+        struct netvsc_device *net_dev;
 
-        enum rndis_device_state State;
-        u32 LinkStatus;
-        atomic_t NewRequestId;
+        enum rndis_device_state state;
+        u32 link_stat;
+        atomic_t new_req_id;
 
         spinlock_t request_lock;
-        struct list_head RequestList;
+        struct list_head req_list;
 
-        unsigned char HwMacAddr[ETH_ALEN];
+        unsigned char hw_mac_adr[ETH_ALEN];
 };
 
 struct rndis_request {
-        struct list_head ListEntry;
-        struct osd_waitevent *WaitEvent;
+        struct list_head list_ent;
+        struct osd_waitevent *waitevent;
 
         /*
          * FIXME: We assumed a fixed size response here. If we do ever need to
          * handle a bigger response, we can either define a max response
          * message or add a response buffer variable above this field
          */
-        struct rndis_message ResponseMessage;
+        struct rndis_message response_msg;
 
         /* Simplify allocation by having a netvsc packet inline */
-        struct hv_netvsc_packet Packet;
-        struct hv_page_buffer Buffer;
+        struct hv_netvsc_packet pkt;
+        struct hv_page_buffer buf;
         /* FIXME: We assumed a fixed size request here. */
-        struct rndis_message RequestMessage;
+        struct rndis_message request_msg;
 };
 
 
 struct rndis_filter_packet {
-        void *CompletionContext;
-        void (*OnCompletion)(void *context);
-        struct rndis_message Message;
+        void *completion_ctx;
+        void (*completion)(void *context);
+        struct rndis_message msg;
 };
 
 
-static int RndisFilterOnDeviceAdd(struct hv_device *Device,
-                                  void *AdditionalInfo);
+static int rndis_filte_device_add(struct hv_device *dev,
+                                  void *additional_info);
 
-static int RndisFilterOnDeviceRemove(struct hv_device *Device);
+static int rndis_filter_device_remove(struct hv_device *dev);
 
-static void RndisFilterOnCleanup(struct hv_driver *Driver);
+static void rndis_filter_cleanup(struct hv_driver *drv);
 
-static int RndisFilterOnSend(struct hv_device *Device,
-                             struct hv_netvsc_packet *Packet);
+static int rndis_filter_send(struct hv_device *dev,
+                             struct hv_netvsc_packet *pkt);
 
-static void RndisFilterOnSendCompletion(void *Context);
+static void rndis_filter_send_completion(void *ctx);
 
-static void RndisFilterOnSendRequestCompletion(void *Context);
+static void rndis_filter_send_request_completion(void *ctx);
 
 
 /* The one and only */
-static struct rndis_filter_driver_object gRndisFilter;
+static struct rndis_filter_driver_object rndis_filter;
 
-static struct rndis_device *GetRndisDevice(void)
+static struct rndis_device *get_rndis_device(void)
 {
         struct rndis_device *device;
 
@@ -109,19 +109,19 @@ static struct rndis_device *GetRndisDevice(void)
 
         spin_lock_init(&device->request_lock);
 
-        INIT_LIST_HEAD(&device->RequestList);
+        INIT_LIST_HEAD(&device->req_list);
 
-        device->State = RNDIS_DEV_UNINITIALIZED;
+        device->state = RNDIS_DEV_UNINITIALIZED;
 
         return device;
 }
 
-static struct rndis_request *GetRndisRequest(struct rndis_device *Device,
-                                             u32 MessageType,
-                                             u32 MessageLength)
+static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+                                             u32 msg_type,
+                                             u32 msg_len)
 {
         struct rndis_request *request;
-        struct rndis_message *rndisMessage;
+        struct rndis_message *rndis_msg;
         struct rndis_set_request *set;
         unsigned long flags;
 
@@ -129,61 +129,61 @@ static struct rndis_request *GetRndisRequest(struct rndis_device *Device,
         if (!request)
                 return NULL;
 
-        request->WaitEvent = osd_WaitEventCreate();
-        if (!request->WaitEvent) {
+        request->waitevent = osd_waitevent_create();
+        if (!request->waitevent) {
                 kfree(request);
                 return NULL;
         }
 
-        rndisMessage = &request->RequestMessage;
-        rndisMessage->NdisMessageType = MessageType;
-        rndisMessage->MessageLength = MessageLength;
+        rndis_msg = &request->request_msg;
+        rndis_msg->ndis_msg_type = msg_type;
+        rndis_msg->msg_len = msg_len;
 
         /*
          * Set the request id. This field is always after the rndis header for
          * request/response packet types so we just used the SetRequest as a
          * template
          */
-        set = &rndisMessage->Message.SetRequest;
-        set->RequestId = atomic_inc_return(&Device->NewRequestId);
+        set = &rndis_msg->msg.set_req;
+        set->req_id = atomic_inc_return(&dev->new_req_id);
 
         /* Add to the request list */
-        spin_lock_irqsave(&Device->request_lock, flags);
-        list_add_tail(&request->ListEntry, &Device->RequestList);
-        spin_unlock_irqrestore(&Device->request_lock, flags);
+        spin_lock_irqsave(&dev->request_lock, flags);
+        list_add_tail(&request->list_ent, &dev->req_list);
+        spin_unlock_irqrestore(&dev->request_lock, flags);
 
         return request;
 }
 
-static void PutRndisRequest(struct rndis_device *Device,
-                            struct rndis_request *Request)
+static void put_rndis_request(struct rndis_device *dev,
+                            struct rndis_request *req)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&Device->request_lock, flags);
-        list_del(&Request->ListEntry);
-        spin_unlock_irqrestore(&Device->request_lock, flags);
+        spin_lock_irqsave(&dev->request_lock, flags);
+        list_del(&req->list_ent);
+        spin_unlock_irqrestore(&dev->request_lock, flags);
 
-        kfree(Request->WaitEvent);
-        kfree(Request);
+        kfree(req->waitevent);
+        kfree(req);
 }
 
-static void DumpRndisMessage(struct rndis_message *RndisMessage)
+static void dump_rndis_message(struct rndis_message *rndis_msg)
 {
-        switch (RndisMessage->NdisMessageType) {
+        switch (rndis_msg->ndis_msg_type) {
         case REMOTE_NDIS_PACKET_MSG:
                 DPRINT_DBG(NETVSC, "REMOTE_NDIS_PACKET_MSG (len %u, "
                            "data offset %u data len %u, # oob %u, "
                            "oob offset %u, oob len %u, pkt offset %u, "
                            "pkt len %u",
-                           RndisMessage->MessageLength,
-                           RndisMessage->Message.Packet.DataOffset,
-                           RndisMessage->Message.Packet.DataLength,
-                           RndisMessage->Message.Packet.NumOOBDataElements,
-                           RndisMessage->Message.Packet.OOBDataOffset,
-                           RndisMessage->Message.Packet.OOBDataLength,
-                           RndisMessage->Message.Packet.PerPacketInfoOffset,
-                           RndisMessage->Message.Packet.PerPacketInfoLength);
+                           rndis_msg->msg_len,
+                           rndis_msg->msg.pkt.data_offset,
+                           rndis_msg->msg.pkt.data_len,
+                           rndis_msg->msg.pkt.num_oob_data_elements,
+                           rndis_msg->msg.pkt.oob_data_offset,
+                           rndis_msg->msg.pkt.oob_data_len,
+                           rndis_msg->msg.pkt.per_pkt_info_offset,
+                           rndis_msg->msg.pkt.per_pkt_info_len);
                 break;
 
         case REMOTE_NDIS_INITIALIZE_CMPLT:
@@ -191,147 +191,157 @@ static void DumpRndisMessage(struct rndis_message *RndisMessage)
                         "(len %u, id 0x%x, status 0x%x, major %d, minor %d, "
                         "device flags %d, max xfer size 0x%x, max pkts %u, "
                         "pkt aligned %u)",
-                        RndisMessage->MessageLength,
-                        RndisMessage->Message.InitializeComplete.RequestId,
-                        RndisMessage->Message.InitializeComplete.Status,
-                        RndisMessage->Message.InitializeComplete.MajorVersion,
-                        RndisMessage->Message.InitializeComplete.MinorVersion,
-                        RndisMessage->Message.InitializeComplete.DeviceFlags,
-                        RndisMessage->Message.InitializeComplete.MaxTransferSize,
-                        RndisMessage->Message.InitializeComplete.MaxPacketsPerMessage,
-                        RndisMessage->Message.InitializeComplete.PacketAlignmentFactor);
+                        rndis_msg->msg_len,
+                        rndis_msg->msg.init_complete.req_id,
+                        rndis_msg->msg.init_complete.status,
+                        rndis_msg->msg.init_complete.major_ver,
+                        rndis_msg->msg.init_complete.minor_ver,
+                        rndis_msg->msg.init_complete.dev_flags,
+                        rndis_msg->msg.init_complete.max_xfer_size,
+                        rndis_msg->msg.init_complete.
+                           max_pkt_per_msg,
+                        rndis_msg->msg.init_complete.
+                           pkt_alignment_factor);
                 break;
 
         case REMOTE_NDIS_QUERY_CMPLT:
                 DPRINT_DBG(NETVSC, "REMOTE_NDIS_QUERY_CMPLT "
                         "(len %u, id 0x%x, status 0x%x, buf len %u, "
                         "buf offset %u)",
-                        RndisMessage->MessageLength,
-                        RndisMessage->Message.QueryComplete.RequestId,
-                        RndisMessage->Message.QueryComplete.Status,
-                        RndisMessage->Message.QueryComplete.InformationBufferLength,
-                        RndisMessage->Message.QueryComplete.InformationBufferOffset);
+                        rndis_msg->msg_len,
+                        rndis_msg->msg.query_complete.req_id,
+                        rndis_msg->msg.query_complete.status,
+                        rndis_msg->msg.query_complete.
+                           info_buflen,
+                        rndis_msg->msg.query_complete.
+                           info_buf_offset);
                 break;
 
         case REMOTE_NDIS_SET_CMPLT:
                 DPRINT_DBG(NETVSC,
                         "REMOTE_NDIS_SET_CMPLT (len %u, id 0x%x, status 0x%x)",
-                        RndisMessage->MessageLength,
-                        RndisMessage->Message.SetComplete.RequestId,
-                        RndisMessage->Message.SetComplete.Status);
+                        rndis_msg->msg_len,
+                        rndis_msg->msg.set_complete.req_id,
+                        rndis_msg->msg.set_complete.status);
                 break;
 
         case REMOTE_NDIS_INDICATE_STATUS_MSG:
                 DPRINT_DBG(NETVSC, "REMOTE_NDIS_INDICATE_STATUS_MSG "
                         "(len %u, status 0x%x, buf len %u, buf offset %u)",
-                        RndisMessage->MessageLength,
-                        RndisMessage->Message.IndicateStatus.Status,
-                        RndisMessage->Message.IndicateStatus.StatusBufferLength,
-                        RndisMessage->Message.IndicateStatus.StatusBufferOffset);
+                        rndis_msg->msg_len,
+                        rndis_msg->msg.indicate_status.status,
+                        rndis_msg->msg.indicate_status.status_buflen,
+                        rndis_msg->msg.indicate_status.status_buf_offset);
                 break;
 
         default:
                 DPRINT_DBG(NETVSC, "0x%x (len %u)",
-                        RndisMessage->NdisMessageType,
-                        RndisMessage->MessageLength);
+                        rndis_msg->ndis_msg_type,
+                        rndis_msg->msg_len);
                 break;
         }
 }
 
-static int RndisFilterSendRequest(struct rndis_device *Device,
-                                  struct rndis_request *Request)
+static int rndis_filter_send_request(struct rndis_device *dev,
+                                  struct rndis_request *req)
 {
         int ret;
         struct hv_netvsc_packet *packet;
 
         /* Setup the packet to send it */
-        packet = &Request->Packet;
+        packet = &req->pkt;
 
-        packet->IsDataPacket = false;
-        packet->TotalDataBufferLength = Request->RequestMessage.MessageLength;
-        packet->PageBufferCount = 1;
+        packet->is_data_pkt = false;
+        packet->total_data_buflen = req->request_msg.msg_len;
+        packet->page_buf_cnt = 1;
 
-        packet->PageBuffers[0].Pfn = virt_to_phys(&Request->RequestMessage) >>
+        packet->page_buf[0].Pfn = virt_to_phys(&req->request_msg) >>
                                         PAGE_SHIFT;
-        packet->PageBuffers[0].Length = Request->RequestMessage.MessageLength;
-        packet->PageBuffers[0].Offset =
-                (unsigned long)&Request->RequestMessage & (PAGE_SIZE - 1);
+        packet->page_buf[0].Length = req->request_msg.msg_len;
+        packet->page_buf[0].Offset =
+                (unsigned long)&req->request_msg & (PAGE_SIZE - 1);
 
-        packet->Completion.Send.SendCompletionContext = Request;/* packet; */
-        packet->Completion.Send.OnSendCompletion =
-                RndisFilterOnSendRequestCompletion;
-        packet->Completion.Send.SendCompletionTid = (unsigned long)Device;
+        packet->completion.send.send_completion_ctx = req;/* packet; */
+        packet->completion.send.send_completion =
+                rndis_filter_send_request_completion;
+        packet->completion.send.send_completion_tid = (unsigned long)dev;
 
-        ret = gRndisFilter.InnerDriver.OnSend(Device->NetDevice->Device, packet);
+        ret = rndis_filter.inner_drv.send(dev->net_dev->dev, packet);
         return ret;
 }
 
-static void RndisFilterReceiveResponse(struct rndis_device *Device,
-                                       struct rndis_message *Response)
+static void rndis_filter_receive_response(struct rndis_device *dev,
+                                       struct rndis_message *resp)
 {
         struct rndis_request *request = NULL;
         bool found = false;
         unsigned long flags;
 
-        spin_lock_irqsave(&Device->request_lock, flags);
-        list_for_each_entry(request, &Device->RequestList, ListEntry) {
+        spin_lock_irqsave(&dev->request_lock, flags);
+        list_for_each_entry(request, &dev->req_list, list_ent) {
                 /*
                  * All request/response message contains RequestId as the 1st
                  * field
                  */
-                if (request->RequestMessage.Message.InitializeRequest.RequestId
-                    == Response->Message.InitializeComplete.RequestId) {
+                if (request->request_msg.msg.init_req.req_id
+                    == resp->msg.init_complete.req_id) {
                         DPRINT_DBG(NETVSC, "found rndis request for "
                                 "this response (id 0x%x req type 0x%x res "
                                 "type 0x%x)",
-                                request->RequestMessage.Message.InitializeRequest.RequestId,
-                                request->RequestMessage.NdisMessageType,
-                                Response->NdisMessageType);
+                                request->request_msg.msg.
+                                   init_req.req_id,
+                                request->request_msg.ndis_msg_type,
+                                resp->ndis_msg_type);
 
                         found = true;
                         break;
                 }
         }
-        spin_unlock_irqrestore(&Device->request_lock, flags);
+        spin_unlock_irqrestore(&dev->request_lock, flags);
 
         if (found) {
-                if (Response->MessageLength <= sizeof(struct rndis_message)) {
-                        memcpy(&request->ResponseMessage, Response,
-                               Response->MessageLength);
+                if (resp->msg_len <= sizeof(struct rndis_message)) {
+                        memcpy(&request->response_msg, resp,
+                               resp->msg_len);
                 } else {
                         DPRINT_ERR(NETVSC, "rndis response buffer overflow "
                                   "detected (size %u max %zu)",
-                                  Response->MessageLength,
+                                  resp->msg_len,
                                   sizeof(struct rndis_filter_packet));
 
-                        if (Response->NdisMessageType ==
+                        if (resp->ndis_msg_type ==
                             REMOTE_NDIS_RESET_CMPLT) {
                                 /* does not have a request id field */
-                                request->ResponseMessage.Message.ResetComplete.Status = STATUS_BUFFER_OVERFLOW;
+                                request->response_msg.msg.reset_complete.
+                                        status = STATUS_BUFFER_OVERFLOW;
                         } else {
-                                request->ResponseMessage.Message.InitializeComplete.Status = STATUS_BUFFER_OVERFLOW;
+                                request->response_msg.msg.
+                                init_complete.status =
+                                        STATUS_BUFFER_OVERFLOW;
                         }
                 }
 
-                osd_WaitEventSet(request->WaitEvent);
+                osd_waitevent_set(request->waitevent);
         } else {
                 DPRINT_ERR(NETVSC, "no rndis request found for this response "
                            "(id 0x%x res type 0x%x)",
-                           Response->Message.InitializeComplete.RequestId,
-                           Response->NdisMessageType);
+                           resp->msg.init_complete.req_id,
+                           resp->ndis_msg_type);
         }
 }
 
-static void RndisFilterReceiveIndicateStatus(struct rndis_device *Device,
-                                             struct rndis_message *Response)
+static void rndis_filter_receive_indicate_status(struct rndis_device *dev,
+                                             struct rndis_message *resp)
 {
         struct rndis_indicate_status *indicate =
-                        &Response->Message.IndicateStatus;
-
-        if (indicate->Status == RNDIS_STATUS_MEDIA_CONNECT) {
-                gRndisFilter.InnerDriver.OnLinkStatusChanged(Device->NetDevice->Device, 1);
-        } else if (indicate->Status == RNDIS_STATUS_MEDIA_DISCONNECT) {
-                gRndisFilter.InnerDriver.OnLinkStatusChanged(Device->NetDevice->Device, 0);
+                        &resp->msg.indicate_status;
+
+        if (indicate->status == RNDIS_STATUS_MEDIA_CONNECT) {
+                rndis_filter.inner_drv.link_status_change(
+                        dev->net_dev->dev, 1);
+        } else if (indicate->status == RNDIS_STATUS_MEDIA_DISCONNECT) {
+                rndis_filter.inner_drv.link_status_change(
+                        dev->net_dev->dev, 0);
         } else {
                 /*
                  * TODO:
@@ -339,18 +349,18 @@ static void RndisFilterReceiveIndicateStatus(struct rndis_device *Device,
         }
 }
 
-static void RndisFilterReceiveData(struct rndis_device *Device,
-                                   struct rndis_message *Message,
-                                   struct hv_netvsc_packet *Packet)
+static void rndis_filter_receive_data(struct rndis_device *dev,
+                                   struct rndis_message *msg,
+                                   struct hv_netvsc_packet *pkt)
 {
-        struct rndis_packet *rndisPacket;
-        u32 dataOffset;
+        struct rndis_packet *rndis_pkt;
+        u32 data_offset;
 
         /* empty ethernet frame ?? */
         /* ASSERT(Packet->PageBuffers[0].Length > */
         /*      RNDIS_MESSAGE_SIZE(struct rndis_packet)); */
 
-        rndisPacket = &Message->Message.Packet;
+        rndis_pkt = &msg->msg.pkt;
 
         /*
          * FIXME: Handle multiple rndis pkt msgs that maybe enclosed in this
@@ -358,48 +368,48 @@ static void RndisFilterReceiveData(struct rndis_device *Device,
          */
 
         /* Remove the rndis header and pass it back up the stack */
-        dataOffset = RNDIS_HEADER_SIZE + rndisPacket->DataOffset;
+        data_offset = RNDIS_HEADER_SIZE + rndis_pkt->data_offset;
 
-        Packet->TotalDataBufferLength -= dataOffset;
-        Packet->PageBuffers[0].Offset += dataOffset;
-        Packet->PageBuffers[0].Length -= dataOffset;
+        pkt->total_data_buflen -= data_offset;
+        pkt->page_buf[0].Offset += data_offset;
+        pkt->page_buf[0].Length -= data_offset;
 
-        Packet->IsDataPacket = true;
+        pkt->is_data_pkt = true;
 
-        gRndisFilter.InnerDriver.OnReceiveCallback(Device->NetDevice->Device,
-                                                   Packet);
+        rndis_filter.inner_drv.recv_cb(dev->net_dev->dev,
+                                                   pkt);
 }
 
-static int RndisFilterOnReceive(struct hv_device *Device,
-                                struct hv_netvsc_packet *Packet)
+static int rndis_filter_receive(struct hv_device *dev,
+                                struct hv_netvsc_packet *pkt)
 {
-        struct netvsc_device *netDevice = Device->Extension;
-        struct rndis_device *rndisDevice;
-        struct rndis_message rndisMessage;
-        struct rndis_message *rndisHeader;
+        struct netvsc_device *net_dev = dev->Extension;
+        struct rndis_device *rndis_dev;
+        struct rndis_message rndis_msg;
+        struct rndis_message *rndis_hdr;
 
-        if (!netDevice)
+        if (!net_dev)
                 return -EINVAL;
 
         /* Make sure the rndis device state is initialized */
-        if (!netDevice->Extension) {
+        if (!net_dev->extension) {
                 DPRINT_ERR(NETVSC, "got rndis message but no rndis device..."
                           "dropping this message!");
                 return -1;
         }
 
-        rndisDevice = (struct rndis_device *)netDevice->Extension;
-        if (rndisDevice->State == RNDIS_DEV_UNINITIALIZED) {
+        rndis_dev = (struct rndis_device *)net_dev->extension;
+        if (rndis_dev->state == RNDIS_DEV_UNINITIALIZED) {
                 DPRINT_ERR(NETVSC, "got rndis message but rndis device "
                            "uninitialized...dropping this message!");
                 return -1;
         }
 
-        rndisHeader = (struct rndis_message *)kmap_atomic(
-                        pfn_to_page(Packet->PageBuffers[0].Pfn), KM_IRQ0);
+        rndis_hdr = (struct rndis_message *)kmap_atomic(
+                        pfn_to_page(pkt->page_buf[0].Pfn), KM_IRQ0);
 
-        rndisHeader = (void *)((unsigned long)rndisHeader +
-                        Packet->PageBuffers[0].Offset);
+        rndis_hdr = (void *)((unsigned long)rndis_hdr +
+                        pkt->page_buf[0].Offset);
 
         /* Make sure we got a valid rndis message */
         /*
@@ -408,39 +418,39 @@ static int RndisFilterOnReceive(struct hv_device *Device,
          * range shows 52 bytes
          * */
 #if 0
-        if (Packet->TotalDataBufferLength != rndisHeader->MessageLength) {
-                kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset,
+        if (pkt->total_data_buflen != rndis_hdr->msg_len) {
+                kunmap_atomic(rndis_hdr - pkt->page_buf[0].Offset,
                               KM_IRQ0);
 
                 DPRINT_ERR(NETVSC, "invalid rndis message? (expected %u "
                            "bytes got %u)...dropping this message!",
-                           rndisHeader->MessageLength,
-                           Packet->TotalDataBufferLength);
+                           rndis_hdr->msg_len,
+                           pkt->total_data_buflen);
                 return -1;
         }
 #endif
 
-        if ((rndisHeader->NdisMessageType != REMOTE_NDIS_PACKET_MSG) &&
-            (rndisHeader->MessageLength > sizeof(struct rndis_message))) {
+        if ((rndis_hdr->ndis_msg_type != REMOTE_NDIS_PACKET_MSG) &&
+            (rndis_hdr->msg_len > sizeof(struct rndis_message))) {
                 DPRINT_ERR(NETVSC, "incoming rndis message buffer overflow "
                            "detected (got %u, max %zu)...marking it an error!",
-                           rndisHeader->MessageLength,
+                           rndis_hdr->msg_len,
                            sizeof(struct rndis_message));
         }
 
-        memcpy(&rndisMessage, rndisHeader,
-                (rndisHeader->MessageLength > sizeof(struct rndis_message)) ?
+        memcpy(&rndis_msg, rndis_hdr,
+                (rndis_hdr->msg_len > sizeof(struct rndis_message)) ?
                         sizeof(struct rndis_message) :
-                        rndisHeader->MessageLength);
+                        rndis_hdr->msg_len);
 
-        kunmap_atomic(rndisHeader - Packet->PageBuffers[0].Offset, KM_IRQ0);
+        kunmap_atomic(rndis_hdr - pkt->page_buf[0].Offset, KM_IRQ0);
 
-        DumpRndisMessage(&rndisMessage);
+        dump_rndis_message(&rndis_msg);
 
-        switch (rndisMessage.NdisMessageType) {
+        switch (rndis_msg.ndis_msg_type) {
         case REMOTE_NDIS_PACKET_MSG:
                 /* data msg */
-                RndisFilterReceiveData(rndisDevice, &rndisMessage, Packet);
+                rndis_filter_receive_data(rndis_dev, &rndis_msg, pkt);
                 break;
 
         case REMOTE_NDIS_INITIALIZE_CMPLT:
@@ -449,37 +459,37 @@ static int RndisFilterOnReceive(struct hv_device *Device,
         /* case REMOTE_NDIS_RESET_CMPLT: */
         /* case REMOTE_NDIS_KEEPALIVE_CMPLT: */
                 /* completion msgs */
-                RndisFilterReceiveResponse(rndisDevice, &rndisMessage);
+                rndis_filter_receive_response(rndis_dev, &rndis_msg);
                 break;
 
         case REMOTE_NDIS_INDICATE_STATUS_MSG:
                 /* notification msgs */
-                RndisFilterReceiveIndicateStatus(rndisDevice, &rndisMessage);
+                rndis_filter_receive_indicate_status(rndis_dev, &rndis_msg);
                 break;
         default:
                 DPRINT_ERR(NETVSC, "unhandled rndis message (type %u len %u)",
-                           rndisMessage.NdisMessageType,
-                           rndisMessage.MessageLength);
+                           rndis_msg.ndis_msg_type,
+                           rndis_msg.msg_len);
                 break;
         }
 
         return 0;
 }
 
-static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,
-                                  void *Result, u32 *ResultSize)
+static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
+                                  void *result, u32 *result_size)
 {
         struct rndis_request *request;
-        u32 inresultSize = *ResultSize;
+        u32 inresult_size = *result_size;
         struct rndis_query_request *query;
-        struct rndis_query_complete *queryComplete;
+        struct rndis_query_complete *query_complete;
         int ret = 0;
 
-        if (!Result)
+        if (!result)
                 return -EINVAL;
 
-        *ResultSize = 0;
-        request = GetRndisRequest(Device, REMOTE_NDIS_QUERY_MSG,
+        *result_size = 0;
+        request = get_rndis_request(dev, REMOTE_NDIS_QUERY_MSG,
                         RNDIS_MESSAGE_SIZE(struct rndis_query_request));
         if (!request) {
                 ret = -1;
@@ -487,71 +497,71 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,
         }
 
         /* Setup the rndis query */
-        query = &request->RequestMessage.Message.QueryRequest;
-        query->Oid = Oid;
-        query->InformationBufferOffset = sizeof(struct rndis_query_request);
-        query->InformationBufferLength = 0;
-        query->DeviceVcHandle = 0;
+        query = &request->request_msg.msg.query_req;
+        query->oid = oid;
+        query->info_buf_offset = sizeof(struct rndis_query_request);
+        query->info_buflen = 0;
+        query->dev_vc_handle = 0;
 
-        ret = RndisFilterSendRequest(Device, request);
+        ret = rndis_filter_send_request(dev, request);
         if (ret != 0)
                 goto Cleanup;
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->waitevent);
 
         /* Copy the response back */
-        queryComplete = &request->ResponseMessage.Message.QueryComplete;
+        query_complete = &request->response_msg.msg.query_complete;
 
-        if (queryComplete->InformationBufferLength > inresultSize) {
+        if (query_complete->info_buflen > inresult_size) {
                 ret = -1;
                 goto Cleanup;
         }
 
-        memcpy(Result,
-               (void *)((unsigned long)queryComplete +
-                         queryComplete->InformationBufferOffset),
-               queryComplete->InformationBufferLength);
+        memcpy(result,
+               (void *)((unsigned long)query_complete +
+                         query_complete->info_buf_offset),
+               query_complete->info_buflen);
 
-        *ResultSize = queryComplete->InformationBufferLength;
+        *result_size = query_complete->info_buflen;
 
 Cleanup:
         if (request)
-                PutRndisRequest(Device, request);
+                put_rndis_request(dev, request);
 
         return ret;
 }
 
-static int RndisFilterQueryDeviceMac(struct rndis_device *Device)
+static int rndis_filter_query_device_mac(struct rndis_device *dev)
 {
         u32 size = ETH_ALEN;
 
-        return RndisFilterQueryDevice(Device,
+        return rndis_filter_query_device(dev,
                                       RNDIS_OID_802_3_PERMANENT_ADDRESS,
-                                      Device->HwMacAddr, &size);
+                                      dev->hw_mac_adr, &size);
 }
 
-static int RndisFilterQueryDeviceLinkStatus(struct rndis_device *Device)
+static int rndis_filter_query_device_link_status(struct rndis_device *dev)
 {
         u32 size = sizeof(u32);
 
-        return RndisFilterQueryDevice(Device,
+        return rndis_filter_query_device(dev,
                                       RNDIS_OID_GEN_MEDIA_CONNECT_STATUS,
-                                      &Device->LinkStatus, &size);
+                                      &dev->link_stat, &size);
 }
 
-static int RndisFilterSetPacketFilter(struct rndis_device *Device,
-                                      u32 NewFilter)
+static int rndis_filter_set_packet_filter(struct rndis_device *dev,
+                                      u32 new_filter)
 {
         struct rndis_request *request;
         struct rndis_set_request *set;
-        struct rndis_set_complete *setComplete;
+        struct rndis_set_complete *set_complete;
         u32 status;
         int ret;
 
         /* ASSERT(RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32) <= */
         /*      sizeof(struct rndis_message)); */
 
-        request = GetRndisRequest(Device, REMOTE_NDIS_SET_MSG,
+        request = get_rndis_request(dev, REMOTE_NDIS_SET_MSG,
                         RNDIS_MESSAGE_SIZE(struct rndis_set_request) +
                         sizeof(u32));
         if (!request) {
@@ -560,19 +570,19 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device,
         }
 
         /* Setup the rndis set */
-        set = &request->RequestMessage.Message.SetRequest;
-        set->Oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER;
-        set->InformationBufferLength = sizeof(u32);
-        set->InformationBufferOffset = sizeof(struct rndis_set_request);
+        set = &request->request_msg.msg.set_req;
+        set->oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER;
+        set->info_buflen = sizeof(u32);
+        set->info_buf_offset = sizeof(struct rndis_set_request);
 
         memcpy((void *)(unsigned long)set + sizeof(struct rndis_set_request),
-               &NewFilter, sizeof(u32));
+               &new_filter, sizeof(u32));
 
-        ret = RndisFilterSendRequest(Device, request);
+        ret = rndis_filter_send_request(dev, request);
         if (ret != 0)
                 goto Cleanup;
 
-        ret = osd_WaitEventWaitEx(request->WaitEvent, 2000/*2sec*/);
+        ret = osd_waitevent_waitex(request->waitevent, 2000/*2sec*/);
         if (!ret) {
                 ret = -1;
                 DPRINT_ERR(NETVSC, "timeout before we got a set response...");
@@ -584,27 +594,27 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device,
         } else {
                 if (ret > 0)
                         ret = 0;
-                setComplete = &request->ResponseMessage.Message.SetComplete;
-                status = setComplete->Status;
+                set_complete = &request->response_msg.msg.set_complete;
+                status = set_complete->status;
         }
 
 Cleanup:
         if (request)
-                PutRndisRequest(Device, request);
+                put_rndis_request(dev, request);
 Exit:
         return ret;
 }
 
-int RndisFilterInit(struct netvsc_driver *Driver)
+int rndis_filter_init(struct netvsc_driver *drv)
 {
         DPRINT_DBG(NETVSC, "sizeof(struct rndis_filter_packet) == %zd",
                    sizeof(struct rndis_filter_packet));
 
-        Driver->RequestExtSize = sizeof(struct rndis_filter_packet);
+        drv->req_ext_size = sizeof(struct rndis_filter_packet);
 
         /* Driver->Context = rndisDriver; */
 
-        memset(&gRndisFilter, 0, sizeof(struct rndis_filter_driver_object));
+        memset(&rndis_filter, 0, sizeof(struct rndis_filter_driver_object));
 
         /*rndisDriver->Driver = Driver;
 
@@ -612,38 +622,38 @@ int RndisFilterInit(struct netvsc_driver *Driver)
         rndisDriver->OnLinkStatusChanged = Driver->OnLinkStatusChanged;*/
 
         /* Save the original dispatch handlers before we override it */
-        gRndisFilter.InnerDriver.Base.OnDeviceAdd = Driver->Base.OnDeviceAdd;
-        gRndisFilter.InnerDriver.Base.OnDeviceRemove =
-                                        Driver->Base.OnDeviceRemove;
-        gRndisFilter.InnerDriver.Base.OnCleanup = Driver->Base.OnCleanup;
+        rndis_filter.inner_drv.base.OnDeviceAdd = drv->base.OnDeviceAdd;
+        rndis_filter.inner_drv.base.OnDeviceRemove =
+                                        drv->base.OnDeviceRemove;
+        rndis_filter.inner_drv.base.OnCleanup = drv->base.OnCleanup;
 
         /* ASSERT(Driver->OnSend); */
         /* ASSERT(Driver->OnReceiveCallback); */
-        gRndisFilter.InnerDriver.OnSend = Driver->OnSend;
-        gRndisFilter.InnerDriver.OnReceiveCallback = Driver->OnReceiveCallback;
-        gRndisFilter.InnerDriver.OnLinkStatusChanged =
-                                        Driver->OnLinkStatusChanged;
+        rndis_filter.inner_drv.send = drv->send;
+        rndis_filter.inner_drv.recv_cb = drv->recv_cb;
+        rndis_filter.inner_drv.link_status_change =
+                                        drv->link_status_change;
 
         /* Override */
-        Driver->Base.OnDeviceAdd = RndisFilterOnDeviceAdd;
-        Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove;
-        Driver->Base.OnCleanup = RndisFilterOnCleanup;
-        Driver->OnSend = RndisFilterOnSend;
+        drv->base.OnDeviceAdd = rndis_filte_device_add;
+        drv->base.OnDeviceRemove = rndis_filter_device_remove;
+        drv->base.OnCleanup = rndis_filter_cleanup;
+        drv->send = rndis_filter_send;
         /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */
-        Driver->OnReceiveCallback = RndisFilterOnReceive;
+        drv->recv_cb = rndis_filter_receive;
 
         return 0;
 }
 
-static int RndisFilterInitDevice(struct rndis_device *Device)
+static int rndis_filter_init_device(struct rndis_device *dev)
 {
         struct rndis_request *request;
         struct rndis_initialize_request *init;
-        struct rndis_initialize_complete *initComplete;
+        struct rndis_initialize_complete *init_complete;
         u32 status;
         int ret;
 
-        request = GetRndisRequest(Device, REMOTE_NDIS_INITIALIZE_MSG,
+        request = get_rndis_request(dev, REMOTE_NDIS_INITIALIZE_MSG,
                         RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
         if (!request) {
                 ret = -1;
@@ -651,105 +661,105 @@ static int RndisFilterInitDevice(struct rndis_device *Device)
         }
 
         /* Setup the rndis set */
-        init = &request->RequestMessage.Message.InitializeRequest;
-        init->MajorVersion = RNDIS_MAJOR_VERSION;
-        init->MinorVersion = RNDIS_MINOR_VERSION;
+        init = &request->request_msg.msg.init_req;
+        init->major_ver = RNDIS_MAJOR_VERSION;
+        init->minor_ver = RNDIS_MINOR_VERSION;
         /* FIXME: Use 1536 - rounded ethernet frame size */
-        init->MaxTransferSize = 2048;
+        init->max_xfer_size = 2048;
 
-        Device->State = RNDIS_DEV_INITIALIZING;
+        dev->state = RNDIS_DEV_INITIALIZING;
 
-        ret = RndisFilterSendRequest(Device, request);
+        ret = rndis_filter_send_request(dev, request);
         if (ret != 0) {
-                Device->State = RNDIS_DEV_UNINITIALIZED;
+                dev->state = RNDIS_DEV_UNINITIALIZED;
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->waitevent);
 
-        initComplete = &request->ResponseMessage.Message.InitializeComplete;
-        status = initComplete->Status;
+        init_complete = &request->response_msg.msg.init_complete;
+        status = init_complete->status;
         if (status == RNDIS_STATUS_SUCCESS) {
-                Device->State = RNDIS_DEV_INITIALIZED;
+                dev->state = RNDIS_DEV_INITIALIZED;
                 ret = 0;
         } else {
-                Device->State = RNDIS_DEV_UNINITIALIZED;
+                dev->state = RNDIS_DEV_UNINITIALIZED;
                 ret = -1;
         }
 
 Cleanup:
         if (request)
-                PutRndisRequest(Device, request);
+                put_rndis_request(dev, request);
 
         return ret;
 }
 
-static void RndisFilterHaltDevice(struct rndis_device *Device)
+static void rndis_filter_halt_device(struct rndis_device *dev)
 {
         struct rndis_request *request;
         struct rndis_halt_request *halt;
 
         /* Attempt to do a rndis device halt */
-        request = GetRndisRequest(Device, REMOTE_NDIS_HALT_MSG,
+        request = get_rndis_request(dev, REMOTE_NDIS_HALT_MSG,
                                 RNDIS_MESSAGE_SIZE(struct rndis_halt_request));
         if (!request)
                 goto Cleanup;
 
         /* Setup the rndis set */
-        halt = &request->RequestMessage.Message.HaltRequest;
-        halt->RequestId = atomic_inc_return(&Device->NewRequestId);
+        halt = &request->request_msg.msg.halt_req;
+        halt->req_id = atomic_inc_return(&dev->new_req_id);
 
         /* Ignore return since this msg is optional. */
-        RndisFilterSendRequest(Device, request);
+        rndis_filter_send_request(dev, request);
 
-        Device->State = RNDIS_DEV_UNINITIALIZED;
+        dev->state = RNDIS_DEV_UNINITIALIZED;
 
 Cleanup:
         if (request)
-                PutRndisRequest(Device, request);
+                put_rndis_request(dev, request);
         return;
 }
 
-static int RndisFilterOpenDevice(struct rndis_device *Device)
+static int rndis_filter_open_device(struct rndis_device *dev)
 {
         int ret;
 
-        if (Device->State != RNDIS_DEV_INITIALIZED)
+        if (dev->state != RNDIS_DEV_INITIALIZED)
                 return 0;
 
-        ret = RndisFilterSetPacketFilter(Device,
+        ret = rndis_filter_set_packet_filter(dev,
                                          NDIS_PACKET_TYPE_BROADCAST |
                                          NDIS_PACKET_TYPE_ALL_MULTICAST |
                                          NDIS_PACKET_TYPE_DIRECTED);
         if (ret == 0)
-                Device->State = RNDIS_DEV_DATAINITIALIZED;
+                dev->state = RNDIS_DEV_DATAINITIALIZED;
 
         return ret;
 }
 
-static int RndisFilterCloseDevice(struct rndis_device *Device)
+static int rndis_filter_close_device(struct rndis_device *dev)
 {
         int ret;
 
-        if (Device->State != RNDIS_DEV_DATAINITIALIZED)
+        if (dev->state != RNDIS_DEV_DATAINITIALIZED)
                 return 0;
 
-        ret = RndisFilterSetPacketFilter(Device, 0);
+        ret = rndis_filter_set_packet_filter(dev, 0);
         if (ret == 0)
-                Device->State = RNDIS_DEV_INITIALIZED;
+                dev->state = RNDIS_DEV_INITIALIZED;
 
         return ret;
 }
 
-static int RndisFilterOnDeviceAdd(struct hv_device *Device,
-                                  void *AdditionalInfo)
+static int rndis_filte_device_add(struct hv_device *dev,
+                                  void *additional_info)
 {
         int ret;
         struct netvsc_device *netDevice;
         struct rndis_device *rndisDevice;
-        struct netvsc_device_info *deviceInfo = AdditionalInfo;
+        struct netvsc_device_info *deviceInfo = additional_info;
 
-        rndisDevice = GetRndisDevice();
+        rndisDevice = get_rndis_device();
         if (!rndisDevice)
                 return -1;
 
@@ -760,7 +770,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
          * NOTE! Once the channel is created, we may get a receive callback
          * (RndisFilterOnReceive()) before this call is completed
          */
-        ret = gRndisFilter.InnerDriver.Base.OnDeviceAdd(Device, AdditionalInfo);
+        ret = rndis_filter.inner_drv.base.OnDeviceAdd(dev, additional_info);
         if (ret != 0) {
                 kfree(rndisDevice);
                 return ret;
@@ -768,15 +778,15 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
 
 
         /* Initialize the rndis device */
-        netDevice = Device->Extension;
+        netDevice = dev->Extension;
         /* ASSERT(netDevice); */
         /* ASSERT(netDevice->Device); */
 
-        netDevice->Extension = rndisDevice;
-        rndisDevice->NetDevice = netDevice;
+        netDevice->extension = rndisDevice;
+        rndisDevice->net_dev = netDevice;
 
         /* Send the rndis initialization message */
-        ret = RndisFilterInitDevice(rndisDevice);
+        ret = rndis_filter_init_device(rndisDevice);
         if (ret != 0) {
                 /*
                  * TODO: If rndis init failed, we will need to shut down the
@@ -785,7 +795,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
         }
 
         /* Get the mac address */
-        ret = RndisFilterQueryDeviceMac(rndisDevice);
+        ret = rndis_filter_query_device_mac(rndisDevice);
         if (ret != 0) {
                 /*
                  * TODO: shutdown rndis device and the channel
@@ -793,62 +803,62 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
         }
 
         DPRINT_INFO(NETVSC, "Device 0x%p mac addr %pM",
-                    rndisDevice, rndisDevice->HwMacAddr);
+                    rndisDevice, rndisDevice->hw_mac_adr);
 
-        memcpy(deviceInfo->MacAddr, rndisDevice->HwMacAddr, ETH_ALEN);
+        memcpy(deviceInfo->mac_adr, rndisDevice->hw_mac_adr, ETH_ALEN);
 
-        RndisFilterQueryDeviceLinkStatus(rndisDevice);
+        rndis_filter_query_device_link_status(rndisDevice);
 
-        deviceInfo->LinkState = rndisDevice->LinkStatus;
+        deviceInfo->link_state = rndisDevice->link_stat;
         DPRINT_INFO(NETVSC, "Device 0x%p link state %s", rndisDevice,
-                    ((deviceInfo->LinkState) ? ("down") : ("up")));
+                    ((deviceInfo->link_state) ? ("down") : ("up")));
 
         return ret;
 }
 
-static int RndisFilterOnDeviceRemove(struct hv_device *Device)
+static int rndis_filter_device_remove(struct hv_device *dev)
 {
-        struct netvsc_device *netDevice = Device->Extension;
-        struct rndis_device *rndisDevice = netDevice->Extension;
+        struct netvsc_device *net_dev = dev->Extension;
+        struct rndis_device *rndis_dev = net_dev->extension;
 
         /* Halt and release the rndis device */
-        RndisFilterHaltDevice(rndisDevice);
+        rndis_filter_halt_device(rndis_dev);
 
-        kfree(rndisDevice);
-        netDevice->Extension = NULL;
+        kfree(rndis_dev);
+        net_dev->extension = NULL;
 
         /* Pass control to inner driver to remove the device */
-        gRndisFilter.InnerDriver.Base.OnDeviceRemove(Device);
+        rndis_filter.inner_drv.base.OnDeviceRemove(dev);
 
         return 0;
 }
 
-static void RndisFilterOnCleanup(struct hv_driver *Driver)
+static void rndis_filter_cleanup(struct hv_driver *drv)
 {
 }
 
-int RndisFilterOnOpen(struct hv_device *Device)
+int rndis_filter_open(struct hv_device *dev)
 {
-        struct netvsc_device *netDevice = Device->Extension;
+        struct netvsc_device *netDevice = dev->Extension;
 
         if (!netDevice)
                 return -EINVAL;
 
-        return RndisFilterOpenDevice(netDevice->Extension);
+        return rndis_filter_open_device(netDevice->extension);
 }
 
-int RndisFilterOnClose(struct hv_device *Device)
+int rndis_filter_close(struct hv_device *dev)
 {
-        struct netvsc_device *netDevice = Device->Extension;
+        struct netvsc_device *netDevice = dev->Extension;
 
         if (!netDevice)
                 return -EINVAL;
 
-        return RndisFilterCloseDevice(netDevice->Extension);
+        return rndis_filter_close_device(netDevice->extension);
 }
 
-static int RndisFilterOnSend(struct hv_device *Device,
-                             struct hv_netvsc_packet *Packet)
+static int rndis_filter_send(struct hv_device *dev,
+                             struct hv_netvsc_packet *pkt)
 {
         int ret;
         struct rndis_filter_packet *filterPacket;
@@ -857,62 +867,62 @@ static int RndisFilterOnSend(struct hv_device *Device,
         u32 rndisMessageSize;
 
         /* Add the rndis header */
-        filterPacket = (struct rndis_filter_packet *)Packet->Extension;
+        filterPacket = (struct rndis_filter_packet *)pkt->extension;
         /* ASSERT(filterPacket); */
 
         memset(filterPacket, 0, sizeof(struct rndis_filter_packet));
 
-        rndisMessage = &filterPacket->Message;
+        rndisMessage = &filterPacket->msg;
         rndisMessageSize = RNDIS_MESSAGE_SIZE(struct rndis_packet);
 
-        rndisMessage->NdisMessageType = REMOTE_NDIS_PACKET_MSG;
-        rndisMessage->MessageLength = Packet->TotalDataBufferLength +
+        rndisMessage->ndis_msg_type = REMOTE_NDIS_PACKET_MSG;
+        rndisMessage->msg_len = pkt->total_data_buflen +
                                       rndisMessageSize;
 
-        rndisPacket = &rndisMessage->Message.Packet;
-        rndisPacket->DataOffset = sizeof(struct rndis_packet);
-        rndisPacket->DataLength = Packet->TotalDataBufferLength;
+        rndisPacket = &rndisMessage->msg.pkt;
+        rndisPacket->data_offset = sizeof(struct rndis_packet);
+        rndisPacket->data_len = pkt->total_data_buflen;
 
-        Packet->IsDataPacket = true;
-        Packet->PageBuffers[0].Pfn = virt_to_phys(rndisMessage) >> PAGE_SHIFT;
-        Packet->PageBuffers[0].Offset =
+        pkt->is_data_pkt = true;
+        pkt->page_buf[0].Pfn = virt_to_phys(rndisMessage) >> PAGE_SHIFT;
+        pkt->page_buf[0].Offset =
                         (unsigned long)rndisMessage & (PAGE_SIZE-1);
-        Packet->PageBuffers[0].Length = rndisMessageSize;
+        pkt->page_buf[0].Length = rndisMessageSize;
 
         /* Save the packet send completion and context */
-        filterPacket->OnCompletion = Packet->Completion.Send.OnSendCompletion;
-        filterPacket->CompletionContext =
-                                Packet->Completion.Send.SendCompletionContext;
+        filterPacket->completion = pkt->completion.send.send_completion;
+        filterPacket->completion_ctx =
+                                pkt->completion.send.send_completion_ctx;
 
         /* Use ours */
-        Packet->Completion.Send.OnSendCompletion = RndisFilterOnSendCompletion;
-        Packet->Completion.Send.SendCompletionContext = filterPacket;
+        pkt->completion.send.send_completion = rndis_filter_send_completion;
+        pkt->completion.send.send_completion_ctx = filterPacket;
 
-        ret = gRndisFilter.InnerDriver.OnSend(Device, Packet);
+        ret = rndis_filter.inner_drv.send(dev, pkt);
         if (ret != 0) {
                 /*
                  * Reset the completion to originals to allow retries from
                  * above
                  */
-                Packet->Completion.Send.OnSendCompletion =
-                                filterPacket->OnCompletion;
-                Packet->Completion.Send.SendCompletionContext =
-                                filterPacket->CompletionContext;
+                pkt->completion.send.send_completion =
+                                filterPacket->completion;
+                pkt->completion.send.send_completion_ctx =
+                                filterPacket->completion_ctx;
         }
 
         return ret;
 }
 
-static void RndisFilterOnSendCompletion(void *Context)
+static void rndis_filter_send_completion(void *ctx)
 {
-        struct rndis_filter_packet *filterPacket = Context;
+        struct rndis_filter_packet *filterPacket = ctx;
 
         /* Pass it back to the original handler */
-        filterPacket->OnCompletion(filterPacket->CompletionContext);
+        filterPacket->completion(filterPacket->completion_ctx);
 }
 
 
-static void RndisFilterOnSendRequestCompletion(void *Context)
+static void rndis_filter_send_request_completion(void *ctx)
 {
         /* Noop */
 }
diff --git a/drivers/staging/hv/rndis_filter.h b/drivers/staging/hv/rndis_filter.h
index 764b9bf3e5dc..4da18f3cbade 100644
--- a/drivers/staging/hv/rndis_filter.h
+++ b/drivers/staging/hv/rndis_filter.h
@@ -50,6 +50,6 @@
 
 /* Interface */
 
-extern int RndisFilterInit(struct netvsc_driver *driver);
+extern int rndis_filter_init(struct netvsc_driver *driver);
 
 #endif /* _RNDISFILTER_H_ */
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 19e87f689fa0..9295113e09b9 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -34,43 +34,43 @@
 struct storvsc_request_extension {
         /* LIST_ENTRY ListEntry; */
 
-        struct hv_storvsc_request *Request;
-        struct hv_device *Device;
+        struct hv_storvsc_request *request;
+        struct hv_device *device;
 
         /* Synchronize the request/response if needed */
-        struct osd_waitevent *WaitEvent;
+        struct osd_waitevent *wait_event;
 
-        struct vstor_packet VStorPacket;
+        struct vstor_packet vstor_packet;
 };
 
 /* A storvsc device is a device object that contains a vmbus channel */
 struct storvsc_device {
-        struct hv_device *Device;
+        struct hv_device *device;
 
         /* 0 indicates the device is being destroyed */
-        atomic_t RefCount;
+        atomic_t ref_count;
 
-        atomic_t NumOutstandingRequests;
+        atomic_t num_outstanding_req;
 
         /*
          * Each unique Port/Path/Target represents 1 channel ie scsi
          * controller. In reality, the pathid, targetid is always 0
          * and the port is set by us
          */
-        unsigned int PortNumber;
-        unsigned char PathId;
-        unsigned char TargetId;
+        unsigned int port_number;
+        unsigned char path_id;
+        unsigned char target_id;
 
         /* LIST_ENTRY OutstandingRequestList; */
         /* HANDLE OutstandingRequestLock; */
 
         /* Used for vsc/vsp channel reset process */
-        struct storvsc_request_extension InitRequest;
-        struct storvsc_request_extension ResetRequest;
+        struct storvsc_request_extension init_request;
+        struct storvsc_request_extension reset_request;
 };
 
 
-static const char *gDriverName = "storvsc";
+static const char *g_driver_name = "storvsc";
 
 /* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
 static const struct hv_guid gStorVscDeviceType = {
@@ -81,131 +81,133 @@ static const struct hv_guid gStorVscDeviceType = {
 };
 
 
-static inline struct storvsc_device *AllocStorDevice(struct hv_device *Device)
+static inline struct storvsc_device *alloc_stor_device(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = kzalloc(sizeof(struct storvsc_device), GFP_KERNEL);
-        if (!storDevice)
+        stor_device = kzalloc(sizeof(struct storvsc_device), GFP_KERNEL);
+        if (!stor_device)
                 return NULL;
 
         /* Set to 2 to allow both inbound and outbound traffics */
-        /* (ie GetStorDevice() and MustGetStorDevice()) to proceed. */
-        atomic_cmpxchg(&storDevice->RefCount, 0, 2);
+        /* (ie get_stor_device() and must_get_stor_device()) to proceed. */
+        atomic_cmpxchg(&stor_device->ref_count, 0, 2);
 
-        storDevice->Device = Device;
-        Device->Extension = storDevice;
+        stor_device->device = device;
+        device->Extension = stor_device;
 
-        return storDevice;
+        return stor_device;
 }
 
-static inline void FreeStorDevice(struct storvsc_device *Device)
+static inline void free_stor_device(struct storvsc_device *device)
 {
-        /* ASSERT(atomic_read(&Device->RefCount) == 0); */
-        kfree(Device);
+        /* ASSERT(atomic_read(&device->ref_count) == 0); */
+        kfree(device);
 }
 
 /* Get the stordevice object iff exists and its refcount > 1 */
-static inline struct storvsc_device *GetStorDevice(struct hv_device *Device)
+static inline struct storvsc_device *get_stor_device(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = (struct storvsc_device *)Device->Extension;
-        if (storDevice && atomic_read(&storDevice->RefCount) > 1)
-                atomic_inc(&storDevice->RefCount);
+        stor_device = (struct storvsc_device *)device->Extension;
+        if (stor_device && atomic_read(&stor_device->ref_count) > 1)
+                atomic_inc(&stor_device->ref_count);
         else
-                storDevice = NULL;
+                stor_device = NULL;
 
-        return storDevice;
+        return stor_device;
 }
 
 /* Get the stordevice object iff exists and its refcount > 0 */
-static inline struct storvsc_device *MustGetStorDevice(struct hv_device *Device)
+static inline struct storvsc_device *must_get_stor_device(
+                                        struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = (struct storvsc_device *)Device->Extension;
-        if (storDevice && atomic_read(&storDevice->RefCount))
-                atomic_inc(&storDevice->RefCount);
+        stor_device = (struct storvsc_device *)device->Extension;
+        if (stor_device && atomic_read(&stor_device->ref_count))
+                atomic_inc(&stor_device->ref_count);
         else
-                storDevice = NULL;
+                stor_device = NULL;
 
-        return storDevice;
+        return stor_device;
 }
 
-static inline void PutStorDevice(struct hv_device *Device)
+static inline void put_stor_device(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = (struct storvsc_device *)Device->Extension;
-        /* ASSERT(storDevice); */
+        stor_device = (struct storvsc_device *)device->Extension;
+        /* ASSERT(stor_device); */
 
-        atomic_dec(&storDevice->RefCount);
-        /* ASSERT(atomic_read(&storDevice->RefCount)); */
+        atomic_dec(&stor_device->ref_count);
+        /* ASSERT(atomic_read(&stor_device->ref_count)); */
 }
 
-/* Drop ref count to 1 to effectively disable GetStorDevice() */
-static inline struct storvsc_device *ReleaseStorDevice(struct hv_device *Device)
+/* Drop ref count to 1 to effectively disable get_stor_device() */
+static inline struct storvsc_device *release_stor_device(
+                                        struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = (struct storvsc_device *)Device->Extension;
-        /* ASSERT(storDevice); */
+        stor_device = (struct storvsc_device *)device->Extension;
+        /* ASSERT(stor_device); */
 
         /* Busy wait until the ref drop to 2, then set it to 1 */
-        while (atomic_cmpxchg(&storDevice->RefCount, 2, 1) != 2)
+        while (atomic_cmpxchg(&stor_device->ref_count, 2, 1) != 2)
                 udelay(100);
 
-        return storDevice;
+        return stor_device;
 }
 
-/* Drop ref count to 0. No one can use StorDevice object. */
-static inline struct storvsc_device *FinalReleaseStorDevice(
-                        struct hv_device *Device)
+/* Drop ref count to 0. No one can use stor_device object. */
+static inline struct storvsc_device *final_release_stor_device(
+                        struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = (struct storvsc_device *)Device->Extension;
-        /* ASSERT(storDevice); */
+        stor_device = (struct storvsc_device *)device->Extension;
+        /* ASSERT(stor_device); */
 
         /* Busy wait until the ref drop to 1, then set it to 0 */
-        while (atomic_cmpxchg(&storDevice->RefCount, 1, 0) != 1)
+        while (atomic_cmpxchg(&stor_device->ref_count, 1, 0) != 1)
                 udelay(100);
 
-        Device->Extension = NULL;
-        return storDevice;
+        device->Extension = NULL;
+        return stor_device;
 }
 
-static int StorVscChannelInit(struct hv_device *Device)
+static int stor_vsc_channel_init(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
         struct storvsc_request_extension *request;
-        struct vstor_packet *vstorPacket;
+        struct vstor_packet *vstor_packet;
         int ret;
 
-        storDevice = GetStorDevice(Device);
-        if (!storDevice) {
+        stor_device = get_stor_device(device);
+        if (!stor_device) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
                            "device being destroyed?");
                 return -1;
         }
 
-        request = &storDevice->InitRequest;
-        vstorPacket = &request->VStorPacket;
+        request = &stor_device->init_request;
+        vstor_packet = &request->vstor_packet;
 
         /*
          * Now, initiate the vsc/vsp initialization protocol on the open
          * channel
          */
         memset(request, 0, sizeof(struct storvsc_request_extension));
-        request->WaitEvent = osd_WaitEventCreate();
-        if (!request->WaitEvent) {
+        request->wait_event = osd_waitevent_create();
+        if (!request->wait_event) {
                 ret = -ENOMEM;
                 goto nomem;
         }
 
-        vstorPacket->Operation = VStorOperationBeginInitialization;
-        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
+        vstor_packet->operation = VSTOR_OPERATION_BEGIN_INITIALIZATION;
+        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
         /*SpinlockAcquire(gDriverExt.packetListLock);
         INSERT_TAIL_LIST(&gDriverExt.packetList, &packet->listEntry.entry);
@@ -213,7 +215,7 @@ static int StorVscChannelInit(struct hv_device *Device)
 
         DPRINT_INFO(STORVSC, "BEGIN_INITIALIZATION_OPERATION...");
 
-        ret = vmbus_sendpacket(Device->channel, vstorPacket,
+        ret = vmbus_sendpacket(device->channel, vstor_packet,
                                sizeof(struct vstor_packet),
                                (unsigned long)request,
                                VmbusPacketTypeDataInBand,
@@ -224,27 +226,27 @@ static int StorVscChannelInit(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->wait_event);
 
-        if (vstorPacket->Operation != VStorOperationCompleteIo ||
-            vstorPacket->Status != 0) {
+        if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
+            vstor_packet->status != 0) {
                 DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed "
                            "(op %d status 0x%x)",
-                           vstorPacket->Operation, vstorPacket->Status);
+                           vstor_packet->operation, vstor_packet->status);
                 goto Cleanup;
         }
 
         DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION...");
 
         /* reuse the packet for version range supported */
-        memset(vstorPacket, 0, sizeof(struct vstor_packet));
-        vstorPacket->Operation = VStorOperationQueryProtocolVersion;
-        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
+        memset(vstor_packet, 0, sizeof(struct vstor_packet));
+        vstor_packet->operation = VSTOR_OPERATION_QUERY_PROTOCOL_VERSION;
+        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
-        vstorPacket->Version.MajorMinor = VMSTOR_PROTOCOL_VERSION_CURRENT;
-        FILL_VMSTOR_REVISION(vstorPacket->Version.Revision);
+        vstor_packet->version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT;
+        FILL_VMSTOR_REVISION(vstor_packet->version.revision);
 
-        ret = vmbus_sendpacket(Device->channel, vstorPacket,
+        ret = vmbus_sendpacket(device->channel, vstor_packet,
                                sizeof(struct vstor_packet),
                                (unsigned long)request,
                                VmbusPacketTypeDataInBand,
@@ -255,27 +257,27 @@ static int StorVscChannelInit(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->wait_event);
 
         /* TODO: Check returned version */
-        if (vstorPacket->Operation != VStorOperationCompleteIo ||
-            vstorPacket->Status != 0) {
+        if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
+            vstor_packet->status != 0) {
                 DPRINT_ERR(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION failed "
                            "(op %d status 0x%x)",
-                           vstorPacket->Operation, vstorPacket->Status);
+                           vstor_packet->operation, vstor_packet->status);
                 goto Cleanup;
         }
 
         /* Query channel properties */
         DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION...");
 
-        memset(vstorPacket, 0, sizeof(struct vstor_packet));
-        vstorPacket->Operation = VStorOperationQueryProperties;
-        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
-        vstorPacket->StorageChannelProperties.PortNumber =
-                                        storDevice->PortNumber;
+        memset(vstor_packet, 0, sizeof(struct vstor_packet));
+        vstor_packet->operation = VSTOR_OPERATION_QUERY_PROPERTIES;
+        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
+        vstor_packet->storage_channel_properties.port_number =
+                                        stor_device->port_number;
 
-        ret = vmbus_sendpacket(Device->channel, vstorPacket,
+        ret = vmbus_sendpacket(device->channel, vstor_packet,
                                sizeof(struct vstor_packet),
                                (unsigned long)request,
                                VmbusPacketTypeDataInBand,
@@ -287,31 +289,32 @@ static int StorVscChannelInit(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->wait_event);
 
         /* TODO: Check returned version */
-        if (vstorPacket->Operation != VStorOperationCompleteIo ||
-            vstorPacket->Status != 0) {
+        if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
+            vstor_packet->status != 0) {
                 DPRINT_ERR(STORVSC, "QUERY_PROPERTIES_OPERATION failed "
                            "(op %d status 0x%x)",
-                           vstorPacket->Operation, vstorPacket->Status);
+                           vstor_packet->operation, vstor_packet->status);
                 goto Cleanup;
         }
 
-        storDevice->PathId = vstorPacket->StorageChannelProperties.PathId;
-        storDevice->TargetId = vstorPacket->StorageChannelProperties.TargetId;
+        stor_device->path_id = vstor_packet->storage_channel_properties.path_id;
+        stor_device->target_id
+                = vstor_packet->storage_channel_properties.target_id;
 
         DPRINT_DBG(STORVSC, "channel flag 0x%x, max xfer len 0x%x",
-                   vstorPacket->StorageChannelProperties.Flags,
-                   vstorPacket->StorageChannelProperties.MaxTransferBytes);
+                   vstor_packet->storage_channel_properties.flags,
+                   vstor_packet->storage_channel_properties.max_transfer_bytes);
 
         DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION...");
 
-        memset(vstorPacket, 0, sizeof(struct vstor_packet));
-        vstorPacket->Operation = VStorOperationEndInitialization;
-        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
+        memset(vstor_packet, 0, sizeof(struct vstor_packet));
+        vstor_packet->operation = VSTOR_OPERATION_END_INITIALIZATION;
+        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
-        ret = vmbus_sendpacket(Device->channel, vstorPacket,
+        ret = vmbus_sendpacket(device->channel, vstor_packet,
                                sizeof(struct vstor_packet),
                                (unsigned long)request,
                                VmbusPacketTypeDataInBand,
@@ -323,125 +326,125 @@ static int StorVscChannelInit(struct hv_device *Device)
                 goto Cleanup;
         }
 
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->wait_event);
 
-        if (vstorPacket->Operation != VStorOperationCompleteIo ||
-            vstorPacket->Status != 0) {
+        if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
+            vstor_packet->status != 0) {
                 DPRINT_ERR(STORVSC, "END_INITIALIZATION_OPERATION failed "
                            "(op %d status 0x%x)",
-                           vstorPacket->Operation, vstorPacket->Status);
+                           vstor_packet->operation, vstor_packet->status);
                 goto Cleanup;
         }
 
         DPRINT_INFO(STORVSC, "**** storage channel up and running!! ****");
 
 Cleanup:
-        kfree(request->WaitEvent);
-        request->WaitEvent = NULL;
+        kfree(request->wait_event);
+        request->wait_event = NULL;
 nomem:
-        PutStorDevice(Device);
+        put_stor_device(device);
         return ret;
 }
 
-static void StorVscOnIOCompletion(struct hv_device *Device,
-                                  struct vstor_packet *VStorPacket,
-                                  struct storvsc_request_extension *RequestExt)
+static void stor_vsc_on_io_completion(struct hv_device *device,
+                                  struct vstor_packet *vstor_packet,
+                                  struct storvsc_request_extension *request_ext)
 {
         struct hv_storvsc_request *request;
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
-        storDevice = MustGetStorDevice(Device);
-        if (!storDevice) {
+        stor_device = must_get_stor_device(device);
+        if (!stor_device) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
                            "device being destroyed?");
                 return;
         }
 
         DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p "
-                   "completed bytes xfer %u", RequestExt,
-                   VStorPacket->VmSrb.DataTransferLength);
+                   "completed bytes xfer %u", request_ext,
+                   vstor_packet->vm_srb.data_transfer_length);
 
-        /* ASSERT(RequestExt != NULL); */
-        /* ASSERT(RequestExt->Request != NULL); */
+        /* ASSERT(request_ext != NULL); */
+        /* ASSERT(request_ext->request != NULL); */
 
-        request = RequestExt->Request;
+        request = request_ext->request;
 
         /* ASSERT(request->OnIOCompletion != NULL); */
 
         /* Copy over the status...etc */
-        request->Status = VStorPacket->VmSrb.ScsiStatus;
+        request->status = vstor_packet->vm_srb.scsi_status;
 
-        if (request->Status != 0 || VStorPacket->VmSrb.SrbStatus != 1) {
+        if (request->status != 0 || vstor_packet->vm_srb.srb_status != 1) {
                 DPRINT_WARN(STORVSC,
                             "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
-                            request->Cdb[0], VStorPacket->VmSrb.ScsiStatus,
-                            VStorPacket->VmSrb.SrbStatus);
+                            request->cdb[0], vstor_packet->vm_srb.scsi_status,
+                            vstor_packet->vm_srb.srb_status);
         }
 
-        if ((request->Status & 0xFF) == 0x02) {
+        if ((request->status & 0xFF) == 0x02) {
                 /* CHECK_CONDITION */
-                if (VStorPacket->VmSrb.SrbStatus & 0x80) {
+                if (vstor_packet->vm_srb.srb_status & 0x80) {
                         /* autosense data available */
                         DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data "
-                                    "valid - len %d\n", RequestExt,
-                                    VStorPacket->VmSrb.SenseInfoLength);
+                                    "valid - len %d\n", request_ext,
+                                    vstor_packet->vm_srb.sense_info_length);
 
-                        /* ASSERT(VStorPacket->VmSrb.SenseInfoLength <= */
+                        /* ASSERT(vstor_packet->vm_srb.sense_info_length <= */
                         /*      request->SenseBufferSize); */
-                        memcpy(request->SenseBuffer,
-                               VStorPacket->VmSrb.SenseData,
-                               VStorPacket->VmSrb.SenseInfoLength);
+                        memcpy(request->sense_buffer,
+                               vstor_packet->vm_srb.sense_data,
+                               vstor_packet->vm_srb.sense_info_length);
 
-                        request->SenseBufferSize =
-                                        VStorPacket->VmSrb.SenseInfoLength;
+                        request->sense_buffer_size =
+                                        vstor_packet->vm_srb.sense_info_length;
                 }
         }
 
         /* TODO: */
-        request->BytesXfer = VStorPacket->VmSrb.DataTransferLength;
+        request->bytes_xfer = vstor_packet->vm_srb.data_transfer_length;
 
-        request->OnIOCompletion(request);
+        request->on_io_completion(request);
 
-        atomic_dec(&storDevice->NumOutstandingRequests);
+        atomic_dec(&stor_device->num_outstanding_req);
 
-        PutStorDevice(Device);
+        put_stor_device(device);
 }
 
-static void StorVscOnReceive(struct hv_device *Device,
-                             struct vstor_packet *VStorPacket,
-                             struct storvsc_request_extension *RequestExt)
+static void stor_vsc_on_receive(struct hv_device *device,
+                             struct vstor_packet *vstor_packet,
+                             struct storvsc_request_extension *request_ext)
 {
-        switch (VStorPacket->Operation) {
-        case VStorOperationCompleteIo:
+        switch (vstor_packet->operation) {
+        case VSTOR_OPERATION_COMPLETE_IO:
                 DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION");
-                StorVscOnIOCompletion(Device, VStorPacket, RequestExt);
+                stor_vsc_on_io_completion(device, vstor_packet, request_ext);
                 break;
-        case VStorOperationRemoveDevice:
+        case VSTOR_OPERATION_REMOVE_DEVICE:
                 DPRINT_INFO(STORVSC, "REMOVE_DEVICE_OPERATION");
                 /* TODO: */
                 break;
 
         default:
                 DPRINT_INFO(STORVSC, "Unknown operation received - %d",
-                            VStorPacket->Operation);
+                            vstor_packet->operation);
                 break;
         }
 }
 
-static void StorVscOnChannelCallback(void *context)
+static void stor_vsc_on_channel_callback(void *context)
 {
         struct hv_device *device = (struct hv_device *)context;
-        struct storvsc_device *storDevice;
-        u32 bytesRecvd;
-        u64 requestId;
+        struct storvsc_device *stor_device;
+        u32 bytes_recvd;
+        u64 request_id;
         unsigned char packet[ALIGN_UP(sizeof(struct vstor_packet), 8)];
         struct storvsc_request_extension *request;
         int ret;
 
         /* ASSERT(device); */
 
-        storDevice = MustGetStorDevice(device);
-        if (!storDevice) {
+        stor_device = must_get_stor_device(device);
+        if (!stor_device) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
                            "device being destroyed?");
                 return;
@@ -450,32 +453,33 @@ static void StorVscOnChannelCallback(void *context)
         do {
                 ret = vmbus_recvpacket(device->channel, packet,
                                        ALIGN_UP(sizeof(struct vstor_packet), 8),
-                                       &bytesRecvd, &requestId);
-                if (ret == 0 && bytesRecvd > 0) {
+                                       &bytes_recvd, &request_id);
+                if (ret == 0 && bytes_recvd > 0) {
                         DPRINT_DBG(STORVSC, "receive %d bytes - tid %llx",
-                                   bytesRecvd, requestId);
+                                   bytes_recvd, request_id);
 
-                        /* ASSERT(bytesRecvd == sizeof(struct vstor_packet)); */
+                        /* ASSERT(bytes_recvd ==
+                                        sizeof(struct vstor_packet)); */
 
                         request = (struct storvsc_request_extension *)
-                                        (unsigned long)requestId;
+                                        (unsigned long)request_id;
                         /* ASSERT(request);c */
 
-                        /* if (vstorPacket.Flags & SYNTHETIC_FLAG) */
-                        if ((request == &storDevice->InitRequest) ||
-                            (request == &storDevice->ResetRequest)) {
+                        /* if (vstor_packet.Flags & SYNTHETIC_FLAG) */
+                        if ((request == &stor_device->init_request) ||
+                            (request == &stor_device->reset_request)) {
                                 /* DPRINT_INFO(STORVSC,
                                  *             "reset completion - operation "
                                  *             "%u status %u",
-                                 *             vstorPacket.Operation,
-                                 *             vstorPacket.Status); */
+                                 *             vstor_packet.Operation,
+                                 *             vstor_packet.Status); */
 
-                                memcpy(&request->VStorPacket, packet,
+                                memcpy(&request->vstor_packet, packet,
                                        sizeof(struct vstor_packet));
 
-                                osd_WaitEventSet(request->WaitEvent);
+                                osd_waitevent_set(request->wait_event);
                         } else {
-                                StorVscOnReceive(device,
+                                stor_vsc_on_receive(device,
                                                 (struct vstor_packet *)packet,
                                                 request);
                         }
@@ -485,52 +489,55 @@ static void StorVscOnChannelCallback(void *context)
                 }
         } while (1);
 
-        PutStorDevice(device);
+        put_stor_device(device);
         return;
 }
 
-static int StorVscConnectToVsp(struct hv_device *Device)
+static int stor_vsc_connect_to_vsp(struct hv_device *device)
 {
         struct vmstorage_channel_properties props;
-        struct storvsc_driver_object *storDriver;
+        struct storvsc_driver_object *stor_driver;
         int ret;
 
-        storDriver = (struct storvsc_driver_object *)Device->Driver;
+        stor_driver = (struct storvsc_driver_object *)device->Driver;
         memset(&props, 0, sizeof(struct vmstorage_channel_properties));
 
         /* Open the channel */
-        ret = vmbus_open(Device->channel,
-                         storDriver->RingBufferSize, storDriver->RingBufferSize,
+        ret = vmbus_open(device->channel,
+                         stor_driver->ring_buffer_size,
+                         stor_driver->ring_buffer_size,
                          (void *)&props,
                          sizeof(struct vmstorage_channel_properties),
-                         StorVscOnChannelCallback, Device);
+                         stor_vsc_on_channel_callback, device);
 
         DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d",
-                   props.PathId, props.TargetId, props.MaxTransferBytes);
+                   props.path_id, props.target_id, props.max_transfer_bytes);
 
         if (ret != 0) {
                 DPRINT_ERR(STORVSC, "unable to open channel: %d", ret);
                 return -1;
         }
 
-        ret = StorVscChannelInit(Device);
+        ret = stor_vsc_channel_init(device);
 
         return ret;
 }
 
 /*
- * StorVscOnDeviceAdd - Callback when the device belonging to this driver is added
+ * stor_vsc_on_device_add - Callback when the device belonging to this driver
+ * is added
  */
-static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
+static int stor_vsc_on_device_add(struct hv_device *device,
+                                        void *additional_info)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
         /* struct vmstorage_channel_properties *props; */
-        struct storvsc_device_info *deviceInfo;
+        struct storvsc_device_info *device_info;
         int ret = 0;
 
-        deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
-        storDevice = AllocStorDevice(Device);
-        if (!storDevice) {
+        device_info = (struct storvsc_device_info *)additional_info;
+        stor_device = alloc_stor_device(device);
+        if (!stor_device) {
                 ret = -1;
                 goto Cleanup;
         }
@@ -550,103 +557,103 @@ static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         storChannel->PathId = props->PathId;
         storChannel->TargetId = props->TargetId; */
 
-        storDevice->PortNumber = deviceInfo->PortNumber;
+        stor_device->port_number = device_info->port_number;
         /* Send it back up */
-        ret = StorVscConnectToVsp(Device);
+        ret = stor_vsc_connect_to_vsp(device);
 
-        /* deviceInfo->PortNumber = storDevice->PortNumber; */
-        deviceInfo->PathId = storDevice->PathId;
-        deviceInfo->TargetId = storDevice->TargetId;
+        /* device_info->PortNumber = stor_device->PortNumber; */
+        device_info->path_id = stor_device->path_id;
+        device_info->target_id = stor_device->target_id;
 
         DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n",
-                   storDevice->PortNumber, storDevice->PathId,
-                   storDevice->TargetId);
+                   stor_device->port_number, stor_device->path_id,
+                   stor_device->target_id);
 
 Cleanup:
         return ret;
 }
 
 /*
- * StorVscOnDeviceRemove - Callback when the our device is being removed
+ * stor_vsc_on_device_remove - Callback when the our device is being removed
  */
-static int StorVscOnDeviceRemove(struct hv_device *Device)
+static int stor_vsc_on_device_remove(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
 
         DPRINT_INFO(STORVSC, "disabling storage device (%p)...",
-                    Device->Extension);
+                    device->Extension);
 
-        storDevice = ReleaseStorDevice(Device);
+        stor_device = release_stor_device(device);
 
         /*
          * At this point, all outbound traffic should be disable. We
          * only allow inbound traffic (responses) to proceed so that
          * outstanding requests can be completed.
          */
-        while (atomic_read(&storDevice->NumOutstandingRequests)) {
+        while (atomic_read(&stor_device->num_outstanding_req)) {
                 DPRINT_INFO(STORVSC, "waiting for %d requests to complete...",
-                            atomic_read(&storDevice->NumOutstandingRequests));
+                            atomic_read(&stor_device->num_outstanding_req));
                 udelay(100);
         }
 
         DPRINT_INFO(STORVSC, "removing storage device (%p)...",
-                    Device->Extension);
+                    device->Extension);
 
-        storDevice = FinalReleaseStorDevice(Device);
+        stor_device = final_release_stor_device(device);
 
-        DPRINT_INFO(STORVSC, "storage device (%p) safe to remove", storDevice);
+        DPRINT_INFO(STORVSC, "storage device (%p) safe to remove", stor_device);
 
         /* Close the channel */
-        vmbus_close(Device->channel);
+        vmbus_close(device->channel);
 
-        FreeStorDevice(storDevice);
+        free_stor_device(stor_device);
         return 0;
 }
 
-int StorVscOnHostReset(struct hv_device *Device)
+int stor_vsc_on_host_reset(struct hv_device *device)
 {
-        struct storvsc_device *storDevice;
+        struct storvsc_device *stor_device;
         struct storvsc_request_extension *request;
-        struct vstor_packet *vstorPacket;
+        struct vstor_packet *vstor_packet;
         int ret;
 
         DPRINT_INFO(STORVSC, "resetting host adapter...");
 
-        storDevice = GetStorDevice(Device);
-        if (!storDevice) {
+        stor_device = get_stor_device(device);
+        if (!stor_device) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
                            "device being destroyed?");
                 return -1;
         }
 
-        request = &storDevice->ResetRequest;
-        vstorPacket = &request->VStorPacket;
+        request = &stor_device->reset_request;
+        vstor_packet = &request->vstor_packet;
 
-        request->WaitEvent = osd_WaitEventCreate();
-        if (!request->WaitEvent) {
+        request->wait_event = osd_waitevent_create();
+        if (!request->wait_event) {
                 ret = -ENOMEM;
                 goto Cleanup;
         }
 
-        vstorPacket->Operation = VStorOperationResetBus;
-        vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
-        vstorPacket->VmSrb.PathId = storDevice->PathId;
+        vstor_packet->operation = VSTOR_OPERATION_RESET_BUS;
+        vstor_packet->flags = REQUEST_COMPLETION_FLAG;
+        vstor_packet->vm_srb.path_id = stor_device->path_id;
 
-        ret = vmbus_sendpacket(Device->channel, vstorPacket,
+        ret = vmbus_sendpacket(device->channel, vstor_packet,
                                sizeof(struct vstor_packet),
-                               (unsigned long)&storDevice->ResetRequest,
+                               (unsigned long)&stor_device->reset_request,
                                VmbusPacketTypeDataInBand,
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret != 0) {
                 DPRINT_ERR(STORVSC, "Unable to send reset packet %p ret %d",
-                           vstorPacket, ret);
+                           vstor_packet, ret);
                 goto Cleanup;
         }
 
         /* FIXME: Add a timeout */
-        osd_WaitEventWait(request->WaitEvent);
+        osd_waitevent_wait(request->wait_event);
 
-        kfree(request->WaitEvent);
+        kfree(request->wait_event);
         DPRINT_INFO(STORVSC, "host adapter reset completed");
 
         /*
@@ -655,118 +662,118 @@ int StorVscOnHostReset(struct hv_device *Device)
          */
 
 Cleanup:
-        PutStorDevice(Device);
+        put_stor_device(device);
         return ret;
 }
 
 /*
- * StorVscOnIORequest - Callback to initiate an I/O request
+ * stor_vsc_on_io_request - Callback to initiate an I/O request
  */
-static int StorVscOnIORequest(struct hv_device *Device,
-                              struct hv_storvsc_request *Request)
+static int stor_vsc_on_io_request(struct hv_device *device,
+                              struct hv_storvsc_request *request)
 {
-        struct storvsc_device *storDevice;
-        struct storvsc_request_extension *requestExtension;
-        struct vstor_packet *vstorPacket;
+        struct storvsc_device *stor_device;
+        struct storvsc_request_extension *request_extension;
+        struct vstor_packet *vstor_packet;
         int ret = 0;
 
-        requestExtension =
-                (struct storvsc_request_extension *)Request->Extension;
-        vstorPacket = &requestExtension->VStorPacket;
-        storDevice = GetStorDevice(Device);
+        request_extension =
+                (struct storvsc_request_extension *)request->extension;
+        vstor_packet = &request_extension->vstor_packet;
+        stor_device = get_stor_device(device);
 
         DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, "
-                   "Extension %p", Device, storDevice, Request,
-                   requestExtension);
+                   "Extension %p", device, stor_device, request,
+                   request_extension);
 
         DPRINT_DBG(STORVSC, "req %p len %d bus %d, target %d, lun %d cdblen %d",
-                   Request, Request->DataBuffer.Length, Request->Bus,
-                   Request->TargetId, Request->LunId, Request->CdbLen);
+                   request, request->data_buffer.Length, request->bus,
+                   request->target_id, request->lun_id, request->cdb_len);
 
-        if (!storDevice) {
+        if (!stor_device) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
                            "device being destroyed?");
                 return -2;
         }
 
-        /* print_hex_dump_bytes("", DUMP_PREFIX_NONE, Request->Cdb,
-         *                      Request->CdbLen); */
+        /* print_hex_dump_bytes("", DUMP_PREFIX_NONE, request->Cdb,
+         *                      request->CdbLen); */
 
-        requestExtension->Request = Request;
-        requestExtension->Device  = Device;
+        request_extension->request = request;
+        request_extension->device  = device;
 
-        memset(vstorPacket, 0 , sizeof(struct vstor_packet));
+        memset(vstor_packet, 0 , sizeof(struct vstor_packet));
 
-        vstorPacket->Flags |= REQUEST_COMPLETION_FLAG;
+        vstor_packet->flags |= REQUEST_COMPLETION_FLAG;
 
-        vstorPacket->VmSrb.Length = sizeof(struct vmscsi_request);
+        vstor_packet->vm_srb.length = sizeof(struct vmscsi_request);
 
-        vstorPacket->VmSrb.PortNumber = Request->Host;
-        vstorPacket->VmSrb.PathId = Request->Bus;
-        vstorPacket->VmSrb.TargetId = Request->TargetId;
-        vstorPacket->VmSrb.Lun = Request->LunId;
+        vstor_packet->vm_srb.port_number = request->host;
+        vstor_packet->vm_srb.path_id = request->bus;
+        vstor_packet->vm_srb.target_id = request->target_id;
+        vstor_packet->vm_srb.lun = request->lun_id;
 
-        vstorPacket->VmSrb.SenseInfoLength = SENSE_BUFFER_SIZE;
+        vstor_packet->vm_srb.sense_info_length = SENSE_BUFFER_SIZE;
 
         /* Copy over the scsi command descriptor block */
-        vstorPacket->VmSrb.CdbLength = Request->CdbLen;
-        memcpy(&vstorPacket->VmSrb.Cdb, Request->Cdb, Request->CdbLen);
+        vstor_packet->vm_srb.cdb_length = request->cdb_len;
+        memcpy(&vstor_packet->vm_srb.cdb, request->cdb, request->cdb_len);
 
-        vstorPacket->VmSrb.DataIn = Request->Type;
-        vstorPacket->VmSrb.DataTransferLength = Request->DataBuffer.Length;
+        vstor_packet->vm_srb.data_in = request->type;
+        vstor_packet->vm_srb.data_transfer_length = request->data_buffer.Length;
 
-        vstorPacket->Operation = VStorOperationExecuteSRB;
+        vstor_packet->operation = VSTOR_OPERATION_EXECUTE_SRB;
 
         DPRINT_DBG(STORVSC, "srb - len %d port %d, path %d, target %d, "
                    "lun %d senselen %d cdblen %d",
-                   vstorPacket->VmSrb.Length,
-                   vstorPacket->VmSrb.PortNumber,
-                   vstorPacket->VmSrb.PathId,
-                   vstorPacket->VmSrb.TargetId,
-                   vstorPacket->VmSrb.Lun,
-                   vstorPacket->VmSrb.SenseInfoLength,
-                   vstorPacket->VmSrb.CdbLength);
-
-        if (requestExtension->Request->DataBuffer.Length) {
-                ret = vmbus_sendpacket_multipagebuffer(Device->channel,
-                                &requestExtension->Request->DataBuffer,
-                                vstorPacket,
+                   vstor_packet->vm_srb.length,
+                   vstor_packet->vm_srb.port_number,
+                   vstor_packet->vm_srb.path_id,
+                   vstor_packet->vm_srb.target_id,
+                   vstor_packet->vm_srb.lun,
+                   vstor_packet->vm_srb.sense_info_length,
+                   vstor_packet->vm_srb.cdb_length);
+
+        if (request_extension->request->data_buffer.Length) {
+                ret = vmbus_sendpacket_multipagebuffer(device->channel,
+                                &request_extension->request->data_buffer,
+                                vstor_packet,
                                 sizeof(struct vstor_packet),
-                                (unsigned long)requestExtension);
+                                (unsigned long)request_extension);
         } else {
-                ret = vmbus_sendpacket(Device->channel, vstorPacket,
+                ret = vmbus_sendpacket(device->channel, vstor_packet,
                                        sizeof(struct vstor_packet),
-                                       (unsigned long)requestExtension,
+                                       (unsigned long)request_extension,
                                        VmbusPacketTypeDataInBand,
                                        VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         }
 
         if (ret != 0) {
                 DPRINT_DBG(STORVSC, "Unable to send packet %p ret %d",
-                           vstorPacket, ret);
+                           vstor_packet, ret);
         }
 
-        atomic_inc(&storDevice->NumOutstandingRequests);
+        atomic_inc(&stor_device->num_outstanding_req);
 
-        PutStorDevice(Device);
+        put_stor_device(device);
         return ret;
 }
 
 /*
- * StorVscOnCleanup - Perform any cleanup when the driver is removed
+ * stor_vsc_on_cleanup - Perform any cleanup when the driver is removed
  */
-static void StorVscOnCleanup(struct hv_driver *Driver)
+static void stor_vsc_on_cleanup(struct hv_driver *driver)
 {
 }
 
 /*
- * StorVscInitialize - Main entry point
+ * stor_vsc_initialize - Main entry point
  */
-int StorVscInitialize(struct hv_driver *Driver)
+int stor_vsc_initialize(struct hv_driver *driver)
 {
-        struct storvsc_driver_object *storDriver;
+        struct storvsc_driver_object *stor_driver;
 
-        storDriver = (struct storvsc_driver_object *)Driver;
+        stor_driver = (struct storvsc_driver_object *)driver;
 
         DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd "
                    "sizeof(struct storvsc_request_extension)=%zd "
@@ -778,13 +785,14 @@ int StorVscInitialize(struct hv_driver *Driver)
                    sizeof(struct vmscsi_request));
 
         /* Make sure we are at least 2 pages since 1 page is used for control */
-        /* ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1)); */
+        /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */
 
-        Driver->name = gDriverName;
-        memcpy(&Driver->deviceType, &gStorVscDeviceType,
+        driver->name = g_driver_name;
+        memcpy(&driver->deviceType, &gStorVscDeviceType,
                sizeof(struct hv_guid));
 
-        storDriver->RequestExtSize = sizeof(struct storvsc_request_extension);
+        stor_driver->request_ext_size =
+                        sizeof(struct storvsc_request_extension);
 
         /*
          * Divide the ring buffer data size (which is 1 page less
@@ -792,22 +800,22 @@ int StorVscInitialize(struct hv_driver *Driver)
          * the ring buffer indices) by the max request size (which is
          * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
          */
-        storDriver->MaxOutstandingRequestsPerChannel =
-                ((storDriver->RingBufferSize - PAGE_SIZE) /
+        stor_driver->max_outstanding_req_per_channel =
+                ((stor_driver->ring_buffer_size - PAGE_SIZE) /
                   ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET +
                            sizeof(struct vstor_packet) + sizeof(u64),
                            sizeof(u64)));
 
         DPRINT_INFO(STORVSC, "max io %u, currently %u\n",
-                    storDriver->MaxOutstandingRequestsPerChannel,
+                    stor_driver->max_outstanding_req_per_channel,
                     STORVSC_MAX_IO_REQUESTS);
 
         /* Setup the dispatch table */
-        storDriver->Base.OnDeviceAdd    = StorVscOnDeviceAdd;
-        storDriver->Base.OnDeviceRemove = StorVscOnDeviceRemove;
-        storDriver->Base.OnCleanup      = StorVscOnCleanup;
+        stor_driver->base.OnDeviceAdd   = stor_vsc_on_device_add;
+        stor_driver->base.OnDeviceRemove        = stor_vsc_on_device_remove;
+        stor_driver->base.OnCleanup     = stor_vsc_on_cleanup;
 
-        storDriver->OnIORequest         = StorVscOnIORequest;
+        stor_driver->on_io_request      = stor_vsc_on_io_request;
 
         return 0;
 }
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 8505a1c5f9ee..fbf57556d890 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -53,58 +53,58 @@ enum storvsc_request_type{
 };
 
 struct hv_storvsc_request {
-        enum storvsc_request_type Type;
-        u32 Host;
-        u32 Bus;
-        u32 TargetId;
-        u32 LunId;
-        u8 *Cdb;
-        u32 CdbLen;
-        u32 Status;
-        u32 BytesXfer;
+        enum storvsc_request_type type;
+        u32 host;
+        u32 bus;
+        u32 target_id;
+        u32 lun_id;
+        u8 *cdb;
+        u32 cdb_len;
+        u32 status;
+        u32 bytes_xfer;
 
-        unsigned char *SenseBuffer;
-        u32 SenseBufferSize;
+        unsigned char *sense_buffer;
+        u32 sense_buffer_size;
 
-        void *Context;
+        void *context;
 
-        void (*OnIOCompletion)(struct hv_storvsc_request *Request);
+        void (*on_io_completion)(struct hv_storvsc_request *request);
 
         /* This points to the memory after DataBuffer */
-        void *Extension;
+        void *extension;
 
-        struct hv_multipage_buffer DataBuffer;
+        struct hv_multipage_buffer data_buffer;
 };
 
 /* Represents the block vsc driver */
 struct storvsc_driver_object {
         /* Must be the first field */
         /* Which is a bug FIXME! */
-        struct hv_driver Base;
+        struct hv_driver base;
 
         /* Set by caller (in bytes) */
-        u32 RingBufferSize;
+        u32 ring_buffer_size;
 
         /* Allocate this much private extension for each I/O request */
-        u32 RequestExtSize;
+        u32 request_ext_size;
 
         /* Maximum # of requests in flight per channel/device */
-        u32 MaxOutstandingRequestsPerChannel;
+        u32 max_outstanding_req_per_channel;
 
         /* Specific to this driver */
-        int (*OnIORequest)(struct hv_device *Device,
-                           struct hv_storvsc_request *Request);
+        int (*on_io_request)(struct hv_device *device,
+                           struct hv_storvsc_request *request);
 };
 
 struct storvsc_device_info {
-        unsigned int PortNumber;
-        unsigned char PathId;
-        unsigned char TargetId;
+        unsigned int port_number;
+        unsigned char path_id;
+        unsigned char target_id;
 };
 
 /* Interface */
-int StorVscInitialize(struct hv_driver *driver);
-int StorVscOnHostReset(struct hv_device *Device);
-int BlkVscInitialize(struct hv_driver *driver);
+int stor_vsc_initialize(struct hv_driver *driver);
+int stor_vsc_on_host_reset(struct hv_device *device);
+int blk_vsc_initialize(struct hv_driver *driver);
 
 #endif /* _STORVSC_API_H_ */
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 6f8d67d0d64f..17f1b344fbc5 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -140,28 +140,28 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;
         struct driver_context *drv_ctx = &g_storvsc_drv.drv_ctx;
 
-        storvsc_drv_obj->RingBufferSize = storvsc_ringbuffer_size;
+        storvsc_drv_obj->ring_buffer_size = storvsc_ringbuffer_size;
 
         /* Callback to client driver to complete the initialization */
-        drv_init(&storvsc_drv_obj->Base);
+        drv_init(&storvsc_drv_obj->base);
 
         DPRINT_INFO(STORVSC_DRV,
                     "request extension size %u, max outstanding reqs %u",
-                    storvsc_drv_obj->RequestExtSize,
-                    storvsc_drv_obj->MaxOutstandingRequestsPerChannel);
+                    storvsc_drv_obj->request_ext_size,
+                    storvsc_drv_obj->max_outstanding_req_per_channel);
 
-        if (storvsc_drv_obj->MaxOutstandingRequestsPerChannel <
+        if (storvsc_drv_obj->max_outstanding_req_per_channel <
             STORVSC_MAX_IO_REQUESTS) {
                 DPRINT_ERR(STORVSC_DRV,
                            "The number of outstanding io requests (%d) "
                            "is larger than that supported (%d) internally.",
                            STORVSC_MAX_IO_REQUESTS,
-                           storvsc_drv_obj->MaxOutstandingRequestsPerChannel);
+                           storvsc_drv_obj->max_outstanding_req_per_channel);
                 return -1;
         }
 
-        drv_ctx->driver.name = storvsc_drv_obj->Base.name;
-        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType,
+        drv_ctx->driver.name = storvsc_drv_obj->base.name;
+        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->base.deviceType,
                sizeof(struct hv_guid));
 
         drv_ctx->probe = storvsc_probe;
@@ -206,8 +206,8 @@ static void storvsc_drv_exit(void)
                 device_unregister(current_dev);
         }
 
-        if (storvsc_drv_obj->Base.OnCleanup)
-                storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base);
+        if (storvsc_drv_obj->base.OnCleanup)
+                storvsc_drv_obj->base.OnCleanup(&storvsc_drv_obj->base);
 
         vmbus_child_driver_unregister(drv_ctx);
         return;
@@ -231,7 +231,7 @@ static int storvsc_probe(struct device *device)
         struct host_device_context *host_device_ctx;
         struct storvsc_device_info device_info;
 
-        if (!storvsc_drv_obj->Base.OnDeviceAdd)
+        if (!storvsc_drv_obj->base.OnDeviceAdd)
                 return -1;
 
         host = scsi_host_alloc(&scsi_driver,
@@ -252,7 +252,7 @@ static int storvsc_probe(struct device *device)
         host_device_ctx->request_pool =
                                 kmem_cache_create(dev_name(&device_ctx->device),
                                         sizeof(struct storvsc_cmd_request) +
-                                        storvsc_drv_obj->RequestExtSize, 0,
+                                        storvsc_drv_obj->request_ext_size, 0,
                                         SLAB_HWCACHE_ALIGN, NULL);
 
         if (!host_device_ctx->request_pool) {
@@ -260,9 +260,9 @@ static int storvsc_probe(struct device *device)
                 return -ENOMEM;
         }
 
-        device_info.PortNumber = host->host_no;
+        device_info.port_number = host->host_no;
         /* Call to the vsc driver to add the device */
-        ret = storvsc_drv_obj->Base.OnDeviceAdd(device_obj,
+        ret = storvsc_drv_obj->base.OnDeviceAdd(device_obj,
                                                 (void *)&device_info);
         if (ret != 0) {
                 DPRINT_ERR(STORVSC_DRV, "unable to add scsi vsc device");
@@ -272,8 +272,8 @@ static int storvsc_probe(struct device *device)
         }
 
         /* host_device_ctx->port = device_info.PortNumber; */
-        host_device_ctx->path = device_info.PathId;
-        host_device_ctx->target = device_info.TargetId;
+        host_device_ctx->path = device_info.path_id;
+        host_device_ctx->target = device_info.target_id;
 
         /* max # of devices per target */
         host->max_lun = STORVSC_MAX_LUNS_PER_TARGET;
@@ -287,7 +287,7 @@ static int storvsc_probe(struct device *device)
         if (ret != 0) {
                 DPRINT_ERR(STORVSC_DRV, "unable to add scsi host device");
 
-                storvsc_drv_obj->Base.OnDeviceRemove(device_obj);
+                storvsc_drv_obj->base.OnDeviceRemove(device_obj);
 
                 kmem_cache_destroy(host_device_ctx->request_pool);
                 scsi_host_put(host);
@@ -317,14 +317,14 @@ static int storvsc_remove(struct device *device)
                         (struct host_device_context *)host->hostdata;
 
 
-        if (!storvsc_drv_obj->Base.OnDeviceRemove)
+        if (!storvsc_drv_obj->base.OnDeviceRemove)
                 return -1;
 
         /*
          * Call to the vsc driver to let it know that the device is being
          * removed
          */
-        ret = storvsc_drv_obj->Base.OnDeviceRemove(device_obj);
+        ret = storvsc_drv_obj->base.OnDeviceRemove(device_obj);
         if (ret != 0) {
                 /* TODO: */
                 DPRINT_ERR(STORVSC, "unable to remove vsc device (ret %d)",
@@ -350,7 +350,7 @@ static int storvsc_remove(struct device *device)
 static void storvsc_commmand_completion(struct hv_storvsc_request *request)
 {
         struct storvsc_cmd_request *cmd_request =
-                (struct storvsc_cmd_request *)request->Context;
+                (struct storvsc_cmd_request *)request->context;
         struct scsi_cmnd *scmnd = cmd_request->cmd;
         struct host_device_context *host_device_ctx =
                 (struct host_device_context *)scmnd->device->host->hostdata;
@@ -375,16 +375,17 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
                                       cmd_request->bounce_sgl_count);
         }
 
-        scmnd->result = request->Status;
+        scmnd->result = request->status;
 
         if (scmnd->result) {
                 if (scsi_normalize_sense(scmnd->sense_buffer,
-                                         request->SenseBufferSize, &sense_hdr))
+                                request->sense_buffer_size, &sense_hdr))
                         scsi_print_sense_hdr("storvsc", &sense_hdr);
         }
 
-        /* ASSERT(request->BytesXfer <= request->DataBuffer.Length); */
-        scsi_set_resid(scmnd, request->DataBuffer.Length - request->BytesXfer);
+        /* ASSERT(request->BytesXfer <= request->data_buffer.Length); */
+        scsi_set_resid(scmnd,
+                request->data_buffer.Length - request->bytes_xfer);
 
         scsi_done_fn = scmnd->scsi_done;
 
@@ -657,42 +658,42 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
 
         request = &cmd_request->request;
 
-        request->Extension =
+        request->extension =
                 (void *)((unsigned long)cmd_request + request_size);
         DPRINT_DBG(STORVSC_DRV, "req %p size %d ext %d", request, request_size,
-                   storvsc_drv_obj->RequestExtSize);
+                   storvsc_drv_obj->request_ext_size);
 
         /* Build the SRB */
         switch (scmnd->sc_data_direction) {
         case DMA_TO_DEVICE:
-                request->Type = WRITE_TYPE;
+                request->type = WRITE_TYPE;
                 break;
         case DMA_FROM_DEVICE:
-                request->Type = READ_TYPE;
+                request->type = READ_TYPE;
                 break;
         default:
-                request->Type = UNKNOWN_TYPE;
+                request->type = UNKNOWN_TYPE;
                 break;
         }
 
-        request->OnIOCompletion = storvsc_commmand_completion;
-        request->Context = cmd_request;/* scmnd; */
+        request->on_io_completion = storvsc_commmand_completion;
+        request->context = cmd_request;/* scmnd; */
 
         /* request->PortId = scmnd->device->channel; */
-        request->Host = host_device_ctx->port;
-        request->Bus = scmnd->device->channel;
-        request->TargetId = scmnd->device->id;
-        request->LunId = scmnd->device->lun;
+        request->host = host_device_ctx->port;
+        request->bus = scmnd->device->channel;
+        request->target_id = scmnd->device->id;
+        request->lun_id = scmnd->device->lun;
 
         /* ASSERT(scmnd->cmd_len <= 16); */
-        request->CdbLen = scmnd->cmd_len;
-        request->Cdb = scmnd->cmnd;
+        request->cdb_len = scmnd->cmd_len;
+        request->cdb = scmnd->cmnd;
 
-        request->SenseBuffer = scmnd->sense_buffer;
-        request->SenseBufferSize = SCSI_SENSE_BUFFERSIZE;
+        request->sense_buffer = scmnd->sense_buffer;
+        request->sense_buffer_size = SCSI_SENSE_BUFFERSIZE;
 
 
-        request->DataBuffer.Length = scsi_bufflen(scmnd);
+        request->data_buffer.Length = scsi_bufflen(scmnd);
         if (scsi_sg_count(scmnd)) {
                 sgl = (struct scatterlist *)scsi_sglist(scmnd);
                 sg_count = scsi_sg_count(scmnd);
@@ -733,25 +734,25 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
                         sg_count = cmd_request->bounce_sgl_count;
                 }
 
-                request->DataBuffer.Offset = sgl[0].offset;
+                request->data_buffer.Offset = sgl[0].offset;
 
                 for (i = 0; i < sg_count; i++) {
                         DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n",
                                    i, sgl[i].length, sgl[i].offset);
-                        request->DataBuffer.PfnArray[i] =
+                        request->data_buffer.PfnArray[i] =
                                 page_to_pfn(sg_page((&sgl[i])));
                 }
         } else if (scsi_sglist(scmnd)) {
                 /* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */
-                request->DataBuffer.Offset =
+                request->data_buffer.Offset =
                         virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
-                request->DataBuffer.PfnArray[0] =
+                request->data_buffer.PfnArray[0] =
                         virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
         }
 
 retry_request:
         /* Invokes the vsc to start an IO */
-        ret = storvsc_drv_obj->OnIORequest(&device_ctx->device_obj,
+        ret = storvsc_drv_obj->on_io_request(&device_ctx->device_obj,
                                            &cmd_request->request);
         if (ret == -1) {
                 /* no more space */
@@ -844,7 +845,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
                     scmnd->device, &device_ctx->device_obj);
 
         /* Invokes the vsc to reset the host/bus */
-        ret = StorVscOnHostReset(&device_ctx->device_obj);
+        ret = stor_vsc_on_host_reset(&device_ctx->device_obj);
         if (ret != 0)
                 return ret;
 
@@ -939,7 +940,7 @@ static int __init storvsc_init(void)
         int ret;
 
         DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
-        ret = storvsc_drv_init(StorVscInitialize);
+        ret = storvsc_drv_init(stor_vsc_initialize);
         return ret;
 }
 
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
deleted file mode 100644
index d449daf81976..000000000000
--- a/drivers/staging/hv/vmbus.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2009, Microsoft Corporation.
- *
- * 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.
- *
- * This program is distributed in the hope 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., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Authors:
- *   Haiyang Zhang <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include "osd.h"
-#include "logging.h"
-#include "version_info.h"
-#include "vmbus_private.h"
-
-static const char *gDriverName = "vmbus";
-
-/*
- * Windows vmbus does not defined this.
- * We defined this to be consistent with other devices
- */
-/* {c5295816-f63a-4d5f-8d1a-4daf999ca185} */
-static const struct hv_guid gVmbusDeviceType = {
-        .data = {
-                0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d,
-                0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85
-        }
-};
-
-/* {ac3760fc-9adf-40aa-9427-a70ed6de95c5} */
-static const struct hv_guid gVmbusDeviceId = {
-        .data = {
-                0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40,
-                0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5
-        }
-};
-
-static struct hv_driver *gDriver; /* vmbus driver object */
-static struct hv_device *gDevice; /* vmbus root device */
-
-/*
- * VmbusGetChannelOffers - Retrieve the channel offers from the parent partition
- */
-static void VmbusGetChannelOffers(void)
-{
-        vmbus_request_offers();
-}
-
-/*
- * VmbusCreateChildDevice - Creates the child device on the bus that represents the channel offer
- */
-struct hv_device *VmbusChildDeviceCreate(struct hv_guid *DeviceType,
-                                         struct hv_guid *DeviceInstance,
-                                         struct vmbus_channel *channel)
-{
-        struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
-
-        return vmbusDriver->OnChildDeviceCreate(DeviceType, DeviceInstance,
-                                                channel);
-}
-
-/*
- * VmbusChildDeviceAdd - Registers the child device with the vmbus
- */
-int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
-{
-        struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
-
-        return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
-}
-
-/*
- * VmbusChildDeviceRemove Unregisters the child device from the vmbus
- */
-void VmbusChildDeviceRemove(struct hv_device *ChildDevice)
-{
-        struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
-
-        vmbusDriver->OnChildDeviceRemove(ChildDevice);
-}
-
-/*
- * VmbusOnDeviceAdd - Callback when the root bus device is added
- */
-static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
-{
-        u32 *irqvector = AdditionalInfo;
-        int ret;
-
-        gDevice = dev;
-
-        memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
-        memcpy(&gDevice->deviceInstance, &gVmbusDeviceId,
-               sizeof(struct hv_guid));
-
-        /* strcpy(dev->name, "vmbus"); */
-        /* SynIC setup... */
-        on_each_cpu(HvSynicInit, (void *)irqvector, 1);
-
-        /* Connect to VMBus in the root partition */
-        ret = VmbusConnect();
-
-        /* VmbusSendEvent(device->localPortId+1); */
-        return ret;
-}
-
-/*
- * VmbusOnDeviceRemove - Callback when the root bus device is removed
- */
-static int VmbusOnDeviceRemove(struct hv_device *dev)
-{
-        int ret = 0;
-
-        vmbus_release_unattached_channels();
-        VmbusDisconnect();
-        on_each_cpu(HvSynicCleanup, NULL, 1);
-        return ret;
-}
-
-/*
- * VmbusOnCleanup - Perform any cleanup when the driver is removed
- */
-static void VmbusOnCleanup(struct hv_driver *drv)
-{
-        /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
-
-        HvCleanup();
-}
-
-/*
- * VmbusOnMsgDPC - DPC routine to handle messages from the hypervisior
- */
-static void VmbusOnMsgDPC(struct hv_driver *drv)
-{
-        int cpu = smp_processor_id();
-        void *page_addr = gHvContext.synICMessagePage[cpu];
-        struct hv_message *msg = (struct hv_message *)page_addr +
-                                  VMBUS_MESSAGE_SINT;
-        struct hv_message *copied;
-
-        while (1) {
-                if (msg->Header.MessageType == HvMessageTypeNone) {
-                        /* no msg */
-                        break;
-                } else {
-                        copied = kmemdup(msg, sizeof(*copied), GFP_ATOMIC);
-                        if (copied == NULL)
-                                continue;
-
-                        osd_schedule_callback(gVmbusConnection.WorkQueue,
-                                              vmbus_onmessage,
-                                              (void *)copied);
-                }
-
-                msg->Header.MessageType = HvMessageTypeNone;
-
-                /*
-                 * Make sure the write to MessageType (ie set to
-                 * HvMessageTypeNone) happens before we read the
-                 * MessagePending and EOMing. Otherwise, the EOMing
-                 * will not deliver any more messages since there is
-                 * no empty slot
-                 */
-                mb();
-
-                if (msg->Header.MessageFlags.MessagePending) {
-                        /*
-                         * This will cause message queue rescan to
-                         * possibly deliver another msg from the
-                         * hypervisor
-                         */
-                        wrmsrl(HV_X64_MSR_EOM, 0);
-                }
-        }
-}
-
-/*
- * VmbusOnEventDPC - DPC routine to handle events from the hypervisior
- */
-static void VmbusOnEventDPC(struct hv_driver *drv)
-{
-        /* TODO: Process any events */
-        VmbusOnEvents();
-}
-
-/*
- * VmbusOnISR - ISR routine
- */
-static int VmbusOnISR(struct hv_driver *drv)
-{
-        int ret = 0;
-        int cpu = smp_processor_id();
-        void *page_addr;
-        struct hv_message *msg;
-        union hv_synic_event_flags *event;
-
-        page_addr = gHvContext.synICMessagePage[cpu];
-        msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
-
-        /* Check if there are actual msgs to be process */
-        if (msg->Header.MessageType != HvMessageTypeNone) {
-                DPRINT_DBG(VMBUS, "received msg type %d size %d",
-                                msg->Header.MessageType,
-                                msg->Header.PayloadSize);
-                ret |= 0x1;
-        }
-
-        /* TODO: Check if there are events to be process */
-        page_addr = gHvContext.synICEventPage[cpu];
-        event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
-
-        /* Since we are a child, we only need to check bit 0 */
-        if (test_and_clear_bit(0, (unsigned long *) &event->Flags32[0])) {
-                DPRINT_DBG(VMBUS, "received event %d", event->Flags32[0]);
-                ret |= 0x2;
-        }
-
-        return ret;
-}
-
-/*
- * VmbusInitialize - Main entry point
- */
-int VmbusInitialize(struct hv_driver *drv)
-{
-        struct vmbus_driver *driver = (struct vmbus_driver *)drv;
-        int ret;
-
-        DPRINT_INFO(VMBUS, "+++++++ HV Driver version = %s +++++++",
-                    HV_DRV_VERSION);
-        DPRINT_INFO(VMBUS, "+++++++ Vmbus supported version = %d +++++++",
-                        VMBUS_REVISION_NUMBER);
-        DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++",
-                        VMBUS_MESSAGE_SINT);
-        DPRINT_DBG(VMBUS, "sizeof(vmbus_channel_packet_page_buffer)=%zd, "
-                        "sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%zd",
-                        sizeof(struct vmbus_channel_packet_page_buffer),
-                        sizeof(struct vmbus_channel_packet_multipage_buffer));
-
-        drv->name = gDriverName;
-        memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
-
-        /* Setup dispatch table */
-        driver->Base.OnDeviceAdd        = VmbusOnDeviceAdd;
-        driver->Base.OnDeviceRemove     = VmbusOnDeviceRemove;
-        driver->Base.OnCleanup          = VmbusOnCleanup;
-        driver->OnIsr                   = VmbusOnISR;
-        driver->OnMsgDpc                = VmbusOnMsgDPC;
-        driver->OnEventDpc              = VmbusOnEventDPC;
-        driver->GetChannelOffers        = VmbusGetChannelOffers;
-
-        /* Hypervisor initialization...setup hypercall page..etc */
-        ret = HvInit();
-        if (ret != 0)
-                DPRINT_ERR(VMBUS, "Unable to initialize the hypervisor - 0x%x",
-                                ret);
-        gDriver = drv;
-
-        return ret;
-}
diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h
index 2af42e550076..2da3f52610b3 100644
--- a/drivers/staging/hv/vmbus_api.h
+++ b/drivers/staging/hv/vmbus_api.h
@@ -115,28 +115,4 @@ struct hv_device {
         void *Extension;
 };
 
-/* Vmbus driver object */
-struct vmbus_driver {
-        /* !! Must be the 1st field !! */
-        /* FIXME if ^, then someone is doing somthing stupid */
-        struct hv_driver Base;
-
-        /* Set by the caller */
-        struct hv_device * (*OnChildDeviceCreate)(struct hv_guid *DeviceType,
-                                                struct hv_guid *DeviceInstance,
-                                                struct vmbus_channel *channel);
-        void (*OnChildDeviceDestroy)(struct hv_device *device);
-        int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
-                                struct hv_device *ChildDevice);
-        void (*OnChildDeviceRemove)(struct hv_device *device);
-
-        /* Set by the callee */
-        int (*OnIsr)(struct hv_driver *driver);
-        void (*OnMsgDpc)(struct hv_driver *driver);
-        void (*OnEventDpc)(struct hv_driver *driver);
-        void (*GetChannelOffers)(void);
-};
-
-int VmbusInitialize(struct hv_driver *drv);
-
 #endif /* _VMBUS_API_H_ */
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 0d9f3a411e72..84fdb64d3ceb 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -33,6 +33,7 @@
 #include "logging.h"
 #include "vmbus.h"
 #include "channel.h"
+#include "vmbus_private.h"
 
 
 /* FIXME! We need to do this dynamically for PIC and APIC system */
@@ -46,7 +47,7 @@ struct vmbus_driver_context {
         /* The driver field is not used in here. Instead, the bus field is */
         /* used to represent the driver */
         struct driver_context drv_ctx;
-        struct vmbus_driver drv_obj;
+        struct hv_driver drv_obj;
 
         struct bus_type bus;
         struct tasklet_struct msg_dpc;
@@ -69,13 +70,6 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id);
 static void vmbus_device_release(struct device *device);
 static void vmbus_bus_release(struct device *device);
 
-static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
-                                                   struct hv_guid *instance,
-                                                   struct vmbus_channel *channel);
-static void vmbus_child_device_destroy(struct hv_device *device_obj);
-static int vmbus_child_device_register(struct hv_device *root_device_obj,
-                                       struct hv_device *child_device_obj);
-static void vmbus_child_device_unregister(struct hv_device *child_device_obj);
 static ssize_t vmbus_show_device_attr(struct device *dev,
                                       struct device_attribute *dev_attr,
                                       char *buf);
@@ -129,6 +123,182 @@ static struct vmbus_driver_context g_vmbus_drv = {
         .bus.dev_attrs =        vmbus_device_attrs,
 };
 
+static const char *gDriverName = "hyperv";
+
+/*
+ * Windows vmbus does not defined this.
+ * We defined this to be consistent with other devices
+ */
+/* {c5295816-f63a-4d5f-8d1a-4daf999ca185} */
+static const struct hv_guid gVmbusDeviceType = {
+        .data = {
+                0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d,
+                0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85
+        }
+};
+
+/* {ac3760fc-9adf-40aa-9427-a70ed6de95c5} */
+static const struct hv_guid gVmbusDeviceId = {
+        .data = {
+                0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40,
+                0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5
+        }
+};
+
+static struct hv_device *gDevice; /* vmbus root device */
+
+/*
+ * VmbusChildDeviceAdd - Registers the child device with the vmbus
+ */
+int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
+{
+        return vmbus_child_device_register(gDevice, ChildDevice);
+}
+
+/*
+ * VmbusOnDeviceAdd - Callback when the root bus device is added
+ */
+static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
+{
+        u32 *irqvector = AdditionalInfo;
+        int ret;
+
+        gDevice = dev;
+
+        memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
+        memcpy(&gDevice->deviceInstance, &gVmbusDeviceId,
+               sizeof(struct hv_guid));
+
+        /* strcpy(dev->name, "vmbus"); */
+        /* SynIC setup... */
+        on_each_cpu(hv_synic_init, (void *)irqvector, 1);
+
+        /* Connect to VMBus in the root partition */
+        ret = VmbusConnect();
+
+        /* VmbusSendEvent(device->localPortId+1); */
+        return ret;
+}
+
+/*
+ * VmbusOnDeviceRemove - Callback when the root bus device is removed
+ */
+static int VmbusOnDeviceRemove(struct hv_device *dev)
+{
+        int ret = 0;
+
+        vmbus_release_unattached_channels();
+        VmbusDisconnect();
+        on_each_cpu(hv_synic_cleanup, NULL, 1);
+        return ret;
+}
+
+/*
+ * VmbusOnCleanup - Perform any cleanup when the driver is removed
+ */
+static void VmbusOnCleanup(struct hv_driver *drv)
+{
+        /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
+
+        hv_cleanup();
+}
+
+struct onmessage_work_context {
+        struct work_struct work;
+        struct hv_message msg;
+};
+
+static void vmbus_onmessage_work(struct work_struct *work)
+{
+        struct onmessage_work_context *ctx;
+
+        ctx = container_of(work, struct onmessage_work_context,
+                           work);
+        vmbus_onmessage(&ctx->msg);
+        kfree(ctx);
+}
+
+/*
+ * vmbus_on_msg_dpc - DPC routine to handle messages from the hypervisior
+ */
+static void vmbus_on_msg_dpc(struct hv_driver *drv)
+{
+        int cpu = smp_processor_id();
+        void *page_addr = hv_context.synic_message_page[cpu];
+        struct hv_message *msg = (struct hv_message *)page_addr +
+                                  VMBUS_MESSAGE_SINT;
+        struct onmessage_work_context *ctx;
+
+        while (1) {
+                if (msg->header.message_type == HVMSG_NONE) {
+                        /* no msg */
+                        break;
+                } else {
+                        ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC);
+                        if (ctx == NULL)
+                                continue;
+                        INIT_WORK(&ctx->work, vmbus_onmessage_work);
+                        memcpy(&ctx->msg, msg, sizeof(*msg));
+                        queue_work(gVmbusConnection.WorkQueue, &ctx->work);
+                }
+
+                msg->header.message_type = HVMSG_NONE;
+
+                /*
+                 * Make sure the write to MessageType (ie set to
+                 * HVMSG_NONE) happens before we read the
+                 * MessagePending and EOMing. Otherwise, the EOMing
+                 * will not deliver any more messages since there is
+                 * no empty slot
+                 */
+                mb();
+
+                if (msg->header.message_flags.msg_pending) {
+                        /*
+                         * This will cause message queue rescan to
+                         * possibly deliver another msg from the
+                         * hypervisor
+                         */
+                        wrmsrl(HV_X64_MSR_EOM, 0);
+                }
+        }
+}
+
+/*
+ * vmbus_on_isr - ISR routine
+ */
+static int vmbus_on_isr(struct hv_driver *drv)
+{
+        int ret = 0;
+        int cpu = smp_processor_id();
+        void *page_addr;
+        struct hv_message *msg;
+        union hv_synic_event_flags *event;
+
+        page_addr = hv_context.synic_message_page[cpu];
+        msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
+
+        /* Check if there are actual msgs to be process */
+        if (msg->header.message_type != HVMSG_NONE) {
+                DPRINT_DBG(VMBUS, "received msg type %d size %d",
+                                msg->header.message_type,
+                                msg->header.payload_size);
+                ret |= 0x1;
+        }
+
+        /* TODO: Check if there are events to be process */
+        page_addr = hv_context.synic_event_page[cpu];
+        event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
+
+        /* Since we are a child, we only need to check bit 0 */
+        if (test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) {
+                DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]);
+                ret |= 0x2;
+        }
+
+        return ret;
+}
+
 static void get_channel_info(struct hv_device *device,
                              struct hv_device_info *info)
 {
@@ -139,35 +309,38 @@ static void get_channel_info(struct hv_device *device,
 
         vmbus_get_debug_info(device->channel, &debug_info);
 
-        info->ChannelId = debug_info.RelId;
-        info->ChannelState = debug_info.State;
-        memcpy(&info->ChannelType, &debug_info.InterfaceType,
+        info->ChannelId = debug_info.relid;
+        info->ChannelState = debug_info.state;
+        memcpy(&info->ChannelType, &debug_info.interfacetype,
                sizeof(struct hv_guid));
-        memcpy(&info->ChannelInstance, &debug_info.InterfaceInstance,
+        memcpy(&info->ChannelInstance, &debug_info.interface_instance,
                sizeof(struct hv_guid));
 
-        info->MonitorId = debug_info.MonitorId;
-
-        info->ServerMonitorPending = debug_info.ServerMonitorPending;
-        info->ServerMonitorLatency = debug_info.ServerMonitorLatency;
-        info->ServerMonitorConnectionId = debug_info.ServerMonitorConnectionId;
-
-        info->ClientMonitorPending = debug_info.ClientMonitorPending;
-        info->ClientMonitorLatency = debug_info.ClientMonitorLatency;
-        info->ClientMonitorConnectionId = debug_info.ClientMonitorConnectionId;
-
-        info->Inbound.InterruptMask = debug_info.Inbound.CurrentInterruptMask;
-        info->Inbound.ReadIndex = debug_info.Inbound.CurrentReadIndex;
-        info->Inbound.WriteIndex = debug_info.Inbound.CurrentWriteIndex;
-        info->Inbound.BytesAvailToRead = debug_info.Inbound.BytesAvailToRead;
-        info->Inbound.BytesAvailToWrite = debug_info.Inbound.BytesAvailToWrite;
-
-        info->Outbound.InterruptMask = debug_info.Outbound.CurrentInterruptMask;
-        info->Outbound.ReadIndex = debug_info.Outbound.CurrentReadIndex;
-        info->Outbound.WriteIndex = debug_info.Outbound.CurrentWriteIndex;
-        info->Outbound.BytesAvailToRead = debug_info.Outbound.BytesAvailToRead;
+        info->MonitorId = debug_info.monitorid;
+
+        info->ServerMonitorPending = debug_info.servermonitor_pending;
+        info->ServerMonitorLatency = debug_info.servermonitor_latency;
+        info->ServerMonitorConnectionId = debug_info.servermonitor_connectionid;
+
+        info->ClientMonitorPending = debug_info.clientmonitor_pending;
+        info->ClientMonitorLatency = debug_info.clientmonitor_latency;
+        info->ClientMonitorConnectionId = debug_info.clientmonitor_connectionid;
+
+        info->Inbound.InterruptMask = debug_info.inbound.current_interrupt_mask;
+        info->Inbound.ReadIndex = debug_info.inbound.current_read_index;
+        info->Inbound.WriteIndex = debug_info.inbound.current_write_index;
+        info->Inbound.BytesAvailToRead = debug_info.inbound.bytes_avail_toread;
+        info->Inbound.BytesAvailToWrite =
+                debug_info.inbound.bytes_avail_towrite;
+
+        info->Outbound.InterruptMask =
+                debug_info.outbound.current_interrupt_mask;
+        info->Outbound.ReadIndex = debug_info.outbound.current_read_index;
+        info->Outbound.WriteIndex = debug_info.outbound.current_write_index;
+        info->Outbound.BytesAvailToRead =
+                debug_info.outbound.bytes_avail_toread;
         info->Outbound.BytesAvailToWrite =
-                debug_info.Outbound.BytesAvailToWrite;
+                debug_info.outbound.bytes_avail_towrite;
 }
 
 /*
@@ -286,44 +459,55 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
  *      - setup the vmbus root device
  *      - retrieve the channel offers
  */
-static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
+static int vmbus_bus_init(void)
 {
         struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
-        struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+        struct hv_driver *driver = &g_vmbus_drv.drv_obj;
         struct vm_device *dev_ctx = &g_vmbus_drv.device_ctx;
         int ret;
         unsigned int vector;
 
-        /*
-         * Set this up to allow lower layer to callback to add/remove child
-         * devices on the bus
-         */
-        vmbus_drv_obj->OnChildDeviceCreate = vmbus_child_device_create;
-        vmbus_drv_obj->OnChildDeviceDestroy = vmbus_child_device_destroy;
-        vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
-        vmbus_drv_obj->OnChildDeviceRemove = vmbus_child_device_unregister;
-
-        /* Call to bus driver to initialize */
-        ret = drv_init(&vmbus_drv_obj->Base);
+        DPRINT_INFO(VMBUS, "+++++++ HV Driver version = %s +++++++",
+                    HV_DRV_VERSION);
+        DPRINT_INFO(VMBUS, "+++++++ Vmbus supported version = %d +++++++",
+                        VMBUS_REVISION_NUMBER);
+        DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++",
+                        VMBUS_MESSAGE_SINT);
+        DPRINT_DBG(VMBUS, "sizeof(vmbus_channel_packet_page_buffer)=%zd, "
+                        "sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%zd",
+                        sizeof(struct vmbus_channel_packet_page_buffer),
+                        sizeof(struct vmbus_channel_packet_multipage_buffer));
+
+        driver->name = gDriverName;
+        memcpy(&driver->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
+
+        /* Setup dispatch table */
+        driver->OnDeviceAdd     = VmbusOnDeviceAdd;
+        driver->OnDeviceRemove  = VmbusOnDeviceRemove;
+        driver->OnCleanup       = VmbusOnCleanup;
+
+        /* Hypervisor initialization...setup hypercall page..etc */
+        ret = hv_init();
         if (ret != 0) {
-                DPRINT_ERR(VMBUS_DRV, "Unable to initialize vmbus (%d)", ret);
+                DPRINT_ERR(VMBUS, "Unable to initialize the hypervisor - 0x%x",
+                                ret);
                 goto cleanup;
         }
 
         /* Sanity checks */
-        if (!vmbus_drv_obj->Base.OnDeviceAdd) {
+        if (!driver->OnDeviceAdd) {
                 DPRINT_ERR(VMBUS_DRV, "OnDeviceAdd() routine not set");
                 ret = -1;
                 goto cleanup;
         }
 
-        vmbus_drv_ctx->bus.name = vmbus_drv_obj->Base.name;
+        vmbus_drv_ctx->bus.name = driver->name;
 
         /* Initialize the bus context */
         tasklet_init(&vmbus_drv_ctx->msg_dpc, vmbus_msg_dpc,
-                     (unsigned long)vmbus_drv_obj);
+                     (unsigned long)driver);
         tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_event_dpc,
-                     (unsigned long)vmbus_drv_obj);
+                     (unsigned long)driver);
 
         /* Now, register the bus driver with LDM */
         ret = bus_register(&vmbus_drv_ctx->bus);
@@ -334,7 +518,7 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
 
         /* Get the interrupt resource */
         ret = request_irq(vmbus_irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
-                          vmbus_drv_obj->Base.name, NULL);
+                          driver->name, NULL);
 
         if (ret != 0) {
                 DPRINT_ERR(VMBUS_DRV, "ERROR - Unable to request IRQ %d",
@@ -352,7 +536,7 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
         /* Call to bus driver to add the root device */
         memset(dev_ctx, 0, sizeof(struct vm_device));
 
-        ret = vmbus_drv_obj->Base.OnDeviceAdd(&dev_ctx->device_obj, &vector);
+        ret = driver->OnDeviceAdd(&dev_ctx->device_obj, &vector);
         if (ret != 0) {
                 DPRINT_ERR(VMBUS_DRV,
                            "ERROR - Unable to add vmbus root device");
@@ -392,9 +576,7 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
                 goto cleanup;
         }
 
-
-        vmbus_drv_obj->GetChannelOffers();
-
+        vmbus_request_offers();
         wait_for_completion(&hv_channel_ready);
 
 cleanup:
@@ -408,17 +590,17 @@ cleanup:
  */
 static void vmbus_bus_exit(void)
 {
-        struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+        struct hv_driver *driver = &g_vmbus_drv.drv_obj;
         struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
 
         struct vm_device *dev_ctx = &g_vmbus_drv.device_ctx;
 
         /* Remove the root device */
-        if (vmbus_drv_obj->Base.OnDeviceRemove)
-                vmbus_drv_obj->Base.OnDeviceRemove(&dev_ctx->device_obj);
+        if (driver->OnDeviceRemove)
+                driver->OnDeviceRemove(&dev_ctx->device_obj);
 
-        if (vmbus_drv_obj->Base.OnCleanup)
-                vmbus_drv_obj->Base.OnCleanup(&vmbus_drv_obj->Base);
+        if (driver->OnCleanup)
+                driver->OnCleanup(driver);
 
         /* Unregister the root bus device */
         device_unregister(&dev_ctx->device);
@@ -446,7 +628,6 @@ static void vmbus_bus_exit(void)
  */
 int vmbus_child_driver_register(struct driver_context *driver_ctx)
 {
-        struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
         int ret;
 
         DPRINT_INFO(VMBUS_DRV, "child driver (%p) registering - name %s",
@@ -457,7 +638,7 @@ int vmbus_child_driver_register(struct driver_context *driver_ctx)
 
         ret = driver_register(&driver_ctx->driver);
 
-        vmbus_drv_obj->GetChannelOffers();
+        vmbus_request_offers();
 
         return ret;
 }
@@ -489,9 +670,9 @@ EXPORT_SYMBOL(vmbus_child_driver_unregister);
  * vmbus_child_device_create - Creates and registers a new child device
  * on the vmbus.
  */
-static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
-                                                   struct hv_guid *instance,
-                                                   struct vmbus_channel *channel)
+struct hv_device *vmbus_child_device_create(struct hv_guid *type,
+                                            struct hv_guid *instance,
+                                            struct vmbus_channel *channel)
 {
         struct vm_device *child_device_ctx;
         struct hv_device *child_device_obj;
@@ -538,8 +719,8 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
 /*
  * vmbus_child_device_register - Register the child device on the specified bus
  */
-static int vmbus_child_device_register(struct hv_device *root_device_obj,
-                                       struct hv_device *child_device_obj)
+int vmbus_child_device_register(struct hv_device *root_device_obj,
+                                struct hv_device *child_device_obj)
 {
         int ret = 0;
         struct vm_device *root_device_ctx =
@@ -583,7 +764,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
  * vmbus_child_device_unregister - Remove the specified child device
  * from the vmbus.
  */
-static void vmbus_child_device_unregister(struct hv_device *device_obj)
+void vmbus_child_device_unregister(struct hv_device *device_obj)
 {
         struct vm_device *device_ctx = to_vm_device(device_obj);
 
@@ -601,13 +782,6 @@ static void vmbus_child_device_unregister(struct hv_device *device_obj)
 }
 
 /*
- * vmbus_child_device_destroy - Destroy the specified child device on the vmbus.
- */
-static void vmbus_child_device_destroy(struct hv_device *device_obj)
-{
-}
-
-/*
  * vmbus_uevent - add uevent for our device
  *
  * This routine is invoked when a device is added or removed on the vmbus to
@@ -701,7 +875,7 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
                 struct vmbus_driver_context *vmbus_drv_ctx =
                         (struct vmbus_driver_context *)driver_ctx;
 
-                device_ctx->device_obj.Driver = &vmbus_drv_ctx->drv_obj.Base;
+                device_ctx->device_obj.Driver = &vmbus_drv_ctx->drv_obj;
                 DPRINT_INFO(VMBUS_DRV,
                             "device object (%p) set to driver object (%p)",
                             &device_ctx->device_obj,
@@ -849,7 +1023,6 @@ static void vmbus_device_release(struct device *device)
 {
         struct vm_device *device_ctx = device_to_vm_device(device);
 
-        /* vmbus_child_device_destroy(&device_ctx->device_obj); */
         kfree(device_ctx);
 
         /* !!DO NOT REFERENCE device_ctx anymore at this point!! */
@@ -860,36 +1033,28 @@ static void vmbus_device_release(struct device *device)
  */
 static void vmbus_msg_dpc(unsigned long data)
 {
-        struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
-
-        /* ASSERT(vmbus_drv_obj->OnMsgDpc != NULL); */
+        struct hv_driver *driver = (struct hv_driver *)data;
 
         /* Call to bus driver to handle interrupt */
-        vmbus_drv_obj->OnMsgDpc(&vmbus_drv_obj->Base);
+        vmbus_on_msg_dpc(driver);
 }
 
 /*
- * vmbus_msg_dpc - Tasklet routine to handle hypervisor events
+ * vmbus_event_dpc - Tasklet routine to handle hypervisor events
  */
 static void vmbus_event_dpc(unsigned long data)
 {
-        struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
-
-        /* ASSERT(vmbus_drv_obj->OnEventDpc != NULL); */
-
         /* Call to bus driver to handle interrupt */
-        vmbus_drv_obj->OnEventDpc(&vmbus_drv_obj->Base);
+        VmbusOnEvents();
 }
 
 static irqreturn_t vmbus_isr(int irq, void *dev_id)
 {
-        struct vmbus_driver *vmbus_driver_obj = &g_vmbus_drv.drv_obj;
+        struct hv_driver *driver = &g_vmbus_drv.drv_obj;
         int ret;
 
-        /* ASSERT(vmbus_driver_obj->OnIsr != NULL); */
-
         /* Call to bus driver to handle interrupt */
-        ret = vmbus_driver_obj->OnIsr(&vmbus_driver_obj->Base);
+        ret = vmbus_on_isr(driver);
 
         /* Schedules a dpc if necessary */
         if (ret > 0) {
@@ -928,7 +1093,7 @@ static int __init vmbus_init(void)
         if (!dmi_check_system(microsoft_hv_dmi_table))
                 return -ENODEV;
 
-        return vmbus_bus_init(VmbusInitialize);
+        return vmbus_bus_init();
 }
 
 static void __exit vmbus_exit(void)
diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h
index 09eaec964b30..07f6d22eeabb 100644
--- a/drivers/staging/hv/vmbus_private.h
+++ b/drivers/staging/hv/vmbus_private.h
@@ -102,13 +102,14 @@ extern struct VMBUS_CONNECTION gVmbusConnection;
 
 /* General vmbus interface */
 
-struct hv_device *VmbusChildDeviceCreate(struct hv_guid *deviceType,
+struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType,
                                          struct hv_guid *deviceInstance,
                                          struct vmbus_channel *channel);
 
 int VmbusChildDeviceAdd(struct hv_device *Device);
-
-void VmbusChildDeviceRemove(struct hv_device *Device);
+int vmbus_child_device_register(struct hv_device *root_device_obj,
+                                struct hv_device *child_device_obj);
+void vmbus_child_device_unregister(struct hv_device *device_obj);
 
 /* static void */
 /* VmbusChildDeviceDestroy( */
diff --git a/drivers/staging/hv/vstorage.h b/drivers/staging/hv/vstorage.h
index 4ea597d7a7d7..ae8be84394d5 100644
--- a/drivers/staging/hv/vstorage.h
+++ b/drivers/staging/hv/vstorage.h
@@ -27,15 +27,17 @@
 
 #define REVISION_STRING(REVISION_) #REVISION_
 #define FILL_VMSTOR_REVISION(RESULT_LVALUE_)                            \
-{                                                                       \
-        char *revisionString = REVISION_STRING($Revision : 6 $) + 11;   \
-        RESULT_LVALUE_ = 0;                                             \
-        while (*revisionString >= '0' && *revisionString <= '9') {      \
-                RESULT_LVALUE_ *= 10;                                   \
-                RESULT_LVALUE_ += *revisionString - '0';                \
-                revisionString++;                                       \
-        }                                                               \
-}
+        do {                                                            \
+                char *revision_string                                   \
+                        = REVISION_STRING($Rev : 6 $) + 6;              \
+                RESULT_LVALUE_ = 0;                                     \
+                while (*revision_string >= '0'                          \
+                        && *revision_string <= '9') {                   \
+                        RESULT_LVALUE_ *= 10;                           \
+                        RESULT_LVALUE_ += *revision_string - '0';       \
+                        revision_string++;                              \
+                }                                                       \
+        } while (0)
 
 /* Major/minor macros.  Minor version is in LSB, meaning that earlier flat */
 /* version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). */
@@ -65,17 +67,17 @@
 
 /*  Packet structure describing virtual storage requests. */
 enum vstor_packet_operation {
-        VStorOperationCompleteIo            = 1,
-        VStorOperationRemoveDevice          = 2,
-        VStorOperationExecuteSRB            = 3,
-        VStorOperationResetLun              = 4,
-        VStorOperationResetAdapter          = 5,
-        VStorOperationResetBus              = 6,
-        VStorOperationBeginInitialization   = 7,
-        VStorOperationEndInitialization     = 8,
-        VStorOperationQueryProtocolVersion  = 9,
-        VStorOperationQueryProperties       = 10,
-        VStorOperationMaximum               = 10
+        VSTOR_OPERATION_COMPLETE_IO             = 1,
+        VSTOR_OPERATION_REMOVE_DEVICE           = 2,
+        VSTOR_OPERATION_EXECUTE_SRB             = 3,
+        VSTOR_OPERATION_RESET_LUN               = 4,
+        VSTOR_OPERATION_RESET_ADAPTER           = 5,
+        VSTOR_OPERATION_RESET_BUS               = 6,
+        VSTOR_OPERATION_BEGIN_INITIALIZATION    = 7,
+        VSTOR_OPERATION_END_INITIALIZATION      = 8,
+        VSTOR_OPERATION_QUERY_PROTOCOL_VERSION  = 9,
+        VSTOR_OPERATION_QUERY_PROPERTIES        = 10,
+        VSTOR_OPERATION_MAXIMUM                 = 10
 };
 
 /*
@@ -89,31 +91,29 @@ enum vstor_packet_operation {
 #define SENSE_BUFFER_SIZE                       0x12
 #endif
 
-#define MAX_DATA_BUFFER_LENGTH_WITH_PADDING     0x14
+#define MAX_DATA_BUF_LEN_WITH_PADDING           0x14
 
 struct vmscsi_request {
-        unsigned short Length;
-        unsigned char SrbStatus;
-        unsigned char ScsiStatus;
+        unsigned short length;
+        unsigned char srb_status;
+        unsigned char scsi_status;
 
-        unsigned char PortNumber;
-        unsigned char PathId;
-        unsigned char TargetId;
-        unsigned char Lun;
+        unsigned char port_number;
+        unsigned char path_id;
+        unsigned char target_id;
+        unsigned char lun;
 
-        unsigned char CdbLength;
-        unsigned char SenseInfoLength;
-        unsigned char DataIn;
-        unsigned char Reserved;
+        unsigned char cdb_length;
+        unsigned char sense_info_length;
+        unsigned char data_in;
+        unsigned char reserved;
 
-        unsigned int DataTransferLength;
+        unsigned int data_transfer_length;
 
         union {
-        unsigned char Cdb[CDB16GENERIC_LENGTH];
-
-        unsigned char SenseData[SENSE_BUFFER_SIZE];
-
-        unsigned char ReservedArray[MAX_DATA_BUFFER_LENGTH_WITH_PADDING];
+                unsigned char cdb[CDB16GENERIC_LENGTH];
+                unsigned char sense_data[SENSE_BUFFER_SIZE];
+                unsigned char reserved_array[MAX_DATA_BUF_LEN_WITH_PADDING];
         };
 } __attribute((packed));
 
@@ -123,24 +123,24 @@ struct vmscsi_request {
  * properties of the channel.
  */
 struct vmstorage_channel_properties {
-        unsigned short ProtocolVersion;
-        unsigned char  PathId;
-        unsigned char  TargetId;
+        unsigned short protocol_version;
+        unsigned char path_id;
+        unsigned char target_id;
 
         /* Note: port number is only really known on the client side */
-        unsigned int  PortNumber;
-        unsigned int  Flags;
-        unsigned int  MaxTransferBytes;
+        unsigned int port_number;
+        unsigned int flags;
+        unsigned int max_transfer_bytes;
 
         /*  This id is unique for each channel and will correspond with */
         /*  vendor specific data in the inquirydata */
-        unsigned long long UniqueId;
+        unsigned long long unique_id;
 } __attribute__((packed));
 
 /*  This structure is sent during the storage protocol negotiations. */
 struct vmstorage_protocol_version {
         /* Major (MSW) and minor (LSW) version numbers. */
-        unsigned short MajorMinor;
+        unsigned short major_minor;
 
         /*
          * Revision number is auto-incremented whenever this file is changed
@@ -148,7 +148,7 @@ struct vmstorage_protocol_version {
          * definitely indicate incompatibility--but it does indicate mismatched
          * builds.
          */
-        unsigned short Revision;
+        unsigned short revision;
 } __attribute__((packed));
 
 /* Channel Property Flags */
@@ -157,13 +157,13 @@ struct vmstorage_protocol_version {
 
 struct vstor_packet {
         /* Requested operation type */
-        enum vstor_packet_operation Operation;
+        enum vstor_packet_operation operation;
 
         /*  Flags - see below for values */
-        unsigned int     Flags;
+        unsigned int flags;
 
         /* Status of the request returned from the server side. */
-        unsigned int     Status;
+        unsigned int status;
 
         /* Data payload area */
         union {
@@ -171,13 +171,13 @@ struct vstor_packet {
                  * Structure used to forward SCSI commands from the
                  * client to the server.
                  */
-                struct vmscsi_request VmSrb;
+                struct vmscsi_request vm_srb;
 
                 /* Structure used to query channel properties. */
-                struct vmstorage_channel_properties StorageChannelProperties;
+                struct vmstorage_channel_properties storage_channel_properties;
 
                 /* Used during version negotiations. */
-                struct vmstorage_protocol_version Version;
+                struct vmstorage_protocol_version version;
         };
 } __attribute__((packed));
 
diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio b/drivers/staging/iio/Documentation/sysfs-bus-iio
index fdb017a1c1a2..2dde97de75f8 100644
--- a/drivers/staging/iio/Documentation/sysfs-bus-iio
+++ b/drivers/staging/iio/Documentation/sysfs-bus-iio
@@ -1,11 +1,12 @@
-What:           /sys/bus/iio/devices/device[n]
+What:           /sys/bus/iio/devices/deviceX
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Hardware chip or device accessed by on communication port.
-                Corresponds to a grouping of sensor channels.
+                Corresponds to a grouping of sensor channels. X is the IIO
+                index of the device.
 
-What:           /sys/bus/iio/devices/trigger[n]
+What:           /sys/bus/iio/devices/triggerX
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -13,25 +14,26 @@ Description:
                 May be provided by a device driver that also has an IIO device
                 based on hardware generated events (e.g. data ready) or
                 provided by a separate driver for other hardware (e.g.
-                periodic timer, gpio or high resolution timer).
+                periodic timer, GPIO or high resolution timer).
                 Contains trigger type specific elements. These do not
                 generalize well and hence are not documented in this file.
+                X is the IIO index of the trigger.
 
-What:           /sys/bus/iio/devices/device[n]:buffer
+What:           /sys/bus/iio/devices/deviceX:buffer
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Link to /sys/class/iio/device[n]/device[n]:buffer. n indicates
+                Link to /sys/class/iio/deviceX/deviceX:buffer. X indicates
                 the device with which this buffer buffer is associated.
 
-What:           /sys/.../device[n]/name
+What:           /sys/bus/iio/devices/deviceX/name
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Description of the physical chip / device. Typically a part
-                number.
+                Description of the physical chip / device for device X.
+                Typically a part number.
 
-What:           /sys/.../device[n]/sampling_frequency
+What:           /sys/bus/iio/devices/deviceX/sampling_frequency
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -44,158 +46,233 @@ Description:
                 relevant directories.  If it effects all of the above
                 then it is to be found in the base device directory as here.
 
-What:           /sys/.../device[n]/sampling_frequency_available
+What:           /sys/bus/iio/devices/deviceX/sampling_frequency_available
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 When the internal sampling clock can only take a small
-                discrete set of values, this file lists those availale.
+                discrete set of values, this file lists those available.
 
-What:           /sys/.../device[n]/in[m][_name]_raw
+What:           /sys/bus/iio/devices/deviceX/inY_raw
+What:           /sys/bus/iio/devices/deviceX/inY_supply_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Raw (unscaled no bias removal etc) voltage measurement from
-                channel m. name is used in special cases where this does
-                not correspond to externally available input (e.g. supply
-                voltage monitoring in which case the file is in_supply_raw).
-                If the device supports events on this channel then m must be
-                specified (even on named channels) so as to allow the source
-                of event codes to be identified.
-
-What:           /sys/.../device[n]/in[m][_name]_offset
+                channel Y. In special cases where the channel does not
+                correspond to externally available input one of the named
+                versions may be used. The number must always be specified and
+                unique to allow association with event codes.
+
+What:           /sys/bus/iio/devices/deviceX/inY-inZ_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                If known for a device, offset to be added to in[m]_raw prior
-                to scaling by in[_name][m]_scale in order to obtain voltage in
-                millivolts.  Not present if the offset is always 0 or unknown.
-                If m is not present, then voltage offset applies to all in
-                channels. May be writable if a variable offset is controlled
-                by the device. Note that this is different to calibbias which
-                is for devices that apply offsets to compensate for variation
-                between different instances of the part, typically adjusted by
-                using some hardware supported calibration procedure.
+                Raw (unscaled) differential voltage measurement equivalent to
+                channel Y - channel Z where these channel numbers apply to the
+                physically equivalent inputs when non differential readings are
+                separately available. In differential only parts, then all that
+                is required is a consistent labeling.
 
-What:           /sys/.../device[n]/in[m][_name]_offset_available
+What:           /sys/bus/iio/devices/deviceX/temp_raw
+What:           /sys/bus/iio/devices/deviceX/temp_x_raw
+What:           /sys/bus/iio/devices/deviceX/temp_y_raw
+What:           /sys/bus/iio/devices/deviceX/temp_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                If a small number of discrete offset values are available, this
-                will be a space separated list.  If these are independant (but
-                options the same) for individual offsets then m should not be
-                present.
+                Raw (unscaled no bias removal etc) temperature measurement.
+                It an axis is specified it generally means that the temperature
+                sensor is associated with one part of a compound device (e.g.
+                a gyroscope axis).
 
-What:           /sys/.../device[n]/in[m][_name]_offset_[min|max]
+What:           /sys/bus/iio/devices/deviceX/accel_x_raw
+What:           /sys/bus/iio/devices/deviceX/accel_y_raw
+What:           /sys/bus/iio/devices/deviceX/accel_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                If a more or less continuous range of voltage offsets are
-                supported then these specify the minimum and maximum.  If shared
-                by all in channels then m is not present.
+                Acceleration in direction x, y or z (may be arbitrarily assigned
+                but should match other such assignments on device)
+                channel m (not present if only one accelerometer channel at
+                this orientation). Has all of the equivalent parameters as per
+                inY. Units after application of scale and offset are m/s^2.
 
-What:           /sys/.../device[n]/in[m][_name]_calibbias
+What:           /sys/bus/iio/devices/deviceX/gyro_x_raw
+What:           /sys/bus/iio/devices/deviceX/gyro_y_raw
+What:           /sys/bus/iio/devices/deviceX/gyro_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Hardware applied calibration offset. (assumed to fix production
-                inaccuracies)
+                Angular velocity about axis x, y or z (may be arbitrarily
+                assigned) Data converted by application of offset then scale to
+                radians per second. Has all the equivalent parameters as
+                per inY.
 
-What            /sys/.../device[n]/in[m][_name]_calibscale
+What:           /sys/bus/iio/devices/deviceX/incli_x_raw
+What:           /sys/bus/iio/devices/deviceX/incli_y_raw
+What:           /sys/bus/iio/devices/deviceX/incli_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Hardware applied calibration scale factor. (assumed to fix
-                production inaccuracies)
+                Inclination raw reading about axis x, y or z (may be
+                arbitrarily assigned). Data converted by application of offset
+                and scale to Degrees.
 
-What:           /sys/.../device[n]/in[m][_name]_scale
+What:           /sys/bus/iio/devices/deviceX/magn_x_raw
+What:           /sys/bus/iio/devices/deviceX/magn_y_raw
+What:           /sys/bus/iio/devices/deviceX/magn_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                If known for a device, scale to be applied to volt[m]_raw post
-                addition of in[_name][m]_offset in order to obtain the measured
-                voltage in millivolts.  If shared across all in channels then
-                m is not present.
+                Magnetic field along axis x, y or z (may be arbitrarily
+                assigned) channel m (not present if only one magnetometer
+                at this orientation).  Data converted by application of
+                offset then scale to Gauss. Has all the equivalent modifiers
+                as per inY.
 
-What:           /sys/.../device[n]/in[m]-in[o]_raw
-KernelVersion:  2.6.35
+What:           /sys/bus/iio/devices/deviceX/accel_x_peak_raw
+What:           /sys/bus/iio/devices/deviceX/accel_y_peak_raw
+What:           /sys/bus/iio/devices/deviceX/accel_z_peak_raw
+KernelVersion:  2.6.36
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Raw (unscaled) differential voltage measurement equivalent to
-                channel m - channel o where these channel numbers apply to the
-                physically equivalent inputs when non differential readings are
-                separately available. In differential only parts, then all that
-                is required is a consistent labelling.
+                Some devices provide a store of the highest value seen since
+                some reset condition.  These attributes allow access to this
+                and are otherwise the direct equivalent of the
+                <type>Y[_name]_raw attributes.
 
-What:           /sys/.../device[n]/accel[_x|_y|_z][m]_raw
-KernelVersion:  2.6.35
+What:           /sys/bus/iio/devices/deviceX/accel_xyz_squared_peak_raw
+KernelVersion:  2.6.36
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Acceleration in direction x, y or z (may be arbitrarily assigned
-                but should match other such assignments on device)
-                channel m (not present if only one accelerometer channel at
-                this orientation). Has all of the equivalent parameters as per
-                in[m]. Units after application of scale and offset are m/s^2.
+                A computed peak value based on the sum squared magnitude of
+                the underlying value in the specified directions.
 
-What:           /sys/.../device[n]/gyro[_x|_y|_z][m]_raw
+What:           /sys/bus/iio/devices/deviceX/accel_offset
+What:           /sys/bus/iio/devices/deviceX/temp_offset
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Angular velocity about axis x, y or z (may be arbitrarily
-                assigned) channel m (not present if only one gyroscope at
-                this orientation).
-                Data converted by application of offset then scale to
-                radians per second. Has all the equivalent parameters as
-                per in[m].
-
-What:           /sys/.../device[n]/incli[_x|_y|_z][m]_raw
+                If known for a device, offset to be added to <type>[Y]_raw prior
+                to scaling by <type>[Y]_scale in order to obtain value in the
+                <type> units as specified in <type>[y]_raw documentation.
+                Not present if the offset is always 0 or unknown. If Y is not
+                present, then the offset applies to all in channels of <type>.
+                May be writable if a variable offset can be applied on the
+                device. Note that this is different to calibbias which
+                is for devices (or drivers) that apply offsets to compensate
+                for variation between different instances of the part, typically
+                adjusted by using some hardware supported calibration procedure.
+
+What:           /sys/bus/iio/devices/deviceX/inY_scale
+What:           /sys/bus/iio/devices/deviceX/inY_supply_scale
+What:           /sys/bus/iio/devices/deviceX/in_scale
+What:           /sys/bus/iio/devices/deviceX/accel_scale
+What:           /sys/bus/iio/devices/deviceX/accel_peak_scale
+What:           /sys/bus/iio/devices/deviceX/gyro_scale
+What:           /sys/bus/iio/devices/deviceX/magn_scale
+What:           /sys/bus/iio/devices/deviceX/magn_x_scale
+What:           /sys/bus/iio/devices/deviceX/magn_y_scale
+What:           /sys/bus/iio/devices/deviceX/magn_z_scale
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Inclination raw reading about axis x, y or z (may be arbitarily
-                assigned) channel m (not present if only one inclinometer at
-                this orientation).  Data converted by application of offset
-                and scale to Degrees.
-
-What:           /sys/.../device[n]/magn[_x|_y|_z][m]_raw
+                If known for a device, scale to be applied to <type>Y[_name]_raw
+                post addition of <type>[Y][_name]_offset in order to obtain the
+                measured value in <type> units as specified in
+                <type>[Y][_name]_raw documentation..  If shared across all in
+                channels then Y is not present and the value is called
+                <type>[Y][_name]_scale. The peak modifier means this value
+                is applied to <type>Y[_name]_peak_raw values.
+
+What:           /sys/bus/iio/devices/deviceX/accel_x_calibbias
+What:           /sys/bus/iio/devices/deviceX/accel_y_calibbias
+What:           /sys/bus/iio/devices/deviceX/accel_z_calibbias
+What:           /sys/bus/iio/devices/deviceX/gyro_x_calibbias
+What:           /sys/bus/iio/devices/deviceX/gyro_y_calibbias
+What:           /sys/bus/iio/devices/deviceX/gyro_z_calibbias
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Magnetic field along axis x, y or z (may be arbitrarily
-                assigned) channel m (not present if only one magnetometer
-                at this orientation).  Data converted by application of
-                offset then scale to Gauss. Has all the equivalent modifiers
-                as per in[m].
-
-What:           /sys/.../device[n]/device[n]:event[m]
+                Hardware applied calibration offset. (assumed to fix production
+                inaccuracies). If shared across all channels, <type>_calibbias
+                is used.
+
+What            /sys/bus/iio/devices/deviceX/inY_calibscale
+What            /sys/bus/iio/devices/deviceX/inY_supply_calibscale
+What            /sys/bus/iio/devices/deviceX/in_calibscale
+What            /sys/bus/iio/devices/deviceX/accel_x_calibscale
+What            /sys/bus/iio/devices/deviceX/accel_y_calibscale
+What            /sys/bus/iio/devices/deviceX/accel_z_calibscale
+What            /sys/bus/iio/devices/deviceX/gyro_x_calibscale
+What            /sys/bus/iio/devices/deviceX/gyro_y_calibscale
+What            /sys/bus/iio/devices/deviceX/gyro_z_calibscale
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Configuration of which hardware generated events are passed up to
-                userspace. Some of these are a bit complex to generalize so this
-                section is a work in progress.
+                Hardware applied calibration scale factor. (assumed to fix
+                production inaccuracies).  If shared across all channels,
+                <type>_calibscale is used.
 
-What:           /sys/.../device[n]:event[m]/dev
-KernelVersion:  2.6.35
+What:           /sys/bus/iio/devices/deviceX/accel_scale_available
+KernelVersion:  2.635
 Contact:        linux-iio@vger.kernel.org
 Description:
-                major:minor character device numbers for the event line.
+                If a discrete set of scale values are available, they
+                are listed in this attribute.
 
-Taking accel_x0 as an example
+What:           /sys/bus/iio/devices/deviceX/deviceX:eventY
+KernelVersion:  2.6.35
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Configuration of which hardware generated events are passed up
+                to user-space.
 
-What:           /sys/.../device[n]:event[m]/accel_x0_thresh[_rising|_falling]_en
+What:           /sys/bus/iio/devices/deviceX:event/dev
+What:           /sys/bus/iio/devices/deviceX:eventY/dev
+KernelVersion:  2.6.35
+Contact:        linux-iio@vger.kernel.org
+Description:
+                major:minor character device numbers for the event line Y of
+                device X.
+
+What:           /sys/.../deviceX:eventY/accel_x_thresh_rising_en
+What:           /sys/.../deviceX:eventY/accel_x_thresh_falling_en
+What:           /sys/.../deviceX:eventY/accel_y_thresh_rising_en
+What:           /sys/.../deviceX:eventY/accel_y_thresh_falling_en
+What:           /sys/.../deviceX:eventY/accel_z_thresh_rising_en
+What:           /sys/.../deviceX:eventY/accel_z_thresh_falling_en
+What:           /sys/.../deviceX:eventY/gyro_x_thresh_rising_en
+What:           /sys/.../deviceX:eventY/gyro_x_thresh_falling_en
+What:           /sys/.../deviceX:eventY/gyro_y_thresh_rising_en
+What:           /sys/.../deviceX:eventY/gyro_y_thresh_falling_en
+What:           /sys/.../deviceX:eventY/gyro_z_thresh_rising_en
+What:           /sys/.../deviceX:eventY/gyro_z_thresh_falling_en
+What:           /sys/.../deviceX:eventY/magn_x_thresh_rising_en
+What:           /sys/.../deviceX:eventY/magn_x_thresh_falling_en
+What:           /sys/.../deviceX:eventY/magn_y_thresh_rising_en
+What:           /sys/.../deviceX:eventY/magn_y_thresh_falling_en
+What:           /sys/.../deviceX:eventY/magn_z_thresh_rising_en
+What:           /sys/.../deviceX:eventY/magn_z_thresh_falling_en
+What:           /sys/.../deviceX:eventY/inZ_supply_thresh_rising_en
+What:           /sys/.../deviceX:eventY/inZ_supply_thresh_falling_en
+What:           /sys/.../deviceX:eventY/inZ_thresh_rising_en
+What:           /sys/.../deviceX:eventY/inZ_thresh_falling_en
+What:           /sys/.../deviceX:eventY/temp_thresh_rising_en
+What:           /sys/.../deviceX:eventY/temp_thresh_falling_en
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Event generated when accel_x0 passes a threshold in the specfied
+                Event generated when channel passes a threshold in the specified
                 (_rising|_falling) direction. If the direction is not specified,
                 then either the device will report an event which ever direction
                 a single threshold value is called in (e.g.
-                accel_x0_<raw|input>_thresh_value) or
-                accel_x0_<raw|input>_thresh_rising_value and
-                accel_x0_<raw|input>_thresh_falling_value may take different
-                values, but the device can only enable both thresholds or
-                neither.
+                <type>[Z][_name]_<raw|input>_thresh_value) or
+                <type>[Z][_name]_<raw|input>_thresh_rising_value and
+                <type>[Z][_name]_<raw|input>_thresh_falling_value may take
+                different values, but the device can only enable both thresholds
+                or neither.
                 Note the driver will assume the last p events requested are
                 to be enabled where p is however many it supports (which may
                 vary depending on the exact set requested. So if you want to be
@@ -205,186 +282,338 @@ Description:
                 a given event type is enabled a future point (and not those for
                 whatever event was previously enabled).
 
-What:           /sys/.../accel_x0_<raw|input>_thresh[_rising|_falling]_value
+What:           /sys/.../deviceX:eventY/accel_x_roc_rising_en
+What:           /sys/.../deviceX:eventY/accel_x_roc_falling_en
+What:           /sys/.../deviceX:eventY/accel_y_roc_rising_en
+What:           /sys/.../deviceX:eventY/accel_y_roc_falling_en
+What:           /sys/.../deviceX:eventY/accel_z_roc_rising_en
+What:           /sys/.../deviceX:eventY/accel_z_roc_falling_en
+What:           /sys/.../deviceX:eventY/gyro_x_roc_rising_en
+What:           /sys/.../deviceX:eventY/gyro_x_roc_falling_en
+What:           /sys/.../deviceX:eventY/gyro_y_roc_rising_en
+What:           /sys/.../deviceX:eventY/gyro_y_roc_falling_en
+What:           /sys/.../deviceX:eventY/gyro_z_roc_rising_en
+What:           /sys/.../deviceX:eventY/gyro_z_roc_falling_en
+What:           /sys/.../deviceX:eventY/magn_x_roc_rising_en
+What:           /sys/.../deviceX:eventY/magn_x_roc_falling_en
+What:           /sys/.../deviceX:eventY/magn_y_roc_rising_en
+What:           /sys/.../deviceX:eventY/magn_y_roc_falling_en
+What:           /sys/.../deviceX:eventY/magn_z_roc_rising_en
+What:           /sys/.../deviceX:eventY/magn_z_roc_falling_en
+What:           /sys/.../deviceX:eventY/inZ_supply_roc_rising_en
+What:           /sys/.../deviceX:eventY/inZ_supply_roc_falling_en
+What:           /sys/.../deviceX:eventY/inZ_roc_rising_en
+What:           /sys/.../deviceX:eventY/inZ_roc_falling_en
+What:           /sys/.../deviceX:eventY/temp_roc_rising_en
+What:           /sys/.../deviceX:eventY/temp_roc_falling_en
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Event generated when channel passes a threshold on the rate of
+                change (1st differential) in the specified (_rising|_falling)
+                direction. If the direction is not specified, then either the
+                device will report an event which ever direction a single
+                threshold value is called in (e.g.
+                <type>[Z][_name]_<raw|input>_roc_value) or
+                <type>[Z][_name]_<raw|input>_roc_rising_value and
+                <type>[Z][_name]_<raw|input>_roc_falling_value may take
+                different values, but the device can only enable both rate of
+                change thresholds or neither.
+                Note the driver will assume the last p events requested are
+                to be enabled where p is however many it supports (which may
+                vary depending on the exact set requested. So if you want to be
+                sure you have set what you think you have, check the contents of
+                these attributes after everything is configured. Drivers may
+                have to buffer any parameters so that they are consistent when
+                a given event type is enabled a future point (and not those for
+                whatever event was previously enabled).
+
+What:           /sys/.../deviceX:eventY/accel_x_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/accel_x_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/accel_y_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/accel_y_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/accel_z_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/accel_z_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/gyro_x_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/gyro_x_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/gyro_y_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/gyro_y_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/gyro_z_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/gyro_z_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/magn_x_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/magn_x_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/magn_y_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/magn_y_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/magn_z_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/magn_z_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/inZ_supply_raw_thresh_rising_value
+What:           /sys/.../deviceX:eventY/inZ_supply_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/inZ_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/inZ_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/temp_raw_thresh_falling_value
+What:           /sys/.../deviceX:eventY/temp_raw_thresh_falling_value
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Specifies the value of threshold that the device is comparing
                 against for the events enabled by
-                accel_x0_<raw|input>_thresh[_rising|falling]_en.
-                If seperate exist for the two directions, but direction is
-                not specified for this attribute, then a single threshold value
-                applies to both directions.
+                <type>Z[_name]_thresh[_rising|falling]_en.
+                If separate attributes  exist for the two directions, but
+                direction is not specified for this attribute, then a single
+                threshold value applies to both directions.
                 The raw or input element of the name indicates whether the
                 value is in raw device units or in processed units (as _raw
                 and _input do on sysfs direct channel read attributes).
 
-What:           /sys/.../accel_x0_thresh[_rising|_falling]_meanperiod
+What:           /sys/.../deviceX:eventY/accel_x_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/accel_x_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/accel_y_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/accel_y_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/accel_z_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/accel_z_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/gyro_x_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/gyro_x_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/gyro_y_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/gyro_y_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/gyro_z_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/gyro_z_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/magn_x_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/magn_x_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/magn_y_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/magn_y_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/magn_z_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/magn_z_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/inZ_supply_raw_roc_rising_value
+What:           /sys/.../deviceX:eventY/inZ_supply_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/inZ_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/inZ_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/temp_raw_roc_falling_value
+What:           /sys/.../deviceX:eventY/temp_raw_roc_falling_value
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Period of time (in seconds) over which the raw channel value
-                is averaged before being compared with the threshold set in
-                accel_x0_thresh[_rising|_falling]_meanperiod.  If direction is
-                not specified then this mean period applies to both directions.
+                Specifies the value of rate of change threshold that the
+                device is comparing against for the events enabled by
+                <type>[Z][_name]_roc[_rising|falling]_en.
+                If separate attributes exist for the two directions,
+                but direction is not specified for this attribute,
+                then a single threshold value applies to both directions.
+                The raw or input element of the name indicates whether the
+                value is in raw device units or in processed units (as _raw
+                and _input do on sysfs direct channel read attributes).
 
-What:           /sys/.../accel_x0_thresh[_rising|_falling]_period
+What:           /sys/.../deviceX:eventY/accel_x_thresh_rising_period
+What:           /sys/.../deviceX:eventY/accel_x_thresh_falling_period
+hat:            /sys/.../deviceX:eventY/accel_x_roc_rising_period
+What:           /sys/.../deviceX:eventY/accel_x_roc_falling_period
+What:           /sys/.../deviceX:eventY/accel_y_thresh_rising_period
+What:           /sys/.../deviceX:eventY/accel_y_thresh_falling_period
+What:           /sys/.../deviceX:eventY/accel_y_roc_rising_period
+What:           /sys/.../deviceX:eventY/accel_y_roc_falling_period
+What:           /sys/.../deviceX:eventY/accel_z_thresh_rising_period
+What:           /sys/.../deviceX:eventY/accel_z_thresh_falling_period
+What:           /sys/.../deviceX:eventY/accel_z_roc_rising_period
+What:           /sys/.../deviceX:eventY/accel_z_roc_falling_period
+What:           /sys/.../deviceX:eventY/gyro_x_thresh_rising_period
+What:           /sys/.../deviceX:eventY/gyro_x_thresh_falling_period
+What:           /sys/.../deviceX:eventY/gyro_x_roc_rising_period
+What:           /sys/.../deviceX:eventY/gyro_x_roc_falling_period
+What:           /sys/.../deviceX:eventY/gyro_y_thresh_rising_period
+What:           /sys/.../deviceX:eventY/gyro_y_thresh_falling_period
+What:           /sys/.../deviceX:eventY/gyro_y_roc_rising_period
+What:           /sys/.../deviceX:eventY/gyro_y_roc_falling_period
+What:           /sys/.../deviceX:eventY/gyro_z_thresh_rising_period
+What:           /sys/.../deviceX:eventY/gyro_z_thresh_falling_period
+What:           /sys/.../deviceX:eventY/gyro_z_roc_rising_period
+What:           /sys/.../deviceX:eventY/gyro_z_roc_falling_period
+What:           /sys/.../deviceX:eventY/magn_x_thresh_rising_period
+What:           /sys/.../deviceX:eventY/magn_x_thresh_falling_period
+What:           /sys/.../deviceX:eventY/magn_x_roc_rising_period
+What:           /sys/.../deviceX:eventY/magn_x_roc_falling_period
+What:           /sys/.../deviceX:eventY/magn_y_thresh_rising_period
+What:           /sys/.../deviceX:eventY/magn_y_thresh_falling_period
+What:           /sys/.../deviceX:eventY/magn_y_roc_rising_period
+What:           /sys/.../deviceX:eventY/magn_y_roc_falling_period
+What:           /sys/.../deviceX:eventY/magn_z_thresh_rising_period
+What:           /sys/.../deviceX:eventY/magn_z_thresh_falling_period
+What:           /sys/.../deviceX:eventY/magn_z_roc_rising_period
+What:           /sys/.../deviceX:eventY/magn_z_roc_falling_period
+What:           /sys/.../deviceX:eventY/inZ_supply_thresh_rising_period
+What:           /sys/.../deviceX:eventY/inZ_supply_thresh_falling_period
+What:           /sys/.../deviceX:eventY/inz_supply_roc_rising_period
+What:           /sys/.../deviceX:eventY/inZ_supply_roc_falling_period
+What:           /sys/.../deviceX:eventY/inZ_thresh_rising_period
+What:           /sys/.../deviceX:eventY/inZ_thresh_falling_period
+What:           /sys/.../deviceX:eventY/inZ_roc_rising_period
+What:           /sys/.../deviceX:eventY/inZ_roc_falling_period
+What:           /sys/.../deviceX:eventY/temp_thresh_rising_period
+What:           /sys/.../deviceX:eventY/temp_thresh_falling_period
+What:           /sys/.../deviceX:eventY/temp_roc_rising_period
+What:           /sys/.../deviceX:eventY/temp_roc_falling_period
+What:           /sys/.../deviceX:eventY/accel_x&y&z_mag_falling_period
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Period of time (in seconds) for which the threshold must be
-                passed before an event is generated. If direction is not
+                Period of time (in seconds) for which the condition must be
+                met before an event is generated. If direction is not
                 specified then this period applies to both directions.
 
-What:           /sys/.../device[n]:event[m]/accel_x0_mag[_rising|_falling]_en
+What:           /sys/.../deviceX:eventY/accel_mag_en
+What:           /sys/.../deviceX:eventY/accel_mag_rising_en
+What:           /sys/.../deviceX:eventY/accel_mag_falling_en
+What:           /sys/.../deviceX:eventY/accel_x_mag_en
+What:           /sys/.../deviceX:eventY/accel_x_mag_rising_en
+What:           /sys/.../deviceX:eventY/accel_x_mag_falling_en
+What:           /sys/.../deviceX:eventY/accel_y_mag_en
+What:           /sys/.../deviceX:eventY/accel_y_mag_rising_en
+What:           /sys/.../deviceX:eventY/accel_y_mag_falling_en
+What:           /sys/.../deviceX:eventY/accel_z_mag_en
+What:           /sys/.../deviceX:eventY/accel_z_mag_rising_en
+What:           /sys/.../deviceX:eventY/accel_z_mag_falling_en
+What:           /sys/.../deviceX:eventY/accel_x&y&z_mag_rising_en
+What:           /sys/.../deviceX:eventY/accel_x&y&z_mag_falling_en
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Similar to accel_x0_thresh[_rising|_falling]_en, but here the
+                Similar to accel_x_thresh[_rising|_falling]_en, but here the
                 magnitude of the channel is compared to the threshold, not its
                 signed value.
 
-What:           /sys/.../accel_x0_<raw|input>_mag[_rising|_falling]_value
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                The value to which the magnitude of the channel is compared.
-
-What:           /sys/.../accel_x0_mag[_rising|_falling]_meanperiod
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Period of time (in seconds) over which the value of the channel
-                is averaged before being compared to the threshold
-
-What:           /sys/.../accel_x0_mag[_rising|_falling]_period
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Period of time (in seconds) for which the condition must be true
-                before an event occurs.
-
-What:           /sys/.../device[n]:event[m]/accel_x0_roc[_rising|_falling]_en
+What:           /sys/.../accel_raw_mag_value
+What:           /sys/.../accel_x_raw_mag_rising_value
+What:           /sys/.../accel_y_raw_mag_rising_value
+What:           /sys/.../accel_z_raw_mag_rising_value
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Similar to accel_x0_thresh[_rising|_falling]_en, but here the
-                first differential is compared with the threshold.
+                The value to which the magnitude of the channel is compared. If
+                number or direction is not specified, applies to all channels of
+                this type.
 
-What:           /sys/.../accel_x0_<raw|input>_roc[_rising|_falling]_value
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                The value to which the first differential of the channel is
-                compared.
-
-What:           /sys/.../accel_x0_roc[_rising|_falling]_meanperiod
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Period of time (in seconds) over which the value of the channel
-                is averaged before being compared to the threshold
-
-What:           /sys/.../accel_x0_roc[_rising|_falling]_period
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Period of time (in seconds) for which the condition must be true
-                before an event occurs.
-
-What:           /sys/.../device[n]/device[n]:buffer:event/dev
+What:           /sys/bus/iio/devices/deviceX:buffer:event/dev
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Buffer for device n event character device major:minor numbers.
+                Buffer for device X event character device major:minor numbers.
 
-What:           /sys/.../device[n]/device[n]:buffer:access/dev
+What:           /sys/bus/iio/devices/deviceX:buffer:access/dev
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Buffer for device n access character device o major:minor numbers.
+                Buffer for device X access character device major:minor numbers.
 
-What:           /sys/.../device[n]:buffer/trigger
+What:           /sys/bus/iio/devices/deviceX:buffer/trigger
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 The name of the trigger source being used, as per string given
-                in /sys/class/iio/trigger[n]/name.
+                in /sys/class/iio/triggerY/name.
 
-What:           /sys/.../device[n]:buffer/length
+What:           /sys/bus/iio/devices/deviceX:buffer/length
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Number of scans contained by the buffer.
 
-What:           /sys/.../device[n]:buffer/bytes_per_datum
+What:           /sys/bus/iio/devices/deviceX:buffer/bytes_per_datum
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Bytes per scan.  Due to alignment fun, the scan may be larger
                 than implied directly by the scan_element parameters.
 
-What:           /sys/.../device[n]:buffer/enable
+What:           /sys/bus/iio/devices/deviceX:buffer/enable
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Actually start the buffer capture up.  Will start trigger
                 if first device and appropriate.
 
-What:           /sys/.../device[n]:buffer/alignment
-KernelVersion:  2.6.35
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Minimum data alignment.  Scan elements larger than this are
-                aligned to the nearest power of 2 times this.  (may not be
-                true in weird hardware buffers that pack data well)
-
-What:           /sys/.../device[n]/buffer/scan_elements
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Directory containing interfaces for elements that will be
                 captured for a single triggered sample set in the buffer.
 
-What:           /sys/.../device[n]/buffer/scan_elements/accel_x0_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_x_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_y_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_z_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_x_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_y_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_z_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_x_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_y_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_z_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/timestamp_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_supply_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY-inZ_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_x_en
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_y_en
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Scan element control for triggered data capture.
 
-What:           /sys/.../device[n]/buffer/scan_elements/accel[_x0]_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_type
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/in-in_type
+What:           /sys/.../deviceX:buffer/scan_elements/inY_supply_type
+What:           /sys/.../deviceX:buffer/scan_elements/timestamp_type
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Description of the scan element data storage within the buffer
-                and hence the form in which it is read from userspace.
-                Form is [s|u]bits/storagebits.  s or u specifies if signed
-                (2's complement) or unsigned. bits is the number of bits of
-                data and storagebits is the space (after padding) that it
-                occupies in the buffer.  Note that some devices will have
-                additional information in the unused bits so to get a clean
-                value, the bits value must be used to mask the buffer output
-                value appropriately.  The storagebits value also specifies the
-                data alignment.  So s48/64 will be a signed 48 bit integer
-                stored in a 64 bit location aligned to a a64 bit boundary.
+                and hence the form in which it is read from user-space.
+                Form is [s|u]bits/storagebits[>>shift].  s or u specifies if
+                signed (2's complement) or unsigned. bits is the number of bits
+                of data and storagebits is the space (after padding) that it
+                occupies in the buffer. shift if specified, is the shift that
+                needs to be applied prior to masking out unused bits. Some
+                devices put their data in the middle of the transferred elements
+                with additional information on both sides.  Note that some
+                devices will have additional information in the unused bits
+                so to get a clean value, the bits value must be used to mask
+                the buffer output value appropriately.  The storagebits value
+                also specifies the data alignment.  So s48/64>>2 will be a
+                signed 48 bit integer stored in a 64 bit location aligned to
+                a a64 bit boundary. To obtain the clean value, shift right 2
+                and apply a mask to zero the top 16 bits of the result.
                 For other storage combinations this attribute will be extended
                 appropriately.
 
-What:           /sys/.../device[n]/buffer/scan_elements/accel[_x0]_index
+What:           /sys/.../deviceX:buffer/scan_elements/accel_type_available
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                If the type parameter can take one of a small set of values,
+                this attribute lists them.
+
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_index
+What:           /sys/.../deviceX:buffer/scan_elements/inY_supply_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_x_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_y_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_z_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_x_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_y_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_z_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_x_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_y_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_z_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_x_index
+What:           /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_y_index
+What:           /sys/.../deviceX:buffer/scan_elements/timestamp_index
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 A single positive integer specifying the position of this
-                scan element in the buffer. Note these are not dependant on
-                what is enabled and may not be contiguous. Thus for userspace
+                scan element in the buffer. Note these are not dependent on
+                what is enabled and may not be contiguous. Thus for user-space
                 to establish the full layout these must be used in conjunction
                 with all _en attributes to establish which channels are present,
                 and the relevant _type attributes to establish the data storage
                 format.
-
-What:           /sys/.../device[n]/buffer/scan_elements/accel[_x0]_shift
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                A bit shift (to right) that must be applied prior to
-                extracting the bits specified by accel[_x0]_precision.
diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-dds b/drivers/staging/iio/Documentation/sysfs-bus-iio-dds
new file mode 100644
index 000000000000..ffdd5478a35d
--- /dev/null
+++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-dds
@@ -0,0 +1,93 @@
+
+What:           /sys/bus/iio/devices/.../ddsX_freqY
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Stores frequency into tuning word Y.
+                There will be more than one ddsX_freqY file, which allows for
+                pin controlled FSK Frequency Shift Keying
+                (ddsX_pincontrol_freq_en is active) or the user can control
+                the desired active tuning word by writing Y to the
+                ddsX_freqsymbol file.
+
+What:           /sys/bus/iio/devices/.../ddsX_freqY_scale
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Scale to be applied to ddsX_freqY in order to obtain the
+                desired value in Hz. If shared across all frequency registers
+                Y is not present. It is also possible X is not present if
+                shared across all channels.
+
+What:           /sys/bus/iio/devices/.../ddsX_freqsymbol
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Specifies the active output frequency tuning word. The value
+                corresponds to the Y in ddsX_freqY. To exit this mode the user
+                can write ddsX_pincontrol_freq_en or ddsX_out_enable file.
+
+What:           /sys/bus/iio/devices/.../ddsX_phaseY
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Stores phase into Y.
+                There will be more than one ddsX_phaseY file, which allows for
+                pin controlled PSK Phase Shift Keying
+                (ddsX_pincontrol_phase_en is active) or the user can
+                control the desired phase Y which is added to the phase
+                accumulator output by writing Y to the en_phase file.
+
+What:           /sys/bus/iio/devices/.../ddsX_phaseY_scale
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Scale to be applied to ddsX_phaseY in order to obtain the
+                desired value in rad. If shared across all phase registers
+                Y is not present. It is also possible X is not present if
+                shared across all channels.
+
+What:           /sys/bus/iio/devices/.../ddsX_phasesymbol
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Specifies the active phase Y which is added to the phase
+                accumulator output. The value corresponds to the Y in
+                ddsX_phaseY. To exit this mode the user can write
+                ddsX_pincontrol_phase_en or disable file.
+
+What:           /sys/bus/iio/devices/.../ddsX_pincontrol_en
+What:           /sys/bus/iio/devices/.../ddsX_pincontrol_freq_en
+What:           /sys/bus/iio/devices/.../ddsX_pincontrol_phase_en
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                ddsX_pincontrol_en: Both, the active frequency and phase is
+                controlled by the respective phase and frequency control inputs.
+                In case the device in question allows to independent controls,
+                then there are dedicated files (ddsX_pincontrol_freq_en,
+                ddsX_pincontrol_phase_en).
+
+What:           /sys/bus/iio/devices/.../ddsX_out_enable
+What:           /sys/bus/iio/devices/.../ddsX_outY_enable
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                ddsX_outY_enable controls signal generation on output Y of
+                channel X. Y may be suppressed if all channels are
+                controlled together.
+
+What:           /sys/bus/iio/devices/.../ddsX_outY_wavetype
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Specifies the output waveform.
+                (sine, triangle, ramp, square, ...)
+                For a list of available output waveform options read
+                available_output_modes.
+
+What:           /sys/bus/iio/devices/.../ddsX_outY_wavetype_available
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Lists all available output waveform options.
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index ed48815a916b..e2ac07d86110 100644
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -42,11 +42,15 @@ config IIO_TRIGGER
 
 source "drivers/staging/iio/accel/Kconfig"
 source "drivers/staging/iio/adc/Kconfig"
+source "drivers/staging/iio/addac/Kconfig"
+source "drivers/staging/iio/dac/Kconfig"
+source "drivers/staging/iio/dds/Kconfig"
 source "drivers/staging/iio/gyro/Kconfig"
 source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
 source "drivers/staging/iio/magnetometer/Kconfig"
-
+source "drivers/staging/iio/meter/Kconfig"
+source "drivers/staging/iio/resolver/Kconfig"
 source "drivers/staging/iio/trigger/Kconfig"
 
 endif # IIO
diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile
index e909674920fc..f9b5fb2fe8f1 100644
--- a/drivers/staging/iio/Makefile
+++ b/drivers/staging/iio/Makefile
@@ -11,8 +11,13 @@ obj-$(CONFIG_IIO_SW_RING) += ring_sw.o
 
 obj-y += accel/
 obj-y += adc/
+obj-y += addac/
+obj-y += dac/
+obj-y += dds/
 obj-y += gyro/
 obj-y += imu/
 obj-y += light/
-obj-y += trigger/
 obj-y += magnetometer/
+obj-y += meter/
+obj-y += resolver/
+obj-y += trigger/
diff --git a/drivers/staging/iio/TODO b/drivers/staging/iio/TODO
index 898cba1c939f..d1ad35e24abb 100644
--- a/drivers/staging/iio/TODO
+++ b/drivers/staging/iio/TODO
@@ -61,6 +61,10 @@ necessitate a header that is also visible from arch board
 files. (avoided at the moment to keep the driver set
 contained in staging).
 
+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 indvidual docs.
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 5926c03be1a5..a34f1d3e673c 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -3,6 +3,33 @@
 #
 comment "Accelerometers"
 
+config ADIS16201
+        tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
+        depends on SPI
+        select IIO_TRIGGER if IIO_RING_BUFFER
+        select IIO_SW_RING if IIO_RING_BUFFER
+        help
+          Say yes here to build support for Analog Devices adis16201 dual-axis
+          digital inclinometer and accelerometer.
+
+config ADIS16203
+        tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer"
+        depends on SPI
+        select IIO_TRIGGER if IIO_RING_BUFFER
+        select IIO_SW_RING if IIO_RING_BUFFER
+        help
+          Say yes here to build support for Analog Devices adis16203 Programmable
+          360 Degrees Inclinometer.
+
+config ADIS16204
+        tristate "Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder"
+        depends on SPI
+        select IIO_TRIGGER if IIO_RING_BUFFER
+        select IIO_SW_RING if IIO_RING_BUFFER
+        help
+          Say yes here to build support for Analog Devices adis16204 Programmable
+          High-g Digital Impact Sensor and Recorder.
+
 config ADIS16209
         tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"
         depends on SPI
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index ff84703a16f6..1b2a6d3ddafa 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -2,6 +2,18 @@
 # Makefile for industrial I/O accelerometer drivers
 #
 
+adis16201-y             := adis16201_core.o
+adis16201-$(CONFIG_IIO_RING_BUFFER) += adis16201_ring.o adis16201_trigger.o
+obj-$(CONFIG_ADIS16201) += adis16201.o
+
+adis16203-y             := adis16203_core.o
+adis16203-$(CONFIG_IIO_RING_BUFFER) += adis16203_ring.o adis16203_trigger.o
+obj-$(CONFIG_ADIS16203) += adis16203.o
+
+adis16204-y             := adis16204_core.o
+adis16204-$(CONFIG_IIO_RING_BUFFER) += adis16204_ring.o adis16204_trigger.o
+obj-$(CONFIG_ADIS16204) += adis16204.o
+
 adis16209-y             := adis16209_core.o
 adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o
 obj-$(CONFIG_ADIS16209) += adis16209.o
diff --git a/drivers/staging/iio/accel/accel.h b/drivers/staging/iio/accel/accel.h
index f5f61b2497aa..50651f835cea 100644
--- a/drivers/staging/iio/accel/accel.h
+++ b/drivers/staging/iio/accel/accel.h
@@ -65,3 +65,23 @@
 #define IIO_DEV_ATTR_ACCEL_Z(_show, _addr)                      \
         IIO_DEVICE_ATTR(accel_z_raw, S_IRUGO, _show, NULL, _addr)
 
+#define IIO_DEV_ATTR_ACCEL_XY(_show, _addr)                     \
+        IIO_DEVICE_ATTR(accel_xy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_PEAK(_show, _addr)                   \
+        IIO_DEVICE_ATTR(accel_peak, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_XPEAK(_show, _addr)                  \
+        IIO_DEVICE_ATTR(accel_xpeak, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_YPEAK(_show, _addr)                  \
+        IIO_DEVICE_ATTR(accel_ypeak, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_ZPEAK(_show, _addr)                  \
+        IIO_DEVICE_ATTR(accel_zpeak, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_XYPEAK(_show, _addr)         \
+        IIO_DEVICE_ATTR(accel_xypeak, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ACCEL_XYZPEAK(_show, _addr)                \
+        IIO_DEVICE_ATTR(accel_xyzpeak, S_IRUGO, _show, NULL, _addr)
diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
new file mode 100644
index 000000000000..c9bf22c13428
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16201.h
@@ -0,0 +1,150 @@
+#ifndef SPI_ADIS16201_H_
+#define SPI_ADIS16201_H_
+
+#define ADIS16201_STARTUP_DELAY 220 /* ms */
+
+#define ADIS16201_READ_REG(a)    a
+#define ADIS16201_WRITE_REG(a) ((a) | 0x80)
+
+#define ADIS16201_FLASH_CNT      0x00 /* Flash memory write count */
+#define ADIS16201_SUPPLY_OUT     0x02 /* Output, power supply */
+#define ADIS16201_XACCL_OUT      0x04 /* Output, x-axis accelerometer */
+#define ADIS16201_YACCL_OUT      0x06 /* Output, y-axis accelerometer */
+#define ADIS16201_AUX_ADC        0x08 /* Output, auxiliary ADC input */
+#define ADIS16201_TEMP_OUT       0x0A /* Output, temperature */
+#define ADIS16201_XINCL_OUT      0x0C /* Output, x-axis inclination */
+#define ADIS16201_YINCL_OUT      0x0E /* Output, y-axis inclination */
+#define ADIS16201_XACCL_OFFS     0x10 /* Calibration, x-axis acceleration offset */
+#define ADIS16201_YACCL_OFFS     0x12 /* Calibration, y-axis acceleration offset */
+#define ADIS16201_XACCL_SCALE    0x14 /* x-axis acceleration scale factor */
+#define ADIS16201_YACCL_SCALE    0x16 /* y-axis acceleration scale factor */
+#define ADIS16201_XINCL_OFFS     0x18 /* Calibration, x-axis inclination offset */
+#define ADIS16201_YINCL_OFFS     0x1A /* Calibration, y-axis inclination offset */
+#define ADIS16201_XINCL_SCALE    0x1C /* x-axis inclination scale factor */
+#define ADIS16201_YINCL_SCALE    0x1E /* y-axis inclination scale factor */
+#define ADIS16201_ALM_MAG1       0x20 /* Alarm 1 amplitude threshold */
+#define ADIS16201_ALM_MAG2       0x22 /* Alarm 2 amplitude threshold */
+#define ADIS16201_ALM_SMPL1      0x24 /* Alarm 1, sample period */
+#define ADIS16201_ALM_SMPL2      0x26 /* Alarm 2, sample period */
+#define ADIS16201_ALM_CTRL       0x28 /* Alarm control */
+#define ADIS16201_AUX_DAC        0x30 /* Auxiliary DAC data */
+#define ADIS16201_GPIO_CTRL      0x32 /* General-purpose digital input/output control */
+#define ADIS16201_MSC_CTRL       0x34 /* Miscellaneous control */
+#define ADIS16201_SMPL_PRD       0x36 /* Internal sample period (rate) control */
+#define ADIS16201_AVG_CNT        0x38 /* Operation, filter configuration */
+#define ADIS16201_SLP_CNT        0x3A /* Operation, sleep mode control */
+#define ADIS16201_DIAG_STAT      0x3C /* Diagnostics, system status register */
+#define ADIS16201_GLOB_CMD       0x3E /* Operation, system command register */
+
+#define ADIS16201_OUTPUTS        7
+
+/* MSC_CTRL */
+#define ADIS16201_MSC_CTRL_SELF_TEST_EN         (1 << 8)  /* Self-test enable */
+#define ADIS16201_MSC_CTRL_DATA_RDY_EN          (1 << 2)  /* Data-ready enable: 1 = enabled, 0 = disabled */
+#define ADIS16201_MSC_CTRL_ACTIVE_HIGH          (1 << 1)  /* Data-ready polarity: 1 = active high, 0 = active low */
+#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1        (1 << 0)  /* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
+
+/* DIAG_STAT */
+#define ADIS16201_DIAG_STAT_ALARM2        (1<<9) /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16201_DIAG_STAT_ALARM1        (1<<8) /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16201_DIAG_STAT_SPI_FAIL      (1<<3) /* SPI communications failure */
+#define ADIS16201_DIAG_STAT_FLASH_UPT     (1<<2) /* Flash update failure */
+#define ADIS16201_DIAG_STAT_POWER_HIGH    (1<<1) /* Power supply above 3.625 V */
+#define ADIS16201_DIAG_STAT_POWER_LOW     (1<<0) /* Power supply below 3.15 V */
+
+/* GLOB_CMD */
+#define ADIS16201_GLOB_CMD_SW_RESET     (1<<7)
+#define ADIS16201_GLOB_CMD_FACTORY_CAL  (1<<1)
+
+#define ADIS16201_MAX_TX 14
+#define ADIS16201_MAX_RX 14
+
+#define ADIS16201_ERROR_ACTIVE          (1<<14)
+
+/**
+ * struct adis16201_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16201_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+int adis16201_set_irq(struct device *dev, bool enable);
+
+#ifdef CONFIG_IIO_RING_BUFFER
+enum adis16201_scan {
+        ADIS16201_SCAN_SUPPLY,
+        ADIS16201_SCAN_ACC_X,
+        ADIS16201_SCAN_ACC_Y,
+        ADIS16201_SCAN_AUX_ADC,
+        ADIS16201_SCAN_TEMP,
+        ADIS16201_SCAN_INCLI_X,
+        ADIS16201_SCAN_INCLI_Y,
+};
+
+void adis16201_remove_trigger(struct iio_dev *indio_dev);
+int adis16201_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16201_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+int adis16201_configure_ring(struct iio_dev *indio_dev);
+void adis16201_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16201_initialize_ring(struct iio_ring_buffer *ring);
+void adis16201_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16201_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16201_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16201_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16201_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16201_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16201_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16201_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16201_H_ */
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
new file mode 100644
index 000000000000..79b785a0013a
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -0,0 +1,659 @@
+/*
+ * ADIS16201 Programmable Digital Vibration Sensor driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "accel.h"
+#include "inclinometer.h"
+#include "../gyro/gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16201.h"
+
+#define DRIVER_NAME             "adis16201"
+
+static int adis16201_check_status(struct device *dev);
+
+/**
+ * adis16201_spi_write_reg_8() - write single byte to a register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the register to be written
+ * @val: the value to write
+ **/
+static int adis16201_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16201_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16201_spi_write_reg_16() - write 2 bytes to a pair of registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: value to be written
+ **/
+static int adis16201_spi_write_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .tx_buf = st->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16201_WRITE_REG(lower_reg_address);
+        st->tx[1] = value & 0xFF;
+        st->tx[2] = ADIS16201_WRITE_REG(lower_reg_address + 1);
+        st->tx[3] = (value >> 8) & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16201_spi_read_reg_16() - read 2 bytes from a 16-bit register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: somewhere to pass back the value read
+ **/
+static int adis16201_spi_read_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                }, {
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16201_READ_REG(lower_reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                lower_reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[0] << 8) | st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t adis16201_read_12bit_unsigned(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = adis16201_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        if (val & ADIS16201_ERROR_ACTIVE) {
+                ret = adis16201_check_status(dev);
+                if (ret)
+                        return ret;
+        }
+
+        return sprintf(buf, "%u\n", val & 0x0FFF);
+}
+
+static ssize_t adis16201_read_temp(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        ssize_t ret;
+        u16 val;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16201_spi_read_reg_16(dev, ADIS16201_TEMP_OUT, (u16 *)&val);
+        if (ret)
+                goto error_ret;
+
+        if (val & ADIS16201_ERROR_ACTIVE) {
+                ret = adis16201_check_status(dev);
+                if (ret)
+                        goto error_ret;
+        }
+
+        val &= 0xFFF;
+        ret = sprintf(buf, "%d\n", val);
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
+
+static ssize_t adis16201_read_9bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16201_ERROR_ACTIVE) {
+                        ret = adis16201_check_status(dev);
+                        if (ret)
+                                goto error_ret;
+                }
+                val = ((s16)(val << 7) >> 7);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16201_read_12bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16201_ERROR_ACTIVE) {
+                        ret = adis16201_check_status(dev);
+                        if (ret)
+                                goto error_ret;
+                }
+
+                val = ((s16)(val << 4) >> 4);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16201_read_14bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16201_ERROR_ACTIVE) {
+                        ret = adis16201_check_status(dev);
+                        if (ret)
+                                goto error_ret;
+                }
+
+                val = ((s16)(val << 2) >> 2);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16201_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16201_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int adis16201_reset(struct device *dev)
+{
+        int ret;
+        ret = adis16201_spi_write_reg_8(dev,
+                        ADIS16201_GLOB_CMD,
+                        ADIS16201_GLOB_CMD_SW_RESET);
+        if (ret)
+                dev_err(dev, "problem resetting device");
+
+        return ret;
+}
+
+static ssize_t adis16201_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -EINVAL;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return adis16201_reset(dev);
+        }
+        return -EINVAL;
+}
+
+int adis16201_set_irq(struct device *dev, bool enable)
+{
+        int ret = 0;
+        u16 msc;
+
+        ret = adis16201_spi_read_reg_16(dev, ADIS16201_MSC_CTRL, &msc);
+        if (ret)
+                goto error_ret;
+
+        msc |= ADIS16201_MSC_CTRL_ACTIVE_HIGH;
+        msc &= ~ADIS16201_MSC_CTRL_DATA_RDY_DIO1;
+        if (enable)
+                msc |= ADIS16201_MSC_CTRL_DATA_RDY_EN;
+        else
+                msc &= ~ADIS16201_MSC_CTRL_DATA_RDY_EN;
+
+        ret = adis16201_spi_write_reg_16(dev, ADIS16201_MSC_CTRL, msc);
+
+error_ret:
+        return ret;
+}
+
+static int adis16201_check_status(struct device *dev)
+{
+        u16 status;
+        int ret;
+
+        ret = adis16201_spi_read_reg_16(dev, ADIS16201_DIAG_STAT, &status);
+        if (ret < 0) {
+                dev_err(dev, "Reading status failed\n");
+                goto error_ret;
+        }
+        ret = status & 0xF;
+        if (ret)
+                ret = -EFAULT;
+
+        if (status & ADIS16201_DIAG_STAT_SPI_FAIL)
+                dev_err(dev, "SPI failure\n");
+        if (status & ADIS16201_DIAG_STAT_FLASH_UPT)
+                dev_err(dev, "Flash update failed\n");
+        if (status & ADIS16201_DIAG_STAT_POWER_HIGH)
+                dev_err(dev, "Power supply above 3.625V\n");
+        if (status & ADIS16201_DIAG_STAT_POWER_LOW)
+                dev_err(dev, "Power supply below 3.15V\n");
+
+error_ret:
+        return ret;
+}
+
+static int adis16201_self_test(struct device *dev)
+{
+        int ret;
+        ret = adis16201_spi_write_reg_16(dev,
+                        ADIS16201_MSC_CTRL,
+                        ADIS16201_MSC_CTRL_SELF_TEST_EN);
+        if (ret) {
+                dev_err(dev, "problem starting self test");
+                goto err_ret;
+        }
+
+        ret = adis16201_check_status(dev);
+
+err_ret:
+        return ret;
+}
+
+static int adis16201_initial_setup(struct adis16201_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* Disable IRQ */
+        ret = adis16201_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        /* Do self test */
+        ret = adis16201_self_test(dev);
+        if (ret) {
+                dev_err(dev, "self test failure");
+                goto err_ret;
+        }
+
+        /* Read status register to check the result */
+        ret = adis16201_check_status(dev);
+        if (ret) {
+                adis16201_reset(dev);
+                dev_err(dev, "device not playing ball -> reset");
+                msleep(ADIS16201_STARTUP_DELAY);
+                ret = adis16201_check_status(dev);
+                if (ret) {
+                        dev_err(dev, "giving up");
+                        goto err_ret;
+                }
+        }
+
+        printk(KERN_INFO DRIVER_NAME ": at CS%d (irq %d)\n",
+                        st->us->chip_select, st->us->irq);
+
+err_ret:
+        return ret;
+}
+
+static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16201_read_12bit_unsigned,
+                ADIS16201_SUPPLY_OUT);
+static IIO_CONST_ATTR(in0_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(1, adis16201_read_12bit_unsigned,
+                ADIS16201_AUX_ADC);
+static IIO_CONST_ATTR(in1_scale, "0.00061");
+
+static IIO_DEV_ATTR_ACCEL_X(adis16201_read_14bit_signed,
+                ADIS16201_XACCL_OUT);
+static IIO_DEV_ATTR_ACCEL_Y(adis16201_read_14bit_signed,
+                ADIS16201_YACCL_OUT);
+static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO,
+                adis16201_read_12bit_signed,
+                adis16201_write_16bit,
+                ADIS16201_XACCL_OFFS);
+static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO,
+                adis16201_read_12bit_signed,
+                adis16201_write_16bit,
+                ADIS16201_YACCL_OFFS);
+static IIO_CONST_ATTR(accel_scale, "0.4625");
+
+static IIO_DEV_ATTR_INCLI_X(adis16201_read_14bit_signed,
+                ADIS16201_XINCL_OUT);
+static IIO_DEV_ATTR_INCLI_Y(adis16201_read_14bit_signed,
+                ADIS16201_YINCL_OUT);
+static IIO_DEV_ATTR_INCLI_X_OFFSET(S_IWUSR | S_IRUGO,
+                adis16201_read_9bit_signed,
+                adis16201_write_16bit,
+                ADIS16201_XACCL_OFFS);
+static IIO_DEV_ATTR_INCLI_Y_OFFSET(S_IWUSR | S_IRUGO,
+                adis16201_read_9bit_signed,
+                adis16201_write_16bit,
+                ADIS16201_YACCL_OFFS);
+static IIO_CONST_ATTR(incli_scale, "0.1");
+
+static IIO_DEV_ATTR_TEMP_RAW(adis16201_read_temp);
+static IIO_CONST_ATTR(temp_offset, "25");
+static IIO_CONST_ATTR(temp_scale, "-0.47");
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0);
+
+static IIO_CONST_ATTR(name, "adis16201");
+
+static struct attribute *adis16201_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16201_event_attribute_group = {
+        .attrs = adis16201_event_attributes,
+};
+
+static struct attribute *adis16201_attributes[] = {
+        &iio_dev_attr_in0_supply_raw.dev_attr.attr,
+        &iio_const_attr_in0_supply_scale.dev_attr.attr,
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_in1_raw.dev_attr.attr,
+        &iio_const_attr_in1_scale.dev_attr.attr,
+        &iio_dev_attr_accel_x_raw.dev_attr.attr,
+        &iio_dev_attr_accel_y_raw.dev_attr.attr,
+        &iio_dev_attr_accel_x_offset.dev_attr.attr,
+        &iio_dev_attr_accel_y_offset.dev_attr.attr,
+        &iio_const_attr_accel_scale.dev_attr.attr,
+        &iio_dev_attr_incli_x_raw.dev_attr.attr,
+        &iio_dev_attr_incli_y_raw.dev_attr.attr,
+        &iio_dev_attr_incli_x_offset.dev_attr.attr,
+        &iio_dev_attr_incli_y_offset.dev_attr.attr,
+        &iio_const_attr_incli_scale.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16201_attribute_group = {
+        .attrs = adis16201_attributes,
+};
+
+static int __devinit adis16201_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16201_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16201_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16201_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16201_event_attribute_group;
+        st->indio_dev->attrs = &adis16201_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16201_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16201_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16201");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16201_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = adis16201_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        adis16201_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (spi->irq)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16201_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16201_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int adis16201_remove(struct spi_device *spi)
+{
+        struct adis16201_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16201_remove_trigger(indio_dev);
+        if (spi->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16201_uninitialize_ring(indio_dev->ring);
+        iio_device_unregister(indio_dev);
+        adis16201_unconfigure_ring(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver adis16201_driver = {
+        .driver = {
+                .name = "adis16201",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16201_probe,
+        .remove = __devexit_p(adis16201_remove),
+};
+
+static __init int adis16201_init(void)
+{
+        return spi_register_driver(&adis16201_driver);
+}
+module_init(adis16201_init);
+
+static __exit void adis16201_exit(void)
+{
+        spi_unregister_driver(&adis16201_driver);
+}
+module_exit(adis16201_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16201 Programmable Digital Vibration Sensor driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
new file mode 100644
index 000000000000..e6870a2721f1
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -0,0 +1,218 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../ring_sw.h"
+#include "accel.h"
+#include "../trigger.h"
+#include "adis16201.h"
+
+static IIO_SCAN_EL_C(in_supply, ADIS16201_SCAN_SUPPLY, ADIS16201_SUPPLY_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 12, 16);
+static IIO_SCAN_EL_C(accel_x, ADIS16201_SCAN_ACC_X, ADIS16201_XACCL_OUT, NULL);
+static IIO_SCAN_EL_C(accel_y, ADIS16201_SCAN_ACC_Y, ADIS16201_YACCL_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16);
+static IIO_SCAN_EL_C(in0, ADIS16201_SCAN_AUX_ADC, ADIS16201_AUX_ADC, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);
+static IIO_SCAN_EL_C(temp, ADIS16201_SCAN_TEMP, ADIS16201_TEMP_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16);
+static IIO_SCAN_EL_C(incli_x, ADIS16201_SCAN_INCLI_X,
+                     ADIS16201_XINCL_OUT, NULL);
+static IIO_SCAN_EL_C(incli_y, ADIS16201_SCAN_INCLI_Y,
+                     ADIS16201_YINCL_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(incli, s, 14, 16);
+static IIO_SCAN_EL_TIMESTAMP(7);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
+
+static struct attribute *adis16201_scan_el_attrs[] = {
+        &iio_scan_el_in_supply.dev_attr.attr,
+        &iio_const_attr_in_supply_index.dev_attr.attr,
+        &iio_const_attr_in_supply_type.dev_attr.attr,
+        &iio_scan_el_accel_x.dev_attr.attr,
+        &iio_const_attr_accel_x_index.dev_attr.attr,
+        &iio_scan_el_accel_y.dev_attr.attr,
+        &iio_const_attr_accel_y_index.dev_attr.attr,
+        &iio_const_attr_accel_type.dev_attr.attr,
+        &iio_scan_el_in0.dev_attr.attr,
+        &iio_const_attr_in0_index.dev_attr.attr,
+        &iio_const_attr_in0_type.dev_attr.attr,
+        &iio_scan_el_temp.dev_attr.attr,
+        &iio_const_attr_temp_index.dev_attr.attr,
+        &iio_const_attr_temp_type.dev_attr.attr,
+        &iio_scan_el_incli_x.dev_attr.attr,
+        &iio_const_attr_incli_x_index.dev_attr.attr,
+        &iio_scan_el_incli_y.dev_attr.attr,
+        &iio_const_attr_incli_y_index.dev_attr.attr,
+        &iio_const_attr_incli_type.dev_attr.attr,
+        &iio_scan_el_timestamp.dev_attr.attr,
+        &iio_const_attr_timestamp_index.dev_attr.attr,
+        &iio_const_attr_timestamp_type.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adis16201_scan_el_group = {
+        .attrs = adis16201_scan_el_attrs,
+        .name = "scan_elements",
+};
+
+/**
+ * adis16201_poll_func_th() top half interrupt handler called by trigger
+ * @private_data:       iio_dev
+ **/
+static void adis16201_poll_func_th(struct iio_dev *indio_dev, s64 time)
+{
+        struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
+        st->last_timestamp = time;
+        schedule_work(&st->work_trigger_to_ring);
+}
+
+/**
+ * adis16201_read_ring_data() read data registers which will be placed into ring
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @rx: somewhere to pass back the value read
+ **/
+static int adis16201_read_ring_data(struct device *dev, u8 *rx)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[ADIS16201_OUTPUTS + 1];
+        int ret;
+        int i;
+
+        mutex_lock(&st->buf_lock);
+
+        spi_message_init(&msg);
+
+        memset(xfers, 0, sizeof(xfers));
+        for (i = 0; i <= ADIS16201_OUTPUTS; i++) {
+                xfers[i].bits_per_word = 8;
+                xfers[i].cs_change = 1;
+                xfers[i].len = 2;
+                xfers[i].delay_usecs = 20;
+                xfers[i].tx_buf = st->tx + 2 * i;
+                st->tx[2 * i] = ADIS16201_READ_REG(ADIS16201_SUPPLY_OUT + 2 * i);
+                st->tx[2 * i + 1] = 0;
+                if (i >= 1)
+                        xfers[i].rx_buf = rx + 2 * (i - 1);
+                spi_message_add_tail(&xfers[i], &msg);
+        }
+
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when burst reading");
+
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
+ * specific to be rolled into the core.
+ */
+static void adis16201_trigger_bh_to_ring(struct work_struct *work_s)
+{
+        struct adis16201_state *st
+                = container_of(work_s, struct adis16201_state,
+                               work_trigger_to_ring);
+        struct iio_ring_buffer *ring = st->indio_dev->ring;
+
+        int i = 0;
+        s16 *data;
+        size_t datasize = ring->access.get_bytes_per_datum(ring);
+
+        data = kmalloc(datasize, GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(&st->us->dev, "memory alloc failed in ring bh");
+                return;
+        }
+
+        if (ring->scan_count)
+                if (adis16201_read_ring_data(&st->indio_dev->dev, st->rx) >= 0)
+                        for (; i < ring->scan_count; i++)
+                                data[i] = be16_to_cpup(
+                                        (__be16 *)&(st->rx[i*2]));
+
+        /* Guaranteed to be aligned with 8 byte boundary */
+        if (ring->scan_timestamp)
+                *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp;
+
+        ring->access.store_to(ring,
+                              (u8 *)data,
+                              st->last_timestamp);
+
+        iio_trigger_notify_done(st->indio_dev->trig);
+        kfree(data);
+
+        return;
+}
+
+void adis16201_unconfigure_ring(struct iio_dev *indio_dev)
+{
+        kfree(indio_dev->pollfunc);
+        iio_sw_rb_free(indio_dev->ring);
+}
+
+int adis16201_configure_ring(struct iio_dev *indio_dev)
+{
+        int ret = 0;
+        struct adis16201_state *st = indio_dev->dev_data;
+        struct iio_ring_buffer *ring;
+        INIT_WORK(&st->work_trigger_to_ring, adis16201_trigger_bh_to_ring);
+
+        ring = iio_sw_rb_allocate(indio_dev);
+        if (!ring) {
+                ret = -ENOMEM;
+                return ret;
+        }
+        indio_dev->ring = ring;
+        /* Effectively select the ring buffer implementation */
+        iio_ring_sw_register_funcs(&ring->access);
+        ring->bpe = 2;
+        ring->scan_el_attrs = &adis16201_scan_el_group;
+        ring->scan_timestamp = true;
+        ring->preenable = &iio_sw_ring_preenable;
+        ring->postenable = &iio_triggered_ring_postenable;
+        ring->predisable = &iio_triggered_ring_predisable;
+        ring->owner = THIS_MODULE;
+
+        /* Set default scan mode */
+        iio_scan_mask_set(ring, iio_scan_el_in_supply.number);
+        iio_scan_mask_set(ring, iio_scan_el_accel_x.number);
+        iio_scan_mask_set(ring, iio_scan_el_accel_y.number);
+        iio_scan_mask_set(ring, iio_scan_el_temp.number);
+        iio_scan_mask_set(ring, iio_scan_el_in0.number);
+        iio_scan_mask_set(ring, iio_scan_el_incli_x.number);
+        iio_scan_mask_set(ring, iio_scan_el_incli_y.number);
+
+        ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16201_poll_func_th);
+        if (ret)
+                goto error_iio_sw_rb_free;
+
+        indio_dev->modes |= INDIO_RING_TRIGGERED;
+        return 0;
+
+error_iio_sw_rb_free:
+        iio_sw_rb_free(indio_dev->ring);
+        return ret;
+}
+
+int adis16201_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return iio_ring_buffer_register(ring, 0);
+}
+
+void adis16201_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+        iio_ring_buffer_unregister(ring);
+}
diff --git a/drivers/staging/iio/accel/adis16201_trigger.c b/drivers/staging/iio/accel/adis16201_trigger.c
new file mode 100644
index 000000000000..8a9cea1986e7
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16201_trigger.c
@@ -0,0 +1,122 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "adis16201.h"
+
+/**
+ * adis16201_data_rdy_trig_poll() the event handler for the data rdy trig
+ **/
+static int adis16201_data_rdy_trig_poll(struct iio_dev *dev_info,
+                                       int index,
+                                       s64 timestamp,
+                                       int no_test)
+{
+        struct adis16201_state *st = iio_dev_get_devdata(dev_info);
+        struct iio_trigger *trig = st->trig;
+
+        iio_trigger_poll(trig, timestamp);
+
+        return IRQ_HANDLED;
+}
+
+IIO_EVENT_SH(data_rdy_trig, &adis16201_data_rdy_trig_poll);
+
+static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+
+static struct attribute *adis16201_trigger_attrs[] = {
+        &dev_attr_name.attr,
+        NULL,
+};
+
+static const struct attribute_group adis16201_trigger_attr_group = {
+        .attrs = adis16201_trigger_attrs,
+};
+
+/**
+ * adis16201_data_rdy_trigger_set_state() set datardy interrupt state
+ **/
+static int adis16201_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                                bool state)
+{
+        struct adis16201_state *st = trig->private_data;
+        struct iio_dev *indio_dev = st->indio_dev;
+        int ret = 0;
+
+        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
+        ret = adis16201_set_irq(&st->indio_dev->dev, state);
+        if (state == false) {
+                iio_remove_event_from_list(&iio_event_data_rdy_trig,
+                                           &indio_dev->interrupts[0]
+                                           ->ev_list);
+                flush_scheduled_work();
+        } else {
+                iio_add_event_to_list(&iio_event_data_rdy_trig,
+                                      &indio_dev->interrupts[0]->ev_list);
+        }
+        return ret;
+}
+
+/**
+ * adis16201_trig_try_reen() try renabling irq for data rdy trigger
+ * @trig:       the datardy trigger
+ **/
+static int adis16201_trig_try_reen(struct iio_trigger *trig)
+{
+        struct adis16201_state *st = trig->private_data;
+        enable_irq(st->us->irq);
+        return 0;
+}
+
+int adis16201_probe_trigger(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct adis16201_state *st = indio_dev->dev_data;
+
+        st->trig = iio_allocate_trigger();
+        st->trig->name = kasprintf(GFP_KERNEL,
+                                "adis16201-dev%d",
+                                indio_dev->id);
+        if (!st->trig->name) {
+                ret = -ENOMEM;
+                goto error_free_trig;
+        }
+        st->trig->dev.parent = &st->us->dev;
+        st->trig->owner = THIS_MODULE;
+        st->trig->private_data = st;
+        st->trig->set_trigger_state = &adis16201_data_rdy_trigger_set_state;
+        st->trig->try_reenable = &adis16201_trig_try_reen;
+        st->trig->control_attrs = &adis16201_trigger_attr_group;
+        ret = iio_trigger_register(st->trig);
+
+        /* select default trigger */
+        indio_dev->trig = st->trig;
+        if (ret)
+                goto error_free_trig_name;
+
+        return 0;
+
+error_free_trig_name:
+        kfree(st->trig->name);
+error_free_trig:
+        iio_free_trigger(st->trig);
+
+        return ret;
+}
+
+void adis16201_remove_trigger(struct iio_dev *indio_dev)
+{
+        struct adis16201_state *state = indio_dev->dev_data;
+
+        iio_trigger_unregister(state->trig);
+        kfree(state->trig->name);
+        iio_free_trigger(state->trig);
+}
diff --git a/drivers/staging/iio/accel/adis16203.h b/drivers/staging/iio/accel/adis16203.h
new file mode 100644
index 000000000000..b39323eac9e3
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16203.h
@@ -0,0 +1,143 @@
+#ifndef SPI_ADIS16203_H_
+#define SPI_ADIS16203_H_
+
+#define ADIS16203_STARTUP_DELAY 220 /* ms */
+
+#define ADIS16203_READ_REG(a)    a
+#define ADIS16203_WRITE_REG(a) ((a) | 0x80)
+
+#define ADIS16203_FLASH_CNT      0x00 /* Flash memory write count */
+#define ADIS16203_SUPPLY_OUT     0x02 /* Output, power supply */
+#define ADIS16203_AUX_ADC        0x08 /* Output, auxiliary ADC input */
+#define ADIS16203_TEMP_OUT       0x0A /* Output, temperature */
+#define ADIS16203_XINCL_OUT      0x0C /* Output, x-axis inclination */
+#define ADIS16203_YINCL_OUT      0x0E /* Output, y-axis inclination */
+#define ADIS16203_INCL_NULL      0x18 /* Incline null calibration */
+#define ADIS16203_ALM_MAG1       0x20 /* Alarm 1 amplitude threshold */
+#define ADIS16203_ALM_MAG2       0x22 /* Alarm 2 amplitude threshold */
+#define ADIS16203_ALM_SMPL1      0x24 /* Alarm 1, sample period */
+#define ADIS16203_ALM_SMPL2      0x26 /* Alarm 2, sample period */
+#define ADIS16203_ALM_CTRL       0x28 /* Alarm control */
+#define ADIS16203_AUX_DAC        0x30 /* Auxiliary DAC data */
+#define ADIS16203_GPIO_CTRL      0x32 /* General-purpose digital input/output control */
+#define ADIS16203_MSC_CTRL       0x34 /* Miscellaneous control */
+#define ADIS16203_SMPL_PRD       0x36 /* Internal sample period (rate) control */
+#define ADIS16203_AVG_CNT        0x38 /* Operation, filter configuration */
+#define ADIS16203_SLP_CNT        0x3A /* Operation, sleep mode control */
+#define ADIS16203_DIAG_STAT      0x3C /* Diagnostics, system status register */
+#define ADIS16203_GLOB_CMD       0x3E /* Operation, system command register */
+
+#define ADIS16203_OUTPUTS        5
+
+/* MSC_CTRL */
+#define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST      (1 << 10) /* Self-test at power-on: 1 = disabled, 0 = enabled */
+#define ADIS16203_MSC_CTRL_REVERSE_ROT_EN       (1 << 9)  /* Reverses rotation of both inclination outputs */
+#define ADIS16203_MSC_CTRL_SELF_TEST_EN         (1 << 8)  /* Self-test enable */
+#define ADIS16203_MSC_CTRL_DATA_RDY_EN          (1 << 2)  /* Data-ready enable: 1 = enabled, 0 = disabled */
+#define ADIS16203_MSC_CTRL_ACTIVE_HIGH          (1 << 1)  /* Data-ready polarity: 1 = active high, 0 = active low */
+#define ADIS16203_MSC_CTRL_DATA_RDY_DIO1        (1 << 0)  /* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
+
+/* DIAG_STAT */
+#define ADIS16203_DIAG_STAT_ALARM2        (1<<9) /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16203_DIAG_STAT_ALARM1        (1<<8) /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16203_DIAG_STAT_SELFTEST_FAIL (1<<5) /* Self-test diagnostic error flag */
+#define ADIS16203_DIAG_STAT_SPI_FAIL      (1<<3) /* SPI communications failure */
+#define ADIS16203_DIAG_STAT_FLASH_UPT     (1<<2) /* Flash update failure */
+#define ADIS16203_DIAG_STAT_POWER_HIGH    (1<<1) /* Power supply above 3.625 V */
+#define ADIS16203_DIAG_STAT_POWER_LOW     (1<<0) /* Power supply below 3.15 V */
+
+/* GLOB_CMD */
+#define ADIS16203_GLOB_CMD_SW_RESET     (1<<7)
+#define ADIS16203_GLOB_CMD_CLEAR_STAT   (1<<4)
+#define ADIS16203_GLOB_CMD_FACTORY_CAL  (1<<1)
+
+#define ADIS16203_MAX_TX 12
+#define ADIS16203_MAX_RX 10
+
+#define ADIS16203_ERROR_ACTIVE          (1<<14)
+
+/**
+ * struct adis16203_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16203_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+int adis16203_set_irq(struct device *dev, bool enable);
+
+#ifdef CONFIG_IIO_RING_BUFFER
+enum adis16203_scan {
+        ADIS16203_SCAN_SUPPLY,
+        ADIS16203_SCAN_AUX_ADC,
+        ADIS16203_SCAN_TEMP,
+        ADIS16203_SCAN_INCLI_X,
+        ADIS16203_SCAN_INCLI_Y,
+};
+
+void adis16203_remove_trigger(struct iio_dev *indio_dev);
+int adis16203_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16203_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+int adis16203_configure_ring(struct iio_dev *indio_dev);
+void adis16203_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16203_initialize_ring(struct iio_ring_buffer *ring);
+void adis16203_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16203_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16203_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16203_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16203_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16203_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16203_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16203_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16203_H_ */
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
new file mode 100644
index 000000000000..b57f19087a93
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -0,0 +1,568 @@
+/*
+ * ADIS16203 Programmable Digital Vibration Sensor driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "accel.h"
+#include "inclinometer.h"
+#include "../gyro/gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16203.h"
+
+#define DRIVER_NAME             "adis16203"
+
+static int adis16203_check_status(struct device *dev);
+
+/**
+ * adis16203_spi_write_reg_8() - write single byte to a register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the register to be written
+ * @val: the value to write
+ **/
+static int adis16203_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16203_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16203_spi_write_reg_16() - write 2 bytes to a pair of registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: value to be written
+ **/
+static int adis16203_spi_write_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .tx_buf = st->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16203_WRITE_REG(lower_reg_address);
+        st->tx[1] = value & 0xFF;
+        st->tx[2] = ADIS16203_WRITE_REG(lower_reg_address + 1);
+        st->tx[3] = (value >> 8) & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16203_spi_read_reg_16() - read 2 bytes from a 16-bit register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: somewhere to pass back the value read
+ **/
+static int adis16203_spi_read_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                }, {
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16203_READ_REG(lower_reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                lower_reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[0] << 8) | st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t adis16203_read_12bit_unsigned(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = adis16203_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        if (val & ADIS16203_ERROR_ACTIVE)
+                adis16203_check_status(dev);
+
+        return sprintf(buf, "%u\n", val & 0x0FFF);
+}
+
+static ssize_t adis16203_read_temp(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        ssize_t ret;
+        u16 val;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16203_spi_read_reg_16(dev, ADIS16203_TEMP_OUT, (u16 *)&val);
+        if (ret)
+                goto error_ret;
+
+        if (val & ADIS16203_ERROR_ACTIVE)
+                adis16203_check_status(dev);
+
+        val &= 0xFFF;
+        ret = sprintf(buf, "%d\n", val);
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
+
+static ssize_t adis16203_read_14bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16203_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16203_ERROR_ACTIVE)
+                        adis16203_check_status(dev);
+
+                val = ((s16)(val << 2) >> 2);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16203_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16203_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int adis16203_reset(struct device *dev)
+{
+        int ret;
+        ret = adis16203_spi_write_reg_8(dev,
+                        ADIS16203_GLOB_CMD,
+                        ADIS16203_GLOB_CMD_SW_RESET);
+        if (ret)
+                dev_err(dev, "problem resetting device");
+
+        return ret;
+}
+
+static ssize_t adis16203_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -EINVAL;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return adis16203_reset(dev);
+        }
+        return -EINVAL;
+}
+
+int adis16203_set_irq(struct device *dev, bool enable)
+{
+        int ret = 0;
+        u16 msc;
+
+        ret = adis16203_spi_read_reg_16(dev, ADIS16203_MSC_CTRL, &msc);
+        if (ret)
+                goto error_ret;
+
+        msc |= ADIS16203_MSC_CTRL_ACTIVE_HIGH;
+        msc &= ~ADIS16203_MSC_CTRL_DATA_RDY_DIO1;
+        if (enable)
+                msc |= ADIS16203_MSC_CTRL_DATA_RDY_EN;
+        else
+                msc &= ~ADIS16203_MSC_CTRL_DATA_RDY_EN;
+
+        ret = adis16203_spi_write_reg_16(dev, ADIS16203_MSC_CTRL, msc);
+
+error_ret:
+        return ret;
+}
+
+static int adis16203_check_status(struct device *dev)
+{
+        u16 status;
+        int ret;
+
+        ret = adis16203_spi_read_reg_16(dev, ADIS16203_DIAG_STAT, &status);
+        if (ret < 0) {
+                dev_err(dev, "Reading status failed\n");
+                goto error_ret;
+        }
+        ret = status & 0x1F;
+
+        if (status & ADIS16203_DIAG_STAT_SELFTEST_FAIL)
+                dev_err(dev, "Self test failure\n");
+        if (status & ADIS16203_DIAG_STAT_SPI_FAIL)
+                dev_err(dev, "SPI failure\n");
+        if (status & ADIS16203_DIAG_STAT_FLASH_UPT)
+                dev_err(dev, "Flash update failed\n");
+        if (status & ADIS16203_DIAG_STAT_POWER_HIGH)
+                dev_err(dev, "Power supply above 3.625V\n");
+        if (status & ADIS16203_DIAG_STAT_POWER_LOW)
+                dev_err(dev, "Power supply below 3.15V\n");
+
+error_ret:
+        return ret;
+}
+
+static int adis16203_self_test(struct device *dev)
+{
+        int ret;
+        ret = adis16203_spi_write_reg_16(dev,
+                        ADIS16203_MSC_CTRL,
+                        ADIS16203_MSC_CTRL_SELF_TEST_EN);
+        if (ret) {
+                dev_err(dev, "problem starting self test");
+                goto err_ret;
+        }
+
+        adis16203_check_status(dev);
+
+err_ret:
+        return ret;
+}
+
+static int adis16203_initial_setup(struct adis16203_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* Disable IRQ */
+        ret = adis16203_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        /* Do self test */
+        ret = adis16203_self_test(dev);
+        if (ret) {
+                dev_err(dev, "self test failure");
+                goto err_ret;
+        }
+
+        /* Read status register to check the result */
+        ret = adis16203_check_status(dev);
+        if (ret) {
+                adis16203_reset(dev);
+                dev_err(dev, "device not playing ball -> reset");
+                msleep(ADIS16203_STARTUP_DELAY);
+                ret = adis16203_check_status(dev);
+                if (ret) {
+                        dev_err(dev, "giving up");
+                        goto err_ret;
+                }
+        }
+
+        printk(KERN_INFO DRIVER_NAME ": at CS%d (irq %d)\n",
+                        st->us->chip_select, st->us->irq);
+
+err_ret:
+        return ret;
+}
+
+static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16203_read_12bit_unsigned,
+                ADIS16203_SUPPLY_OUT);
+static IIO_CONST_ATTR(in0_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(1, adis16203_read_12bit_unsigned,
+                ADIS16203_AUX_ADC);
+static IIO_CONST_ATTR(in1_scale, "0.00061");
+
+static IIO_DEV_ATTR_INCLI_X(adis16203_read_14bit_signed,
+                ADIS16203_XINCL_OUT);
+static IIO_DEV_ATTR_INCLI_Y(adis16203_read_14bit_signed,
+                ADIS16203_YINCL_OUT);
+static IIO_DEV_ATTR_INCLI_X_OFFSET(S_IWUSR | S_IRUGO,
+                adis16203_read_14bit_signed,
+                adis16203_write_16bit,
+                ADIS16203_INCL_NULL);
+static IIO_CONST_ATTR(incli_scale, "0.025");
+
+static IIO_DEV_ATTR_TEMP_RAW(adis16203_read_temp);
+static IIO_CONST_ATTR(temp_offset, "25");
+static IIO_CONST_ATTR(temp_scale, "-0.47");
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16203_write_reset, 0);
+
+static IIO_CONST_ATTR(name, "adis16203");
+
+static struct attribute *adis16203_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16203_event_attribute_group = {
+        .attrs = adis16203_event_attributes,
+};
+
+static struct attribute *adis16203_attributes[] = {
+        &iio_dev_attr_in0_supply_raw.dev_attr.attr,
+        &iio_const_attr_in0_supply_scale.dev_attr.attr,
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_in1_raw.dev_attr.attr,
+        &iio_const_attr_in1_scale.dev_attr.attr,
+        &iio_dev_attr_incli_x_raw.dev_attr.attr,
+        &iio_dev_attr_incli_y_raw.dev_attr.attr,
+        &iio_dev_attr_incli_x_offset.dev_attr.attr,
+        &iio_const_attr_incli_scale.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16203_attribute_group = {
+        .attrs = adis16203_attributes,
+};
+
+static int __devinit adis16203_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16203_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16203_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16203_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16203_event_attribute_group;
+        st->indio_dev->attrs = &adis16203_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16203_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16203_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16203");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16203_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = adis16203_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        adis16203_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (spi->irq)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16203_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16203_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int adis16203_remove(struct spi_device *spi)
+{
+        struct adis16203_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16203_remove_trigger(indio_dev);
+        if (spi->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16203_uninitialize_ring(indio_dev->ring);
+        iio_device_unregister(indio_dev);
+        adis16203_unconfigure_ring(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver adis16203_driver = {
+        .driver = {
+                .name = "adis16203",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16203_probe,
+        .remove = __devexit_p(adis16203_remove),
+};
+
+static __init int adis16203_init(void)
+{
+        return spi_register_driver(&adis16203_driver);
+}
+module_init(adis16203_init);
+
+static __exit void adis16203_exit(void)
+{
+        spi_unregister_driver(&adis16203_driver);
+}
+module_exit(adis16203_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16203 Programmable Digital Vibration Sensor driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
new file mode 100644
index 000000000000..3d774f7efa25
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -0,0 +1,211 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../ring_sw.h"
+#include "accel.h"
+#include "../trigger.h"
+#include "adis16203.h"
+
+static IIO_SCAN_EL_C(in_supply, ADIS16203_SCAN_SUPPLY, ADIS16203_SUPPLY_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 12, 16);
+static IIO_SCAN_EL_C(in0, ADIS16203_SCAN_AUX_ADC, ADIS16203_AUX_ADC, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);
+static IIO_SCAN_EL_C(temp, ADIS16203_SCAN_TEMP, ADIS16203_TEMP_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16);
+static IIO_SCAN_EL_C(incli_x, ADIS16203_SCAN_INCLI_X,
+                     ADIS16203_XINCL_OUT, NULL);
+static IIO_SCAN_EL_C(incli_y, ADIS16203_SCAN_INCLI_Y,
+                     ADIS16203_YINCL_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(incli, s, 14, 16);
+static IIO_SCAN_EL_TIMESTAMP(5);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
+
+static struct attribute *adis16203_scan_el_attrs[] = {
+        &iio_scan_el_in_supply.dev_attr.attr,
+        &iio_const_attr_in_supply_index.dev_attr.attr,
+        &iio_const_attr_in_supply_type.dev_attr.attr,
+        &iio_scan_el_in0.dev_attr.attr,
+        &iio_const_attr_in0_index.dev_attr.attr,
+        &iio_const_attr_in0_type.dev_attr.attr,
+        &iio_scan_el_temp.dev_attr.attr,
+        &iio_const_attr_temp_index.dev_attr.attr,
+        &iio_const_attr_temp_type.dev_attr.attr,
+        &iio_scan_el_incli_x.dev_attr.attr,
+        &iio_const_attr_incli_x_index.dev_attr.attr,
+        &iio_scan_el_incli_y.dev_attr.attr,
+        &iio_const_attr_incli_y_index.dev_attr.attr,
+        &iio_const_attr_incli_type.dev_attr.attr,
+        &iio_scan_el_timestamp.dev_attr.attr,
+        &iio_const_attr_timestamp_index.dev_attr.attr,
+        &iio_const_attr_timestamp_type.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adis16203_scan_el_group = {
+        .attrs = adis16203_scan_el_attrs,
+        .name = "scan_elements",
+};
+
+/**
+ * adis16203_poll_func_th() top half interrupt handler called by trigger
+ * @private_data:       iio_dev
+ **/
+static void adis16203_poll_func_th(struct iio_dev *indio_dev, s64 timestamp)
+{
+        struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
+        st->last_timestamp = timestamp;
+        schedule_work(&st->work_trigger_to_ring);
+}
+
+/**
+ * adis16203_read_ring_data() read data registers which will be placed into ring
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @rx: somewhere to pass back the value read
+ **/
+static int adis16203_read_ring_data(struct device *dev, u8 *rx)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[ADIS16203_OUTPUTS + 1];
+        int ret;
+        int i;
+
+        mutex_lock(&st->buf_lock);
+
+        spi_message_init(&msg);
+
+        memset(xfers, 0, sizeof(xfers));
+        for (i = 0; i <= ADIS16203_OUTPUTS; i++) {
+                xfers[i].bits_per_word = 8;
+                xfers[i].cs_change = 1;
+                xfers[i].len = 2;
+                xfers[i].delay_usecs = 20;
+                xfers[i].tx_buf = st->tx + 2 * i;
+                if (i < 1) /* SUPPLY_OUT: 0x02, AUX_ADC: 0x08 */
+                        st->tx[2 * i] = ADIS16203_READ_REG(ADIS16203_SUPPLY_OUT + 2 * i);
+                else
+                        st->tx[2 * i] = ADIS16203_READ_REG(ADIS16203_SUPPLY_OUT + 2 * i + 6);
+                st->tx[2 * i + 1] = 0;
+                if (i >= 1)
+                        xfers[i].rx_buf = rx + 2 * (i - 1);
+                spi_message_add_tail(&xfers[i], &msg);
+        }
+
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when burst reading");
+
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
+ * specific to be rolled into the core.
+ */
+static void adis16203_trigger_bh_to_ring(struct work_struct *work_s)
+{
+        struct adis16203_state *st
+                = container_of(work_s, struct adis16203_state,
+                               work_trigger_to_ring);
+        struct iio_ring_buffer *ring = st->indio_dev->ring;
+
+        int i = 0;
+        s16 *data;
+        size_t datasize = ring->access.get_bytes_per_datum(ring);
+
+        data = kmalloc(datasize, GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(&st->us->dev, "memory alloc failed in ring bh");
+                return;
+        }
+
+        if (ring->scan_count)
+                if (adis16203_read_ring_data(&st->indio_dev->dev, st->rx) >= 0)
+                        for (; i < ring->scan_count; i++)
+                                data[i] = be16_to_cpup(
+                                        (__be16 *)&(st->rx[i*2]));
+
+        /* Guaranteed to be aligned with 8 byte boundary */
+        if (ring->scan_timestamp)
+                *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp;
+
+        ring->access.store_to(ring,
+                              (u8 *)data,
+                              st->last_timestamp);
+
+        iio_trigger_notify_done(st->indio_dev->trig);
+        kfree(data);
+
+        return;
+}
+
+void adis16203_unconfigure_ring(struct iio_dev *indio_dev)
+{
+        kfree(indio_dev->pollfunc);
+        iio_sw_rb_free(indio_dev->ring);
+}
+
+int adis16203_configure_ring(struct iio_dev *indio_dev)
+{
+        int ret = 0;
+        struct adis16203_state *st = indio_dev->dev_data;
+        struct iio_ring_buffer *ring;
+        INIT_WORK(&st->work_trigger_to_ring, adis16203_trigger_bh_to_ring);
+
+        ring = iio_sw_rb_allocate(indio_dev);
+        if (!ring) {
+                ret = -ENOMEM;
+                return ret;
+        }
+        indio_dev->ring = ring;
+        /* Effectively select the ring buffer implementation */
+        iio_ring_sw_register_funcs(&ring->access);
+        ring->bpe = 2;
+        ring->scan_el_attrs = &adis16203_scan_el_group;
+        ring->scan_timestamp = true;
+        ring->preenable = &iio_sw_ring_preenable;
+        ring->postenable = &iio_triggered_ring_postenable;
+        ring->predisable = &iio_triggered_ring_predisable;
+        ring->owner = THIS_MODULE;
+
+        /* Set default scan mode */
+        iio_scan_mask_set(ring, iio_scan_el_in_supply.number);
+        iio_scan_mask_set(ring, iio_scan_el_temp.number);
+        iio_scan_mask_set(ring, iio_scan_el_in0.number);
+        iio_scan_mask_set(ring, iio_scan_el_incli_x.number);
+        iio_scan_mask_set(ring, iio_scan_el_incli_y.number);
+
+        ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16203_poll_func_th);
+        if (ret)
+                goto error_iio_sw_rb_free;
+
+        indio_dev->modes |= INDIO_RING_TRIGGERED;
+        return 0;
+
+error_iio_sw_rb_free:
+        iio_sw_rb_free(indio_dev->ring);
+        return ret;
+}
+
+int adis16203_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return iio_ring_buffer_register(ring, 0);
+}
+
+void adis16203_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+        iio_ring_buffer_unregister(ring);
+}
diff --git a/drivers/staging/iio/accel/adis16203_trigger.c b/drivers/staging/iio/accel/adis16203_trigger.c
new file mode 100644
index 000000000000..50be51c25dc2
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16203_trigger.c
@@ -0,0 +1,122 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "adis16203.h"
+
+/**
+ * adis16203_data_rdy_trig_poll() the event handler for the data rdy trig
+ **/
+static int adis16203_data_rdy_trig_poll(struct iio_dev *dev_info,
+                                       int index,
+                                       s64 timestamp,
+                                       int no_test)
+{
+        struct adis16203_state *st = iio_dev_get_devdata(dev_info);
+        struct iio_trigger *trig = st->trig;
+
+        iio_trigger_poll(trig, timestamp);
+
+        return IRQ_HANDLED;
+}
+
+IIO_EVENT_SH(data_rdy_trig, &adis16203_data_rdy_trig_poll);
+
+static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+
+static struct attribute *adis16203_trigger_attrs[] = {
+        &dev_attr_name.attr,
+        NULL,
+};
+
+static const struct attribute_group adis16203_trigger_attr_group = {
+        .attrs = adis16203_trigger_attrs,
+};
+
+/**
+ * adis16203_data_rdy_trigger_set_state() set datardy interrupt state
+ **/
+static int adis16203_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                                bool state)
+{
+        struct adis16203_state *st = trig->private_data;
+        struct iio_dev *indio_dev = st->indio_dev;
+        int ret = 0;
+
+        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
+        ret = adis16203_set_irq(&st->indio_dev->dev, state);
+        if (state == false) {
+                iio_remove_event_from_list(&iio_event_data_rdy_trig,
+                                           &indio_dev->interrupts[0]
+                                           ->ev_list);
+                flush_scheduled_work();
+        } else {
+                iio_add_event_to_list(&iio_event_data_rdy_trig,
+                                      &indio_dev->interrupts[0]->ev_list);
+        }
+        return ret;
+}
+
+/**
+ * adis16203_trig_try_reen() try renabling irq for data rdy trigger
+ * @trig:       the datardy trigger
+ **/
+static int adis16203_trig_try_reen(struct iio_trigger *trig)
+{
+        struct adis16203_state *st = trig->private_data;
+        enable_irq(st->us->irq);
+        return 0;
+}
+
+int adis16203_probe_trigger(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct adis16203_state *st = indio_dev->dev_data;
+
+        st->trig = iio_allocate_trigger();
+        st->trig->name = kasprintf(GFP_KERNEL,
+                                "adis16203-dev%d",
+                                indio_dev->id);
+        if (!st->trig->name) {
+                ret = -ENOMEM;
+                goto error_free_trig;
+        }
+        st->trig->dev.parent = &st->us->dev;
+        st->trig->owner = THIS_MODULE;
+        st->trig->private_data = st;
+        st->trig->set_trigger_state = &adis16203_data_rdy_trigger_set_state;
+        st->trig->try_reenable = &adis16203_trig_try_reen;
+        st->trig->control_attrs = &adis16203_trigger_attr_group;
+        ret = iio_trigger_register(st->trig);
+
+        /* select default trigger */
+        indio_dev->trig = st->trig;
+        if (ret)
+                goto error_free_trig_name;
+
+        return 0;
+
+error_free_trig_name:
+        kfree(st->trig->name);
+error_free_trig:
+        iio_free_trigger(st->trig);
+
+        return ret;
+}
+
+void adis16203_remove_trigger(struct iio_dev *indio_dev)
+{
+        struct adis16203_state *state = indio_dev->dev_data;
+
+        iio_trigger_unregister(state->trig);
+        kfree(state->trig->name);
+        iio_free_trigger(state->trig);
+}
diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h
new file mode 100644
index 000000000000..e9ed7cb048cf
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16204.h
@@ -0,0 +1,151 @@
+#ifndef SPI_ADIS16204_H_
+#define SPI_ADIS16204_H_
+
+#define ADIS16204_STARTUP_DELAY 220 /* ms */
+
+#define ADIS16204_READ_REG(a)    a
+#define ADIS16204_WRITE_REG(a) ((a) | 0x80)
+
+#define ADIS16204_FLASH_CNT      0x00 /* Flash memory write count */
+#define ADIS16204_SUPPLY_OUT     0x02 /* Output, power supply */
+#define ADIS16204_XACCL_OUT      0x04 /* Output, x-axis accelerometer */
+#define ADIS16204_YACCL_OUT      0x06 /* Output, y-axis accelerometer */
+#define ADIS16204_AUX_ADC        0x08 /* Output, auxiliary ADC input */
+#define ADIS16204_TEMP_OUT       0x0A /* Output, temperature */
+#define ADIS16204_X_PEAK_OUT     0x0C /* Twos complement */
+#define ADIS16204_Y_PEAK_OUT     0x0E /* Twos complement */
+#define ADIS16204_XACCL_NULL     0x10 /* Calibration, x-axis acceleration offset null */
+#define ADIS16204_YACCL_NULL     0x12 /* Calibration, y-axis acceleration offset null */
+#define ADIS16204_XACCL_SCALE    0x14 /* X-axis scale factor calibration register */
+#define ADIS16204_YACCL_SCALE    0x16 /* Y-axis scale factor calibration register */
+#define ADIS16204_XY_RSS_OUT     0x18 /* XY combined acceleration (RSS) */
+#define ADIS16204_XY_PEAK_OUT    0x1A /* Peak, XY combined output (RSS) */
+#define ADIS16204_CAP_BUF_1      0x1C /* Capture buffer output register 1 */
+#define ADIS16204_CAP_BUF_2      0x1E /* Capture buffer output register 2 */
+#define ADIS16204_ALM_MAG1       0x20 /* Alarm 1 amplitude threshold */
+#define ADIS16204_ALM_MAG2       0x22 /* Alarm 2 amplitude threshold */
+#define ADIS16204_ALM_CTRL       0x28 /* Alarm control */
+#define ADIS16204_CAPT_PNTR      0x2A /* Capture register address pointer */
+#define ADIS16204_AUX_DAC        0x30 /* Auxiliary DAC data */
+#define ADIS16204_GPIO_CTRL      0x32 /* General-purpose digital input/output control */
+#define ADIS16204_MSC_CTRL       0x34 /* Miscellaneous control */
+#define ADIS16204_SMPL_PRD       0x36 /* Internal sample period (rate) control */
+#define ADIS16204_AVG_CNT        0x38 /* Operation, filter configuration */
+#define ADIS16204_SLP_CNT        0x3A /* Operation, sleep mode control */
+#define ADIS16204_DIAG_STAT      0x3C /* Diagnostics, system status register */
+#define ADIS16204_GLOB_CMD       0x3E /* Operation, system command register */
+
+#define ADIS16204_OUTPUTS        5
+
+/* MSC_CTRL */
+#define ADIS16204_MSC_CTRL_PWRUP_SELF_TEST      (1 << 10) /* Self-test at power-on: 1 = disabled, 0 = enabled */
+#define ADIS16204_MSC_CTRL_SELF_TEST_EN         (1 << 8)  /* Self-test enable */
+#define ADIS16204_MSC_CTRL_DATA_RDY_EN          (1 << 2)  /* Data-ready enable: 1 = enabled, 0 = disabled */
+#define ADIS16204_MSC_CTRL_ACTIVE_HIGH          (1 << 1)  /* Data-ready polarity: 1 = active high, 0 = active low */
+#define ADIS16204_MSC_CTRL_DATA_RDY_DIO2        (1 << 0)  /* Data-ready line selection: 1 = DIO2, 0 = DIO1 */
+
+/* DIAG_STAT */
+#define ADIS16204_DIAG_STAT_ALARM2        (1<<9) /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16204_DIAG_STAT_ALARM1        (1<<8) /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
+#define ADIS16204_DIAG_STAT_SELFTEST_FAIL (1<<5) /* Self-test diagnostic error flag: 1 = error condition,
+                                                0 = normal operation */
+#define ADIS16204_DIAG_STAT_SPI_FAIL      (1<<3) /* SPI communications failure */
+#define ADIS16204_DIAG_STAT_FLASH_UPT     (1<<2) /* Flash update failure */
+#define ADIS16204_DIAG_STAT_POWER_HIGH    (1<<1) /* Power supply above 3.625 V */
+#define ADIS16204_DIAG_STAT_POWER_LOW     (1<<0) /* Power supply below 2.975 V */
+
+/* GLOB_CMD */
+#define ADIS16204_GLOB_CMD_SW_RESET     (1<<7)
+#define ADIS16204_GLOB_CMD_CLEAR_STAT   (1<<4)
+#define ADIS16204_GLOB_CMD_FACTORY_CAL  (1<<1)
+
+#define ADIS16204_MAX_TX 24
+#define ADIS16204_MAX_RX 24
+
+#define ADIS16204_ERROR_ACTIVE          (1<<14)
+
+/**
+ * struct adis16204_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16204_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+int adis16204_set_irq(struct device *dev, bool enable);
+
+#ifdef CONFIG_IIO_RING_BUFFER
+enum adis16204_scan {
+        ADIS16204_SCAN_SUPPLY,
+        ADIS16204_SCAN_ACC_X,
+        ADIS16204_SCAN_ACC_Y,
+        ADIS16204_SCAN_AUX_ADC,
+        ADIS16204_SCAN_TEMP,
+};
+
+void adis16204_remove_trigger(struct iio_dev *indio_dev);
+int adis16204_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16204_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+int adis16204_configure_ring(struct iio_dev *indio_dev);
+void adis16204_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16204_initialize_ring(struct iio_ring_buffer *ring);
+void adis16204_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16204_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16204_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16204_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16204_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16204_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16204_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16204_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16204_H_ */
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
new file mode 100644
index 000000000000..cc15e40726fc
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -0,0 +1,613 @@
+/*
+ * ADIS16204 Programmable High-g Digital Impact Sensor and Recorder
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "accel.h"
+#include "../gyro/gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16204.h"
+
+#define DRIVER_NAME             "adis16204"
+
+static int adis16204_check_status(struct device *dev);
+
+/**
+ * adis16204_spi_write_reg_8() - write single byte to a register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the register to be written
+ * @val: the value to write
+ **/
+static int adis16204_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16204_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16204_spi_write_reg_16() - write 2 bytes to a pair of registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: value to be written
+ **/
+static int adis16204_spi_write_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .tx_buf = st->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16204_WRITE_REG(lower_reg_address);
+        st->tx[1] = value & 0xFF;
+        st->tx[2] = ADIS16204_WRITE_REG(lower_reg_address + 1);
+        st->tx[3] = (value >> 8) & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16204_spi_read_reg_16() - read 2 bytes from a 16-bit register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: somewhere to pass back the value read
+ **/
+static int adis16204_spi_read_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                }, {
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                        .delay_usecs = 20,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16204_READ_REG(lower_reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                lower_reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[0] << 8) | st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t adis16204_read_12bit_unsigned(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = adis16204_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        if (val & ADIS16204_ERROR_ACTIVE)
+                adis16204_check_status(dev);
+
+        return sprintf(buf, "%u\n", val & 0x0FFF);
+}
+
+static ssize_t adis16204_read_temp(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        ssize_t ret;
+        u16 val;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16204_spi_read_reg_16(dev, ADIS16204_TEMP_OUT, (u16 *)&val);
+        if (ret)
+                goto error_ret;
+
+        if (val & ADIS16204_ERROR_ACTIVE)
+                adis16204_check_status(dev);
+
+        val &= 0xFFF;
+        ret = sprintf(buf, "%d\n", val);
+
+error_ret:
+        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
+
+static ssize_t adis16204_read_12bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16204_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16204_ERROR_ACTIVE)
+                        adis16204_check_status(dev);
+
+                val = ((s16)(val << 4) >> 4);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16204_read_14bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        s16 val = 0;
+        ssize_t ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = adis16204_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (!ret) {
+                if (val & ADIS16204_ERROR_ACTIVE)
+                        adis16204_check_status(dev);
+
+                val = ((s16)(val << 2) >> 2);
+                ret = sprintf(buf, "%d\n", val);
+        }
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16204_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16204_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int adis16204_reset(struct device *dev)
+{
+        int ret;
+        ret = adis16204_spi_write_reg_8(dev,
+                        ADIS16204_GLOB_CMD,
+                        ADIS16204_GLOB_CMD_SW_RESET);
+        if (ret)
+                dev_err(dev, "problem resetting device");
+
+        return ret;
+}
+
+static ssize_t adis16204_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -EINVAL;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return adis16204_reset(dev);
+        }
+        return -EINVAL;
+}
+
+int adis16204_set_irq(struct device *dev, bool enable)
+{
+        int ret = 0;
+        u16 msc;
+
+        ret = adis16204_spi_read_reg_16(dev, ADIS16204_MSC_CTRL, &msc);
+        if (ret)
+                goto error_ret;
+
+        msc |= ADIS16204_MSC_CTRL_ACTIVE_HIGH;
+        msc &= ~ADIS16204_MSC_CTRL_DATA_RDY_DIO2;
+        if (enable)
+                msc |= ADIS16204_MSC_CTRL_DATA_RDY_EN;
+        else
+                msc &= ~ADIS16204_MSC_CTRL_DATA_RDY_EN;
+
+        ret = adis16204_spi_write_reg_16(dev, ADIS16204_MSC_CTRL, msc);
+
+error_ret:
+        return ret;
+}
+
+static int adis16204_check_status(struct device *dev)
+{
+        u16 status;
+        int ret;
+
+        ret = adis16204_spi_read_reg_16(dev, ADIS16204_DIAG_STAT, &status);
+        if (ret < 0) {
+                dev_err(dev, "Reading status failed\n");
+                goto error_ret;
+        }
+        ret = status & 0x1F;
+
+        if (status & ADIS16204_DIAG_STAT_SELFTEST_FAIL)
+                dev_err(dev, "Self test failure\n");
+        if (status & ADIS16204_DIAG_STAT_SPI_FAIL)
+                dev_err(dev, "SPI failure\n");
+        if (status & ADIS16204_DIAG_STAT_FLASH_UPT)
+                dev_err(dev, "Flash update failed\n");
+        if (status & ADIS16204_DIAG_STAT_POWER_HIGH)
+                dev_err(dev, "Power supply above 3.625V\n");
+        if (status & ADIS16204_DIAG_STAT_POWER_LOW)
+                dev_err(dev, "Power supply below 2.975V\n");
+
+error_ret:
+        return ret;
+}
+
+static int adis16204_self_test(struct device *dev)
+{
+        int ret;
+        ret = adis16204_spi_write_reg_16(dev,
+                        ADIS16204_MSC_CTRL,
+                        ADIS16204_MSC_CTRL_SELF_TEST_EN);
+        if (ret) {
+                dev_err(dev, "problem starting self test");
+                goto err_ret;
+        }
+
+        adis16204_check_status(dev);
+
+err_ret:
+        return ret;
+}
+
+static int adis16204_initial_setup(struct adis16204_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* Disable IRQ */
+        ret = adis16204_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        /* Do self test */
+        ret = adis16204_self_test(dev);
+        if (ret) {
+                dev_err(dev, "self test failure");
+                goto err_ret;
+        }
+
+        /* Read status register to check the result */
+        ret = adis16204_check_status(dev);
+        if (ret) {
+                adis16204_reset(dev);
+                dev_err(dev, "device not playing ball -> reset");
+                msleep(ADIS16204_STARTUP_DELAY);
+                ret = adis16204_check_status(dev);
+                if (ret) {
+                        dev_err(dev, "giving up");
+                        goto err_ret;
+                }
+        }
+
+        printk(KERN_INFO DRIVER_NAME ": at CS%d (irq %d)\n",
+                        st->us->chip_select, st->us->irq);
+
+err_ret:
+        return ret;
+}
+
+static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16204_read_12bit_unsigned,
+                ADIS16204_SUPPLY_OUT);
+static IIO_CONST_ATTR(in0_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(1, adis16204_read_12bit_unsigned,
+                ADIS16204_AUX_ADC);
+static IIO_CONST_ATTR(in1_scale, "0.00061");
+
+static IIO_DEV_ATTR_ACCEL_X(adis16204_read_14bit_signed,
+                ADIS16204_XACCL_OUT);
+static IIO_DEV_ATTR_ACCEL_Y(adis16204_read_14bit_signed,
+                ADIS16204_YACCL_OUT);
+static IIO_DEV_ATTR_ACCEL_XY(adis16204_read_14bit_signed,
+                ADIS16204_XY_RSS_OUT);
+static IIO_DEV_ATTR_ACCEL_XPEAK(adis16204_read_14bit_signed,
+                ADIS16204_X_PEAK_OUT);
+static IIO_DEV_ATTR_ACCEL_YPEAK(adis16204_read_14bit_signed,
+                ADIS16204_Y_PEAK_OUT);
+static IIO_DEV_ATTR_ACCEL_XYPEAK(adis16204_read_14bit_signed,
+                ADIS16204_XY_PEAK_OUT);
+static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO,
+                adis16204_read_12bit_signed,
+                adis16204_write_16bit,
+                ADIS16204_XACCL_NULL);
+static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO,
+                adis16204_read_12bit_signed,
+                adis16204_write_16bit,
+                ADIS16204_YACCL_NULL);
+static IIO_CONST_ATTR(accel_x_scale, "0.017125");
+static IIO_CONST_ATTR(accel_y_scale, "0.008407");
+static IIO_CONST_ATTR(accel_xy_scale, "0.017125");
+
+static IIO_DEV_ATTR_TEMP_RAW(adis16204_read_temp);
+static IIO_CONST_ATTR(temp_offset, "25");
+static IIO_CONST_ATTR(temp_scale, "-0.47");
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16204_write_reset, 0);
+
+static IIO_CONST_ATTR(name, "adis16204");
+
+static struct attribute *adis16204_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16204_event_attribute_group = {
+        .attrs = adis16204_event_attributes,
+};
+
+static struct attribute *adis16204_attributes[] = {
+        &iio_dev_attr_in0_supply_raw.dev_attr.attr,
+        &iio_const_attr_in0_supply_scale.dev_attr.attr,
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_in1_raw.dev_attr.attr,
+        &iio_const_attr_in1_scale.dev_attr.attr,
+        &iio_dev_attr_accel_x_raw.dev_attr.attr,
+        &iio_dev_attr_accel_y_raw.dev_attr.attr,
+        &iio_dev_attr_accel_xy.dev_attr.attr,
+        &iio_dev_attr_accel_xpeak.dev_attr.attr,
+        &iio_dev_attr_accel_ypeak.dev_attr.attr,
+        &iio_dev_attr_accel_xypeak.dev_attr.attr,
+        &iio_dev_attr_accel_x_offset.dev_attr.attr,
+        &iio_dev_attr_accel_y_offset.dev_attr.attr,
+        &iio_const_attr_accel_x_scale.dev_attr.attr,
+        &iio_const_attr_accel_y_scale.dev_attr.attr,
+        &iio_const_attr_accel_xy_scale.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16204_attribute_group = {
+        .attrs = adis16204_attributes,
+};
+
+static int __devinit adis16204_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16204_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16204_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16204_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16204_event_attribute_group;
+        st->indio_dev->attrs = &adis16204_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16204_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16204_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16204");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16204_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = adis16204_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        adis16204_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (spi->irq)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16204_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16204_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int adis16204_remove(struct spi_device *spi)
+{
+        struct adis16204_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16204_remove_trigger(indio_dev);
+        if (spi->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16204_uninitialize_ring(indio_dev->ring);
+        iio_device_unregister(indio_dev);
+        adis16204_unconfigure_ring(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver adis16204_driver = {
+        .driver = {
+                .name = "adis16204",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16204_probe,
+        .remove = __devexit_p(adis16204_remove),
+};
+
+static __init int adis16204_init(void)
+{
+        return spi_register_driver(&adis16204_driver);
+}
+module_init(adis16204_init);
+
+static __exit void adis16204_exit(void)
+{
+        spi_unregister_driver(&adis16204_driver);
+}
+module_exit(adis16204_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
new file mode 100644
index 000000000000..420b160fe3ab
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -0,0 +1,206 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../ring_sw.h"
+#include "accel.h"
+#include "../trigger.h"
+#include "adis16204.h"
+
+static IIO_SCAN_EL_C(in_supply, ADIS16204_SCAN_SUPPLY, ADIS16204_SUPPLY_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 12, 16);
+static IIO_SCAN_EL_C(accel_x, ADIS16204_SCAN_ACC_X, ADIS16204_XACCL_OUT, NULL);
+static IIO_SCAN_EL_C(accel_y, ADIS16204_SCAN_ACC_Y, ADIS16204_YACCL_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16);
+static IIO_SCAN_EL_C(in0, ADIS16204_SCAN_AUX_ADC, ADIS16204_AUX_ADC, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);
+static IIO_SCAN_EL_C(temp, ADIS16204_SCAN_TEMP, ADIS16204_TEMP_OUT, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16);
+static IIO_SCAN_EL_TIMESTAMP(5);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
+
+static struct attribute *adis16204_scan_el_attrs[] = {
+        &iio_scan_el_in_supply.dev_attr.attr,
+        &iio_const_attr_in_supply_index.dev_attr.attr,
+        &iio_const_attr_in_supply_type.dev_attr.attr,
+        &iio_scan_el_accel_x.dev_attr.attr,
+        &iio_const_attr_accel_x_index.dev_attr.attr,
+        &iio_scan_el_accel_y.dev_attr.attr,
+        &iio_const_attr_accel_y_index.dev_attr.attr,
+        &iio_const_attr_accel_type.dev_attr.attr,
+        &iio_scan_el_in0.dev_attr.attr,
+        &iio_const_attr_in0_index.dev_attr.attr,
+        &iio_const_attr_in0_type.dev_attr.attr,
+        &iio_scan_el_temp.dev_attr.attr,
+        &iio_const_attr_temp_index.dev_attr.attr,
+        &iio_const_attr_temp_type.dev_attr.attr,
+        &iio_scan_el_timestamp.dev_attr.attr,
+        &iio_const_attr_timestamp_index.dev_attr.attr,
+        &iio_const_attr_timestamp_type.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adis16204_scan_el_group = {
+        .attrs = adis16204_scan_el_attrs,
+        .name = "scan_elements",
+};
+
+/**
+ * adis16204_poll_func_th() top half interrupt handler called by trigger
+ * @private_data:       iio_dev
+ **/
+static void adis16204_poll_func_th(struct iio_dev *indio_dev, s64 timestamp)
+{
+        struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
+        st->last_timestamp = timestamp;
+        schedule_work(&st->work_trigger_to_ring);
+}
+
+/**
+ * adis16204_read_ring_data() read data registers which will be placed into ring
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @rx: somewhere to pass back the value read
+ **/
+static int adis16204_read_ring_data(struct device *dev, u8 *rx)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[ADIS16204_OUTPUTS + 1];
+        int ret;
+        int i;
+
+        mutex_lock(&st->buf_lock);
+
+        spi_message_init(&msg);
+
+        memset(xfers, 0, sizeof(xfers));
+        for (i = 0; i <= ADIS16204_OUTPUTS; i++) {
+                xfers[i].bits_per_word = 8;
+                xfers[i].cs_change = 1;
+                xfers[i].len = 2;
+                xfers[i].delay_usecs = 20;
+                xfers[i].tx_buf = st->tx + 2 * i;
+                st->tx[2 * i] = ADIS16204_READ_REG(ADIS16204_SUPPLY_OUT + 2 * i);
+                st->tx[2 * i + 1] = 0;
+                if (i >= 1)
+                        xfers[i].rx_buf = rx + 2 * (i - 1);
+                spi_message_add_tail(&xfers[i], &msg);
+        }
+
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when burst reading");
+
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
+ * specific to be rolled into the core.
+ */
+static void adis16204_trigger_bh_to_ring(struct work_struct *work_s)
+{
+        struct adis16204_state *st
+                = container_of(work_s, struct adis16204_state,
+                               work_trigger_to_ring);
+        struct iio_ring_buffer *ring = st->indio_dev->ring;
+
+        int i = 0;
+        s16 *data;
+        size_t datasize = ring->access.get_bytes_per_datum(ring);
+
+        data = kmalloc(datasize, GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(&st->us->dev, "memory alloc failed in ring bh");
+                return;
+        }
+
+        if (ring->scan_count)
+                if (adis16204_read_ring_data(&st->indio_dev->dev, st->rx) >= 0)
+                        for (; i < ring->scan_count; i++)
+                                data[i] = be16_to_cpup(
+                                        (__be16 *)&(st->rx[i*2]));
+
+        /* Guaranteed to be aligned with 8 byte boundary */
+        if (ring->scan_timestamp)
+                *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp;
+
+        ring->access.store_to(ring,
+                              (u8 *)data,
+                              st->last_timestamp);
+
+        iio_trigger_notify_done(st->indio_dev->trig);
+        kfree(data);
+
+        return;
+}
+
+void adis16204_unconfigure_ring(struct iio_dev *indio_dev)
+{
+        kfree(indio_dev->pollfunc);
+        iio_sw_rb_free(indio_dev->ring);
+}
+
+int adis16204_configure_ring(struct iio_dev *indio_dev)
+{
+        int ret = 0;
+        struct adis16204_state *st = indio_dev->dev_data;
+        struct iio_ring_buffer *ring;
+        INIT_WORK(&st->work_trigger_to_ring, adis16204_trigger_bh_to_ring);
+
+        ring = iio_sw_rb_allocate(indio_dev);
+        if (!ring) {
+                ret = -ENOMEM;
+                return ret;
+        }
+        indio_dev->ring = ring;
+        /* Effectively select the ring buffer implementation */
+        iio_ring_sw_register_funcs(&ring->access);
+        ring->bpe = 2;
+        ring->scan_el_attrs = &adis16204_scan_el_group;
+        ring->scan_timestamp = true;
+        ring->preenable = &iio_sw_ring_preenable;
+        ring->postenable = &iio_triggered_ring_postenable;
+        ring->predisable = &iio_triggered_ring_predisable;
+        ring->owner = THIS_MODULE;
+
+        /* Set default scan mode */
+        iio_scan_mask_set(ring, iio_scan_el_in_supply.number);
+        iio_scan_mask_set(ring, iio_scan_el_accel_x.number);
+        iio_scan_mask_set(ring, iio_scan_el_accel_y.number);
+        iio_scan_mask_set(ring, iio_scan_el_temp.number);
+        iio_scan_mask_set(ring, iio_scan_el_in0.number);
+
+        ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16204_poll_func_th);
+        if (ret)
+                goto error_iio_sw_rb_free;
+
+        indio_dev->modes |= INDIO_RING_TRIGGERED;
+        return 0;
+
+error_iio_sw_rb_free:
+        iio_sw_rb_free(indio_dev->ring);
+        return ret;
+}
+
+int adis16204_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return iio_ring_buffer_register(ring, 0);
+}
+
+void adis16204_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+        iio_ring_buffer_unregister(ring);
+}
diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c
new file mode 100644
index 000000000000..8e9db90e51eb
--- /dev/null
+++ b/drivers/staging/iio/accel/adis16204_trigger.c
@@ -0,0 +1,122 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "adis16204.h"
+
+/**
+ * adis16204_data_rdy_trig_poll() the event handler for the data rdy trig
+ **/
+static int adis16204_data_rdy_trig_poll(struct iio_dev *dev_info,
+                                       int index,
+                                       s64 timestamp,
+                                       int no_test)
+{
+        struct adis16204_state *st = iio_dev_get_devdata(dev_info);
+        struct iio_trigger *trig = st->trig;
+
+        iio_trigger_poll(trig, timestamp);
+
+        return IRQ_HANDLED;
+}
+
+IIO_EVENT_SH(data_rdy_trig, &adis16204_data_rdy_trig_poll);
+
+static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+
+static struct attribute *adis16204_trigger_attrs[] = {
+        &dev_attr_name.attr,
+        NULL,
+};
+
+static const struct attribute_group adis16204_trigger_attr_group = {
+        .attrs = adis16204_trigger_attrs,
+};
+
+/**
+ * adis16204_data_rdy_trigger_set_state() set datardy interrupt state
+ **/
+static int adis16204_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                                bool state)
+{
+        struct adis16204_state *st = trig->private_data;
+        struct iio_dev *indio_dev = st->indio_dev;
+        int ret = 0;
+
+        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
+        ret = adis16204_set_irq(&st->indio_dev->dev, state);
+        if (state == false) {
+                iio_remove_event_from_list(&iio_event_data_rdy_trig,
+                                           &indio_dev->interrupts[0]
+                                           ->ev_list);
+                flush_scheduled_work();
+        } else {
+                iio_add_event_to_list(&iio_event_data_rdy_trig,
+                                      &indio_dev->interrupts[0]->ev_list);
+        }
+        return ret;
+}
+
+/**
+ * adis16204_trig_try_reen() try renabling irq for data rdy trigger
+ * @trig:       the datardy trigger
+ **/
+static int adis16204_trig_try_reen(struct iio_trigger *trig)
+{
+        struct adis16204_state *st = trig->private_data;
+        enable_irq(st->us->irq);
+        return 0;
+}
+
+int adis16204_probe_trigger(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct adis16204_state *st = indio_dev->dev_data;
+
+        st->trig = iio_allocate_trigger();
+        st->trig->name = kasprintf(GFP_KERNEL,
+                                "adis16204-dev%d",
+                                indio_dev->id);
+        if (!st->trig->name) {
+                ret = -ENOMEM;
+                goto error_free_trig;
+        }
+        st->trig->dev.parent = &st->us->dev;
+        st->trig->owner = THIS_MODULE;
+        st->trig->private_data = st;
+        st->trig->set_trigger_state = &adis16204_data_rdy_trigger_set_state;
+        st->trig->try_reenable = &adis16204_trig_try_reen;
+        st->trig->control_attrs = &adis16204_trigger_attr_group;
+        ret = iio_trigger_register(st->trig);
+
+        /* select default trigger */
+        indio_dev->trig = st->trig;
+        if (ret)
+                goto error_free_trig_name;
+
+        return 0;
+
+error_free_trig_name:
+        kfree(st->trig->name);
+error_free_trig:
+        iio_free_trigger(st->trig);
+
+        return ret;
+}
+
+void adis16204_remove_trigger(struct iio_dev *indio_dev)
+{
+        struct adis16204_state *state = indio_dev->dev_data;
+
+        iio_trigger_unregister(state->trig);
+        kfree(state->trig->name);
+        iio_free_trigger(state->trig);
+}
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 033135c6f226..8eba0af98ed5 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -105,7 +105,7 @@ static int adis16209_read_ring_data(struct device *dev, u8 *rx)
                 xfers[i].bits_per_word = 8;
                 xfers[i].cs_change = 1;
                 xfers[i].len = 2;
-                xfers[i].delay_usecs = 20;
+                xfers[i].delay_usecs = 30;
                 xfers[i].tx_buf = st->tx + 2 * i;
                 st->tx[2 * i]
                         = ADIS16209_READ_REG(ADIS16209_SUPPLY_OUT + 2 * i);
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 330d5d6dbba4..1fd088a11076 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -517,7 +517,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
 
         ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th);
         if (ret)
-                goto error_iio_sw_rb_free;;
+                goto error_iio_sw_rb_free;
         indio_dev->modes |= INDIO_RING_TRIGGERED;
         return 0;
 
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index acb67677e563..86869cd233ae 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -27,6 +27,41 @@ config MAX1363_RING_BUFFER
           Say yes here to include ring buffer support in the MAX1363
           ADC driver.
 
+config AD7150
+        tristate "Analog Devices ad7150/1/6 capacitive sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices capacitive sensors.
+          (ad7150, ad7151, ad7156) Provides direct access via sysfs.
+
+config AD7152
+        tristate "Analog Devices ad7152/3 capacitive sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices capacitive sensors.
+          (ad7152, ad7153) Provides direct access via sysfs.
+
+config AD7291
+        tristate "Analog Devices AD7291 temperature sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices AD7291
+          temperature sensors.
+
+config AD7298
+        tristate "Analog Devices AD7298 temperature sensor and ADC driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD7298
+          temperature sensors and ADC.
+
+config AD7314
+        tristate "Analog Devices AD7314 temperature sensor driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD7314
+          temperature sensors.
+
 config AD799X
         tristate "Analog Devices AD799x ADC driver"
         depends on I2C
@@ -50,9 +85,9 @@ config AD799X_RING_BUFFER
 config AD7476
         tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
         depends on SPI
-        select IIO_RING_BUFFER  
+        select IIO_RING_BUFFER
         select IIO_SW_RING
-        select IIO_TRIGGER      
+        select IIO_TRIGGER
         help
           Say yes here to build support for Analog Devices
           AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
@@ -61,3 +96,55 @@ config AD7476
 
           To compile this driver as a module, choose M here: the
           module will be called ad7476.
+
+config AD7887
+        tristate "Analog Devices AD7887 ADC driver"
+        depends on SPI
+        select IIO_RING_BUFFER
+        select IIO_SW_RING
+        select IIO_TRIGGER
+        help
+          Say yes here to build support for Analog Devices
+          AD7887 SPI analog to digital convertor (ADC).
+          If unsure, say N (but it's safe to say "Y").
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7887.
+
+config AD7745
+        tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices capacitive sensors.
+          (AD7745, AD7746, AD7747) Provides direct access via sysfs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7745.
+
+config AD7816
+        tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD7816/7/8
+          temperature sensors and ADC.
+
+config ADT75
+        tristate "Analog Devices ADT75 temperature sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices ADT75
+          temperature sensors.
+
+config ADT7310
+        tristate "Analog Devices ADT7310 temperature sensor driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADT7310
+          temperature sensors.
+
+config ADT7410
+        tristate "Analog Devices ADT7410 temperature sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for Analog Devices ADT7410
+          temperature sensors.
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index b62c319bcedd..6f231a2cb777 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -14,3 +14,18 @@ obj-$(CONFIG_AD799X) += ad799x.o
 ad7476-y := ad7476_core.o
 ad7476-$(CONFIG_IIO_RING_BUFFER) += ad7476_ring.o
 obj-$(CONFIG_AD7476) += ad7476.o
+
+ad7887-y := ad7887_core.o
+ad7887-$(CONFIG_IIO_RING_BUFFER) += ad7887_ring.o
+obj-$(CONFIG_AD7887) += ad7887.o
+
+obj-$(CONFIG_AD7150) += ad7150.o
+obj-$(CONFIG_AD7152) += ad7152.o
+obj-$(CONFIG_AD7291) += ad7291.o
+obj-$(CONFIG_AD7298) += ad7298.o
+obj-$(CONFIG_AD7314) += ad7314.o
+obj-$(CONFIG_AD7745) += ad7745.o
+obj-$(CONFIG_AD7816) += ad7816.o
+obj-$(CONFIG_ADT75) += adt75.o
+obj-$(CONFIG_ADT7310) += adt7310.o
+obj-$(CONFIG_ADT7410) += adt7410.o
diff --git a/drivers/staging/iio/adc/ad7150.c b/drivers/staging/iio/adc/ad7150.c
new file mode 100644
index 000000000000..8555766109d8
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7150.c
@@ -0,0 +1,877 @@
+/*
+ * AD7150 capacitive sensor driver supporting AD7150/1/6
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7150 registers definition
+ */
+
+#define AD7150_STATUS              0
+#define AD7150_STATUS_OUT1         (1 << 3)
+#define AD7150_STATUS_OUT2         (1 << 5)
+#define AD7150_CH1_DATA_HIGH       1
+#define AD7150_CH1_DATA_LOW        2
+#define AD7150_CH2_DATA_HIGH       3
+#define AD7150_CH2_DATA_LOW        4
+#define AD7150_CH1_AVG_HIGH        5
+#define AD7150_CH1_AVG_LOW         6
+#define AD7150_CH2_AVG_HIGH        7
+#define AD7150_CH2_AVG_LOW         8
+#define AD7150_CH1_SENSITIVITY     9
+#define AD7150_CH1_THR_HOLD_H      9
+#define AD7150_CH1_TIMEOUT         10
+#define AD7150_CH1_THR_HOLD_L      10
+#define AD7150_CH1_SETUP           11
+#define AD7150_CH2_SENSITIVITY     12
+#define AD7150_CH2_THR_HOLD_H      12
+#define AD7150_CH2_TIMEOUT         13
+#define AD7150_CH2_THR_HOLD_L      13
+#define AD7150_CH2_SETUP           14
+#define AD7150_CFG                 15
+#define AD7150_CFG_FIX             (1 << 7)
+#define AD7150_PD_TIMER            16
+#define AD7150_CH1_CAPDAC          17
+#define AD7150_CH2_CAPDAC          18
+#define AD7150_SN3                 19
+#define AD7150_SN2                 20
+#define AD7150_SN1                 21
+#define AD7150_SN0                 22
+#define AD7150_ID                  23
+
+#define AD7150_MAX_CONV_MODE       4
+
+/*
+ * struct ad7150_chip_info - chip specifc information
+ */
+
+struct ad7150_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        bool inter;
+        s64 last_timestamp;
+        u16 ch1_threshold;     /* Ch1 Threshold (in fixed threshold mode) */
+        u8  ch1_sensitivity;   /* Ch1 Sensitivity (in adaptive threshold mode) */
+        u8  ch1_timeout;       /* Ch1 Timeout (in adaptive threshold mode) */
+        u8  ch1_setup;
+        u16 ch2_threshold;     /* Ch2 Threshold (in fixed threshold mode) */
+        u8  ch2_sensitivity;   /* Ch1 Sensitivity (in adaptive threshold mode) */
+        u8  ch2_timeout;       /* Ch1 Timeout (in adaptive threshold mode) */
+        u8  ch2_setup;
+        u8  powerdown_timer;
+        char threshold_mode[10]; /* adaptive/fixed threshold mode */
+        int old_state;
+        char *conversion_mode;
+};
+
+struct ad7150_conversion_mode {
+        char *name;
+        u8 reg_cfg;
+};
+
+struct ad7150_conversion_mode ad7150_conv_mode_table[AD7150_MAX_CONV_MODE] = {
+        { "idle", 0 },
+        { "continuous-conversion", 1 },
+        { "single-conversion", 2 },
+        { "power-down", 3 },
+};
+
+/*
+ * ad7150 register access by I2C
+ */
+
+static int ad7150_i2c_read(struct ad7150_chip_info *chip, u8 reg, u8 *data, int len)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_master_send(client, &reg, 1);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C write error\n");
+                return ret;
+        }
+
+        ret = i2c_master_recv(client, data, len);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int ad7150_i2c_write(struct ad7150_chip_info *chip, u8 reg, u8 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        u8 tx[2] = {
+                reg,
+                data,
+        };
+
+        ret = i2c_master_send(client, tx, 2);
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+/*
+ * sysfs nodes
+ */
+
+#define IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(_show)                              \
+        IIO_DEVICE_ATTR(available_conversion_modes, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CONVERSION_MODE(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(conversion_mode, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_AVAIL_THRESHOLD_MODES(_show)                               \
+        IIO_DEVICE_ATTR(available_threshold_modes, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_THRESHOLD_MODE(_mode, _show, _store)               \
+        IIO_DEVICE_ATTR(threshold_mode, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_THRESHOLD(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch1_threshold, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_THRESHOLD(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch2_threshold, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_SENSITIVITY(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch1_sensitivity, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_SENSITIVITY(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch2_sensitivity, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_TIMEOUT(_mode, _show, _store)          \
+        IIO_DEVICE_ATTR(ch1_timeout, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_TIMEOUT(_mode, _show, _store)          \
+        IIO_DEVICE_ATTR(ch2_timeout, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_VALUE(_show)           \
+        IIO_DEVICE_ATTR(ch1_value, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CH2_VALUE(_show)           \
+        IIO_DEVICE_ATTR(ch2_value, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CH1_SETUP(_mode, _show, _store)            \
+        IIO_DEVICE_ATTR(ch1_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_SETUP(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch2_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_POWERDOWN_TIMER(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(powerdown_timer, _mode, _show, _store, 0)
+
+static ssize_t ad7150_show_conversion_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int i;
+        int len = 0;
+
+        for (i = 0; i < AD7150_MAX_CONV_MODE; i++)
+                len += sprintf(buf + len, "%s\n", ad7150_conv_mode_table[i].name);
+
+        return len;
+}
+
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7150_show_conversion_modes);
+
+static ssize_t ad7150_show_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%s\n", chip->conversion_mode);
+}
+
+static ssize_t ad7150_store_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        u8 cfg;
+        int i;
+
+        ad7150_i2c_read(chip, AD7150_CFG, &cfg, 1);
+
+        for (i = 0; i < AD7150_MAX_CONV_MODE; i++) {
+                if (strncmp(buf, ad7150_conv_mode_table[i].name,
+                                strlen(ad7150_conv_mode_table[i].name) - 1) == 0) {
+                        chip->conversion_mode = ad7150_conv_mode_table[i].name;
+                        cfg |= 0x18 | ad7150_conv_mode_table[i].reg_cfg;
+                        ad7150_i2c_write(chip, AD7150_CFG, cfg);
+                        return len;
+                }
+        }
+
+        dev_err(dev, "not supported conversion mode\n");
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+                ad7150_show_conversion_mode,
+                ad7150_store_conversion_mode);
+
+static ssize_t ad7150_show_threshold_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "adaptive\nfixed\n");
+}
+
+static IIO_DEV_ATTR_AVAIL_THRESHOLD_MODES(ad7150_show_threshold_modes);
+
+static ssize_t ad7150_show_ch1_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        u8 data[2];
+
+        ad7150_i2c_read(chip, AD7150_CH1_DATA_HIGH, data, 2);
+        return sprintf(buf, "%d\n", ((int) data[0] << 8) | data[1]);
+}
+
+static IIO_DEV_ATTR_CH1_VALUE(ad7150_show_ch1_value);
+
+static ssize_t ad7150_show_ch2_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        u8 data[2];
+
+        ad7150_i2c_read(chip, AD7150_CH2_DATA_HIGH, data, 2);
+        return sprintf(buf, "%d\n", ((int) data[0] << 8) | data[1]);
+}
+
+static IIO_DEV_ATTR_CH2_VALUE(ad7150_show_ch2_value);
+
+static ssize_t ad7150_show_threshold_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%s\n", chip->threshold_mode);
+}
+
+static ssize_t ad7150_store_threshold_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        u8 cfg;
+
+        ad7150_i2c_read(chip, AD7150_CFG, &cfg, 1);
+
+        if (strncmp(buf, "fixed", 5) == 0) {
+                strcpy(chip->threshold_mode, "fixed");
+                cfg |= AD7150_CFG_FIX;
+                ad7150_i2c_write(chip, AD7150_CFG, cfg);
+
+                return len;
+        } else if (strncmp(buf, "adaptive", 8) == 0) {
+                strcpy(chip->threshold_mode, "adaptive");
+                cfg &= ~AD7150_CFG_FIX;
+                ad7150_i2c_write(chip, AD7150_CFG, cfg);
+
+                return len;
+        }
+
+        dev_err(dev, "not supported threshold mode\n");
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_THRESHOLD_MODE(S_IRUGO | S_IWUSR,
+                ad7150_show_threshold_mode,
+                ad7150_store_threshold_mode);
+
+static ssize_t ad7150_show_ch1_threshold(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch1_threshold);
+}
+
+static ssize_t ad7150_store_ch1_threshold(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7150_i2c_write(chip, AD7150_CH1_THR_HOLD_H, data >> 8);
+                ad7150_i2c_write(chip, AD7150_CH1_THR_HOLD_L, data);
+                chip->ch1_threshold = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_THRESHOLD(S_IRUGO | S_IWUSR,
+                ad7150_show_ch1_threshold,
+                ad7150_store_ch1_threshold);
+
+static ssize_t ad7150_show_ch2_threshold(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch2_threshold);
+}
+
+static ssize_t ad7150_store_ch2_threshold(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7150_i2c_write(chip, AD7150_CH2_THR_HOLD_H, data >> 8);
+                ad7150_i2c_write(chip, AD7150_CH2_THR_HOLD_L, data);
+                chip->ch2_threshold = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_THRESHOLD(S_IRUGO | S_IWUSR,
+                ad7150_show_ch2_threshold,
+                ad7150_store_ch2_threshold);
+
+static ssize_t ad7150_show_ch1_sensitivity(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch1_sensitivity);
+}
+
+static ssize_t ad7150_store_ch1_sensitivity(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH1_SENSITIVITY, data);
+                chip->ch1_sensitivity = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_SENSITIVITY(S_IRUGO | S_IWUSR,
+                ad7150_show_ch1_sensitivity,
+                ad7150_store_ch1_sensitivity);
+
+static ssize_t ad7150_show_ch2_sensitivity(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch2_sensitivity);
+}
+
+static ssize_t ad7150_store_ch2_sensitivity(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH2_SENSITIVITY, data);
+                chip->ch2_sensitivity = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_SENSITIVITY(S_IRUGO | S_IWUSR,
+                ad7150_show_ch2_sensitivity,
+                ad7150_store_ch2_sensitivity);
+
+static ssize_t ad7150_show_ch1_timeout(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch1_timeout);
+}
+
+static ssize_t ad7150_store_ch1_timeout(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH1_TIMEOUT, data);
+                chip->ch1_timeout = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_TIMEOUT(S_IRUGO | S_IWUSR,
+                ad7150_show_ch1_timeout,
+                ad7150_store_ch1_timeout);
+
+static ssize_t ad7150_show_ch2_timeout(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch2_timeout);
+}
+
+static ssize_t ad7150_store_ch2_timeout(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH2_TIMEOUT, data);
+                chip->ch2_timeout = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_TIMEOUT(S_IRUGO | S_IWUSR,
+                ad7150_show_ch2_timeout,
+                ad7150_store_ch2_timeout);
+
+static ssize_t ad7150_show_ch1_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->ch1_setup);
+}
+
+static ssize_t ad7150_store_ch1_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH1_SETUP, data);
+                chip->ch1_setup = data;
+                return len;
+        }
+
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
+                ad7150_show_ch1_setup,
+                ad7150_store_ch1_setup);
+
+static ssize_t ad7150_show_ch2_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->ch2_setup);
+}
+
+static ssize_t ad7150_store_ch2_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7150_i2c_write(chip, AD7150_CH2_SETUP, data);
+                chip->ch2_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
+                ad7150_show_ch2_setup,
+                ad7150_store_ch2_setup);
+
+static ssize_t ad7150_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7150_show_name, NULL, 0);
+
+static ssize_t ad7150_show_powerdown_timer(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->powerdown_timer);
+}
+
+static ssize_t ad7150_store_powerdown_timer(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x40)) {
+                chip->powerdown_timer = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_POWERDOWN_TIMER(S_IRUGO | S_IWUSR,
+                ad7150_show_powerdown_timer,
+                ad7150_store_powerdown_timer);
+
+static struct attribute *ad7150_attributes[] = {
+        &iio_dev_attr_available_threshold_modes.dev_attr.attr,
+        &iio_dev_attr_threshold_mode.dev_attr.attr,
+        &iio_dev_attr_ch1_threshold.dev_attr.attr,
+        &iio_dev_attr_ch2_threshold.dev_attr.attr,
+        &iio_dev_attr_ch1_timeout.dev_attr.attr,
+        &iio_dev_attr_ch2_timeout.dev_attr.attr,
+        &iio_dev_attr_ch1_setup.dev_attr.attr,
+        &iio_dev_attr_ch2_setup.dev_attr.attr,
+        &iio_dev_attr_ch1_sensitivity.dev_attr.attr,
+        &iio_dev_attr_ch2_sensitivity.dev_attr.attr,
+        &iio_dev_attr_powerdown_timer.dev_attr.attr,
+        &iio_dev_attr_ch1_value.dev_attr.attr,
+        &iio_dev_attr_ch2_value.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7150_attribute_group = {
+        .attrs = ad7150_attributes,
+};
+
+/*
+ * threshold events
+ */
+
+#define IIO_EVENT_CODE_CH1_HIGH    IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_CH1_LOW     IIO_BUFFER_EVENT_CODE(1)
+#define IIO_EVENT_CODE_CH2_HIGH    IIO_BUFFER_EVENT_CODE(2)
+#define IIO_EVENT_CODE_CH2_LOW     IIO_BUFFER_EVENT_CODE(3)
+
+#define IIO_EVENT_ATTR_CH1_HIGH_SH(_evlist, _show, _store, _mask)       \
+        IIO_EVENT_ATTR_SH(ch1_high, _evlist, _show, _store, _mask)
+
+#define IIO_EVENT_ATTR_CH2_HIGH_SH(_evlist, _show, _store, _mask)       \
+        IIO_EVENT_ATTR_SH(ch2_high, _evlist, _show, _store, _mask)
+
+#define IIO_EVENT_ATTR_CH1_LOW_SH(_evlist, _show, _store, _mask)        \
+        IIO_EVENT_ATTR_SH(ch1_low, _evlist, _show, _store, _mask)
+
+#define IIO_EVENT_ATTR_CH2_LOW_SH(_evlist, _show, _store, _mask)        \
+        IIO_EVENT_ATTR_SH(ch2_low, _evlist, _show, _store, _mask)
+
+static void ad7150_interrupt_handler_bh(struct work_struct *work_s)
+{
+        struct ad7150_chip_info *chip =
+                container_of(work_s, struct ad7150_chip_info, thresh_work);
+        u8 int_status;
+
+        enable_irq(chip->client->irq);
+
+        ad7150_i2c_read(chip, AD7150_STATUS, &int_status, 1);
+
+        if ((int_status & AD7150_STATUS_OUT1) && !(chip->old_state & AD7150_STATUS_OUT1))
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_CH1_HIGH,
+                                chip->last_timestamp);
+        else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1))
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_CH1_LOW,
+                                chip->last_timestamp);
+
+        if ((int_status & AD7150_STATUS_OUT2) && !(chip->old_state & AD7150_STATUS_OUT2))
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_CH2_HIGH,
+                                chip->last_timestamp);
+        else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2))
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_CH2_LOW,
+                                chip->last_timestamp);
+}
+
+static int ad7150_interrupt_handler_th(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct ad7150_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(threshold, &ad7150_interrupt_handler_th);
+
+static ssize_t ad7150_query_out_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        /*
+         * AD7150 provides two logic output channels, which can be used as interrupt
+         * but the pins are not configurable
+         */
+        return sprintf(buf, "1\n");
+}
+
+static ssize_t ad7150_set_out_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return len;
+}
+
+IIO_EVENT_ATTR_CH1_HIGH_SH(iio_event_threshold, ad7150_query_out_mode, ad7150_set_out_mode, 0);
+IIO_EVENT_ATTR_CH2_HIGH_SH(iio_event_threshold, ad7150_query_out_mode, ad7150_set_out_mode, 0);
+IIO_EVENT_ATTR_CH1_LOW_SH(iio_event_threshold, ad7150_query_out_mode, ad7150_set_out_mode, 0);
+IIO_EVENT_ATTR_CH2_LOW_SH(iio_event_threshold, ad7150_query_out_mode, ad7150_set_out_mode, 0);
+
+static struct attribute *ad7150_event_attributes[] = {
+        &iio_event_attr_ch1_high.dev_attr.attr,
+        &iio_event_attr_ch2_high.dev_attr.attr,
+        &iio_event_attr_ch1_low.dev_attr.attr,
+        &iio_event_attr_ch2_low.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group ad7150_event_attribute_group = {
+        .attrs = ad7150_event_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad7150_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        int ret = 0, regdone = 0;
+        struct ad7150_chip_info *chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        /* Echipabilish that the iio_dev is a child of the i2c device */
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &ad7150_attribute_group;
+        chip->indio_dev->event_attrs = &ad7150_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)(chip);
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+        regdone = 1;
+
+        if (client->irq && gpio_is_valid(irq_to_gpio(client->irq)) > 0) {
+                ret = iio_register_interrupt_line(client->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                "ad7150");
+                if (ret)
+                        goto error_free_dev;
+
+                iio_add_event_to_list(iio_event_attr_ch2_low.listel,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, ad7150_interrupt_handler_bh);
+        }
+
+        dev_err(&client->dev, "%s capacitive sensor registered, irq: %d\n", id->name, client->irq);
+
+        return 0;
+
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(chip->indio_dev);
+        else
+                iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad7150_remove(struct i2c_client *client)
+{
+        struct ad7150_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        if (client->irq && gpio_is_valid(irq_to_gpio(client->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id ad7150_id[] = {
+        { "ad7150", 0 },
+        { "ad7151", 0 },
+        { "ad7156", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, ad7150_id);
+
+static struct i2c_driver ad7150_driver = {
+        .driver = {
+                .name = "ad7150",
+        },
+        .probe = ad7150_probe,
+        .remove = __devexit_p(ad7150_remove),
+        .id_table = ad7150_id,
+};
+
+static __init int ad7150_init(void)
+{
+        return i2c_add_driver(&ad7150_driver);
+}
+
+static __exit void ad7150_exit(void)
+{
+        i2c_del_driver(&ad7150_driver);
+}
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ad7150/1/6 capacitive sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7150_init);
+module_exit(ad7150_exit);
diff --git a/drivers/staging/iio/adc/ad7152.c b/drivers/staging/iio/adc/ad7152.c
new file mode 100644
index 000000000000..fa7f84062307
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7152.c
@@ -0,0 +1,610 @@
+/*
+ * AD7152 capacitive sensor driver supporting AD7152/3
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7152 registers definition
+ */
+
+#define AD7152_STATUS              0
+#define AD7152_STATUS_RDY1         (1 << 0)
+#define AD7152_STATUS_RDY2         (1 << 1)
+#define AD7152_CH1_DATA_HIGH       1
+#define AD7152_CH1_DATA_LOW        2
+#define AD7152_CH2_DATA_HIGH       3
+#define AD7152_CH2_DATA_LOW        4
+#define AD7152_CH1_OFFS_HIGH       5
+#define AD7152_CH1_OFFS_LOW        6
+#define AD7152_CH2_OFFS_HIGH       7
+#define AD7152_CH2_OFFS_LOW        8
+#define AD7152_CH1_GAIN_HIGH       9
+#define AD7152_CH1_GAIN_LOW        10
+#define AD7152_CH1_SETUP           11
+#define AD7152_CH2_GAIN_HIGH       12
+#define AD7152_CH2_GAIN_LOW        13
+#define AD7152_CH2_SETUP           14
+#define AD7152_CFG                 15
+#define AD7152_RESEVERD            16
+#define AD7152_CAPDAC_POS          17
+#define AD7152_CAPDAC_NEG          18
+#define AD7152_CFG2                26
+
+#define AD7152_MAX_CONV_MODE       6
+
+/*
+ * struct ad7152_chip_info - chip specifc information
+ */
+
+struct ad7152_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        u16 ch1_offset;     /* Channel 1 offset calibration coefficient */
+        u16 ch1_gain;       /* Channel 1 gain coefficient */
+        u8  ch1_setup;
+        u16 ch2_offset;     /* Channel 2 offset calibration coefficient */
+        u16 ch2_gain;       /* Channel 1 gain coefficient */
+        u8  ch2_setup;
+        u8  filter_rate_setup; /* Capacitive channel digital filter setup; conversion time/update rate setup per channel */
+        char *conversion_mode;
+};
+
+struct ad7152_conversion_mode {
+        char *name;
+        u8 reg_cfg;
+};
+
+struct ad7152_conversion_mode ad7152_conv_mode_table[AD7152_MAX_CONV_MODE] = {
+        { "idle", 0 },
+        { "continuous-conversion", 1 },
+        { "single-conversion", 2 },
+        { "power-down", 3 },
+        { "offset-calibration", 5 },
+        { "gain-calibration", 6 },
+};
+
+/*
+ * ad7152 register access by I2C
+ */
+
+static int ad7152_i2c_read(struct ad7152_chip_info *chip, u8 reg, u8 *data, int len)
+{
+        struct i2c_client *client = chip->client;
+        int ret;
+
+        ret = i2c_master_send(client, &reg, 1);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C write error\n");
+                return ret;
+        }
+
+        ret = i2c_master_recv(client, data, len);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+        }
+
+        return ret;
+}
+
+static int ad7152_i2c_write(struct ad7152_chip_info *chip, u8 reg, u8 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret;
+
+        u8 tx[2] = {
+                reg,
+                data,
+        };
+
+        ret = i2c_master_send(client, tx, 2);
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+/*
+ * sysfs nodes
+ */
+
+#define IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(_show)                              \
+        IIO_DEVICE_ATTR(available_conversion_modes, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CONVERSION_MODE(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(conversion_mode, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_OFFSET(_mode, _show, _store)           \
+        IIO_DEVICE_ATTR(ch1_offset, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_OFFSET(_mode, _show, _store)           \
+        IIO_DEVICE_ATTR(ch2_offset, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_GAIN(_mode, _show, _store)             \
+        IIO_DEVICE_ATTR(ch1_gain, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_GAIN(_mode, _show, _store)             \
+        IIO_DEVICE_ATTR(ch2_gain, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH1_VALUE(_show)           \
+        IIO_DEVICE_ATTR(ch1_value, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CH2_VALUE(_show)           \
+        IIO_DEVICE_ATTR(ch2_value, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CH1_SETUP(_mode, _show, _store)            \
+        IIO_DEVICE_ATTR(ch1_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CH2_SETUP(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(ch2_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_FILTER_RATE_SETUP(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(filter_rate_setup, _mode, _show, _store, 0)
+
+static ssize_t ad7152_show_conversion_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int i;
+        int len = 0;
+
+        for (i = 0; i < AD7152_MAX_CONV_MODE; i++)
+                len += sprintf(buf + len, "%s ", ad7152_conv_mode_table[i].name);
+
+        len += sprintf(buf + len, "\n");
+
+        return len;
+}
+
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7152_show_conversion_modes);
+
+static ssize_t ad7152_show_ch1_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        u8 data[2];
+
+        ad7152_i2c_read(chip, AD7152_CH1_DATA_HIGH, data, 2);
+        return sprintf(buf, "%d\n", ((int)data[0] << 8) | data[1]);
+}
+
+static IIO_DEV_ATTR_CH1_VALUE(ad7152_show_ch1_value);
+
+static ssize_t ad7152_show_ch2_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        u8 data[2];
+
+        ad7152_i2c_read(chip, AD7152_CH2_DATA_HIGH, data, 2);
+        return sprintf(buf, "%d\n", ((int)data[0] << 8) | data[1]);
+}
+
+static IIO_DEV_ATTR_CH2_VALUE(ad7152_show_ch2_value);
+
+static ssize_t ad7152_show_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%s\n", chip->conversion_mode);
+}
+
+static ssize_t ad7152_store_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        u8 cfg;
+        int i;
+
+        ad7152_i2c_read(chip, AD7152_CFG, &cfg, 1);
+
+        for (i = 0; i < AD7152_MAX_CONV_MODE; i++)
+                if (strncmp(buf, ad7152_conv_mode_table[i].name,
+                                strlen(ad7152_conv_mode_table[i].name) - 1) == 0) {
+                        chip->conversion_mode = ad7152_conv_mode_table[i].name;
+                        cfg |= 0x18 | ad7152_conv_mode_table[i].reg_cfg;
+                        ad7152_i2c_write(chip, AD7152_CFG, cfg);
+                        return len;
+                }
+
+        dev_err(dev, "not supported conversion mode\n");
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+                ad7152_show_conversion_mode,
+                ad7152_store_conversion_mode);
+
+static ssize_t ad7152_show_ch1_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch1_offset);
+}
+
+static ssize_t ad7152_store_ch1_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7152_i2c_write(chip, AD7152_CH1_OFFS_HIGH, data >> 8);
+                ad7152_i2c_write(chip, AD7152_CH1_OFFS_LOW, data);
+                chip->ch1_offset = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_OFFSET(S_IRUGO | S_IWUSR,
+                ad7152_show_ch1_offset,
+                ad7152_store_ch1_offset);
+
+static ssize_t ad7152_show_ch2_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch2_offset);
+}
+
+static ssize_t ad7152_store_ch2_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7152_i2c_write(chip, AD7152_CH2_OFFS_HIGH, data >> 8);
+                ad7152_i2c_write(chip, AD7152_CH2_OFFS_LOW, data);
+                chip->ch2_offset = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_OFFSET(S_IRUGO | S_IWUSR,
+                ad7152_show_ch2_offset,
+                ad7152_store_ch2_offset);
+
+static ssize_t ad7152_show_ch1_gain(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch1_gain);
+}
+
+static ssize_t ad7152_store_ch1_gain(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7152_i2c_write(chip, AD7152_CH1_GAIN_HIGH, data >> 8);
+                ad7152_i2c_write(chip, AD7152_CH1_GAIN_LOW, data);
+                chip->ch1_gain = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_GAIN(S_IRUGO | S_IWUSR,
+                ad7152_show_ch1_gain,
+                ad7152_store_ch1_gain);
+
+static ssize_t ad7152_show_ch2_gain(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->ch2_gain);
+}
+
+static ssize_t ad7152_store_ch2_gain(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad7152_i2c_write(chip, AD7152_CH2_GAIN_HIGH, data >> 8);
+                ad7152_i2c_write(chip, AD7152_CH2_GAIN_LOW, data);
+                chip->ch2_gain = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_GAIN(S_IRUGO | S_IWUSR,
+                ad7152_show_ch2_gain,
+                ad7152_store_ch2_gain);
+
+static ssize_t ad7152_show_ch1_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->ch1_setup);
+}
+
+static ssize_t ad7152_store_ch1_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7152_i2c_write(chip, AD7152_CH1_SETUP, data);
+                chip->ch1_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH1_SETUP(S_IRUGO | S_IWUSR,
+                ad7152_show_ch1_setup,
+                ad7152_store_ch1_setup);
+
+static ssize_t ad7152_show_ch2_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->ch2_setup);
+}
+
+static ssize_t ad7152_store_ch2_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7152_i2c_write(chip, AD7152_CH2_SETUP, data);
+                chip->ch2_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR,
+                ad7152_show_ch2_setup,
+                ad7152_store_ch2_setup);
+
+static ssize_t ad7152_show_filter_rate_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->filter_rate_setup);
+}
+
+static ssize_t ad7152_store_filter_rate_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad7152_i2c_write(chip, AD7152_CFG2, data);
+                chip->filter_rate_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR,
+                ad7152_show_filter_rate_setup,
+                ad7152_store_filter_rate_setup);
+
+static ssize_t ad7152_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7152_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7152_show_name, NULL, 0);
+
+static struct attribute *ad7152_attributes[] = {
+        &iio_dev_attr_available_conversion_modes.dev_attr.attr,
+        &iio_dev_attr_conversion_mode.dev_attr.attr,
+        &iio_dev_attr_ch1_gain.dev_attr.attr,
+        &iio_dev_attr_ch2_gain.dev_attr.attr,
+        &iio_dev_attr_ch1_offset.dev_attr.attr,
+        &iio_dev_attr_ch2_offset.dev_attr.attr,
+        &iio_dev_attr_ch1_value.dev_attr.attr,
+        &iio_dev_attr_ch2_value.dev_attr.attr,
+        &iio_dev_attr_ch1_setup.dev_attr.attr,
+        &iio_dev_attr_ch2_setup.dev_attr.attr,
+        &iio_dev_attr_filter_rate_setup.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7152_attribute_group = {
+        .attrs = ad7152_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad7152_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        int ret = 0;
+        struct ad7152_chip_info *chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        /* Echipabilish that the iio_dev is a child of the i2c device */
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &ad7152_attribute_group;
+        chip->indio_dev->dev_data = (void *)(chip);
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        dev_err(&client->dev, "%s capacitive sensor registered\n", id->name);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad7152_remove(struct i2c_client *client)
+{
+        struct ad7152_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        if (client->irq && gpio_is_valid(irq_to_gpio(client->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id ad7152_id[] = {
+        { "ad7152", 0 },
+        { "ad7153", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, ad7152_id);
+
+static struct i2c_driver ad7152_driver = {
+        .driver = {
+                .name = "ad7152",
+        },
+        .probe = ad7152_probe,
+        .remove = __devexit_p(ad7152_remove),
+        .id_table = ad7152_id,
+};
+
+static __init int ad7152_init(void)
+{
+        return i2c_add_driver(&ad7152_driver);
+}
+
+static __exit void ad7152_exit(void)
+{
+        i2c_del_driver(&ad7152_driver);
+}
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ad7152/3 capacitive sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7152_init);
+module_exit(ad7152_exit);
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
new file mode 100644
index 000000000000..34041a72aa52
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -0,0 +1,1039 @@
+/*
+ * AD7291 digital temperature sensor driver supporting AD7291
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7291 registers definition
+ */
+#define AD7291_COMMAND                  0
+#define AD7291_VOLTAGE                  1
+#define AD7291_T_SENSE                  2
+#define AD7291_T_AVERAGE                3
+#define AD7291_VOLTAGE_LIMIT_BASE       4
+#define AD7291_VOLTAGE_LIMIT_COUNT      8
+#define AD7291_T_SENSE_HIGH             0x1c
+#define AD7291_T_SENSE_LOW              0x1d
+#define AD7291_T_SENSE_HYST             0x1e
+#define AD7291_VOLTAGE_ALERT_STATUS     0x1f
+#define AD7291_T_ALERT_STATUS           0x20
+
+/*
+ * AD7291 command
+ */
+#define AD7291_AUTOCYCLE                0x1
+#define AD7291_RESET                    0x2
+#define AD7291_ALART_CLEAR              0x4
+#define AD7291_ALART_POLARITY           0x8
+#define AD7291_EXT_REF                  0x10
+#define AD7291_NOISE_DELAY              0x20
+#define AD7291_T_SENSE_MASK             0x40
+#define AD7291_VOLTAGE_MASK             0xff00
+#define AD7291_VOLTAGE_OFFSET           0x8
+
+/*
+ * AD7291 value masks
+ */
+#define AD7291_CHANNEL_MASK             0xf000
+#define AD7291_VALUE_MASK               0xfff
+#define AD7291_T_VALUE_SIGN             0x400
+#define AD7291_T_VALUE_FLOAT_OFFSET     2
+#define AD7291_T_VALUE_FLOAT_MASK       0x2
+
+/*
+ * struct ad7291_chip_info - chip specifc information
+ */
+
+struct ad7291_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        s64 last_timestamp;
+        u16 command;
+        u8  channels;   /* Active voltage channels */
+};
+
+/*
+ * struct ad7291_chip_info - chip specifc information
+ */
+
+struct ad7291_limit_regs {
+        u16     data_high;
+        u16     data_low;
+        u16     hysteresis;
+};
+
+/*
+ * ad7291 register access by I2C
+ */
+static int ad7291_i2c_read(struct ad7291_chip_info *chip, u8 reg, u16 *data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_read_word_data(client, reg);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        *data = swab16((u16)ret);
+
+        return 0;
+}
+
+static int ad7291_i2c_write(struct ad7291_chip_info *chip, u8 reg, u16 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_write_word_data(client, reg, swab16(data));
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+/* Returns negative errno, or else the number of words read. */
+static int ad7291_i2c_read_data(struct ad7291_chip_info *chip, u8 reg, u16 *data)
+{
+        struct i2c_client *client = chip->client;
+        u8 commands[4];
+        int ret = 0;
+        int i, count;
+
+        if (reg == AD7291_T_SENSE || reg == AD7291_T_AVERAGE)
+                count = 2;
+        else if (reg == AD7291_VOLTAGE) {
+                if (!chip->channels) {
+                        dev_err(&client->dev, "No voltage channel is selected.\n");
+                        return -EINVAL;
+                }
+                count = 2 + chip->channels * 2;
+        } else {
+                dev_err(&client->dev, "I2C wrong data register\n");
+                return -EINVAL;
+        }
+
+        commands[0] = 0;
+        commands[1] = (chip->command >> 8) & 0xff;
+        commands[2] = chip->command & 0xff;
+        commands[3] = reg;
+
+        ret = i2c_master_send(client, commands, 4);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C master send error\n");
+                return ret;
+        }
+
+        ret = i2c_master_recv(client, (u8 *)data, count);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C master receive error\n");
+                return ret;
+        }
+        ret >>= 2;
+
+        for (i = 0; i < ret; i++)
+                data[i] = swab16(data[i]);
+
+        return ret;
+}
+
+static ssize_t ad7291_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+
+        if (chip->command & AD7291_AUTOCYCLE)
+                return sprintf(buf, "autocycle\n");
+        else
+                return sprintf(buf, "command\n");
+}
+
+static ssize_t ad7291_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command & (~AD7291_AUTOCYCLE);
+        if (strcmp(buf, "autocycle"))
+                command |= AD7291_AUTOCYCLE;
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
+        if (ret)
+                return -EIO;
+
+        chip->command = command;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                ad7291_show_mode,
+                ad7291_store_mode,
+                0);
+
+static ssize_t ad7291_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "command\nautocycle\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, ad7291_show_available_modes, NULL, 0);
+
+static ssize_t ad7291_store_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command | AD7291_RESET;
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR,
+                NULL,
+                ad7291_store_reset,
+                0);
+
+static ssize_t ad7291_show_ext_ref(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->command & AD7291_EXT_REF));
+}
+
+static ssize_t ad7291_store_ext_ref(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command & (~AD7291_EXT_REF);
+        if (strcmp(buf, "1"))
+                command |= AD7291_EXT_REF;
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
+        if (ret)
+                return -EIO;
+
+        chip->command = command;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(ext_ref, S_IRUGO | S_IWUSR,
+                ad7291_show_ext_ref,
+                ad7291_store_ext_ref,
+                0);
+
+static ssize_t ad7291_show_noise_delay(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->command & AD7291_NOISE_DELAY));
+}
+
+static ssize_t ad7291_store_noise_delay(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command & (~AD7291_NOISE_DELAY);
+        if (strcmp(buf, "1"))
+                command |= AD7291_NOISE_DELAY;
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
+        if (ret)
+                return -EIO;
+
+        chip->command = command;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(noise_delay, S_IRUGO | S_IWUSR,
+                ad7291_show_noise_delay,
+                ad7291_store_noise_delay,
+                0);
+
+static ssize_t ad7291_show_t_sense(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        ret = ad7291_i2c_read_data(chip, AD7291_T_SENSE, &data);
+        if (ret)
+                return -EIO;
+
+        if (data & AD7291_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (AD7291_T_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                (data >> AD7291_T_VALUE_FLOAT_OFFSET),
+                (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static IIO_DEVICE_ATTR(t_sense, S_IRUGO, ad7291_show_t_sense, NULL, 0);
+
+static ssize_t ad7291_show_t_average(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        ret = ad7291_i2c_read_data(chip, AD7291_T_AVERAGE, &data);
+        if (ret)
+                return -EIO;
+
+        if (data & AD7291_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (AD7291_T_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                (data >> AD7291_T_VALUE_FLOAT_OFFSET),
+                (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static IIO_DEVICE_ATTR(t_average, S_IRUGO, ad7291_show_t_average, NULL, 0);
+
+static ssize_t ad7291_show_voltage(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 data[AD7291_VOLTAGE_LIMIT_COUNT];
+        int i, size, ret;
+
+        ret = ad7291_i2c_read_data(chip, AD7291_VOLTAGE, data);
+        if (ret)
+                return -EIO;
+
+        for (i = 0; i < AD7291_VOLTAGE_LIMIT_COUNT; i++) {
+                if (chip->command & (AD7291_T_SENSE_MASK << i)) {
+                        ret = sprintf(buf, "channel[%d]=%d\n", i,
+                                        data[i] & AD7291_VALUE_MASK);
+                        if (ret < 0)
+                                break;
+                        buf += ret;
+                        size += ret;
+                }
+        }
+
+        return size;
+}
+
+static IIO_DEVICE_ATTR(voltage, S_IRUGO, ad7291_show_voltage, NULL, 0);
+
+static ssize_t ad7291_show_channel_mask(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%x\n", (chip->command & AD7291_VOLTAGE_MASK) >>
+                        AD7291_VOLTAGE_OFFSET);
+}
+
+static ssize_t ad7291_store_channel_mask(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        unsigned long data;
+        int i, ret;
+
+        ret = strict_strtoul(buf, 16, &data);
+        if (ret || data > 0xff)
+                return -EINVAL;
+
+        command = chip->command & (~AD7291_VOLTAGE_MASK);
+        command |= data << AD7291_VOLTAGE_OFFSET;
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, command);
+        if (ret)
+                return -EIO;
+
+        chip->command = command;
+
+        for (i = 0, chip->channels = 0; i < AD7291_VOLTAGE_LIMIT_COUNT; i++) {
+                if (chip->command & (AD7291_T_SENSE_MASK << i))
+                        chip->channels++;
+        }
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(channel_mask, S_IRUGO | S_IWUSR,
+                ad7291_show_channel_mask,
+                ad7291_store_channel_mask,
+                0);
+
+static ssize_t ad7291_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7291_show_name, NULL, 0);
+
+static struct attribute *ad7291_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_dev_attr_ext_ref.dev_attr.attr,
+        &iio_dev_attr_noise_delay.dev_attr.attr,
+        &iio_dev_attr_t_sense.dev_attr.attr,
+        &iio_dev_attr_t_average.dev_attr.attr,
+        &iio_dev_attr_voltage.dev_attr.attr,
+        &iio_dev_attr_channel_mask.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7291_attribute_group = {
+        .attrs = ad7291_attributes,
+};
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_AD7291_T_SENSE_HIGH  IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_AD7291_T_SENSE_LOW   IIO_BUFFER_EVENT_CODE(1)
+#define IIO_EVENT_CODE_AD7291_T_AVG_HIGH    IIO_BUFFER_EVENT_CODE(2)
+#define IIO_EVENT_CODE_AD7291_T_AVG_LOW     IIO_BUFFER_EVENT_CODE(3)
+#define IIO_EVENT_CODE_AD7291_VOLTAGE_BASE  IIO_BUFFER_EVENT_CODE(4)
+
+static void ad7291_interrupt_bh(struct work_struct *work_s)
+{
+        struct ad7291_chip_info *chip =
+                container_of(work_s, struct ad7291_chip_info, thresh_work);
+        u16 t_status, v_status;
+        u16 command;
+        int i;
+
+        if (ad7291_i2c_read(chip, AD7291_T_ALERT_STATUS, &t_status))
+                return;
+
+        if (ad7291_i2c_read(chip, AD7291_VOLTAGE_ALERT_STATUS, &v_status))
+                return;
+
+        if (!(t_status || v_status))
+                return;
+
+        command = chip->command | AD7291_ALART_CLEAR;
+        ad7291_i2c_write(chip, AD7291_COMMAND, command);
+
+        command = chip->command & ~AD7291_ALART_CLEAR;
+        ad7291_i2c_write(chip, AD7291_COMMAND, command);
+
+        enable_irq(chip->client->irq);
+
+        for (i = 0; i < 4; i++) {
+                if (t_status & (1 << i))
+                        iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_AD7291_T_SENSE_HIGH + i,
+                                chip->last_timestamp);
+        }
+
+        for (i = 0; i < AD7291_VOLTAGE_LIMIT_COUNT*2; i++) {
+                if (v_status & (1 << i))
+                        iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_AD7291_VOLTAGE_BASE + i,
+                                chip->last_timestamp);
+        }
+}
+
+static int ad7291_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(ad7291, &ad7291_interrupt);
+
+static inline ssize_t ad7291_show_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        ret = ad7291_i2c_read(chip, bound_reg, &data);
+        if (ret)
+                return -EIO;
+
+        data &= AD7291_VALUE_MASK;
+        if (data & AD7291_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (AD7291_T_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                        data >> AD7291_T_VALUE_FLOAT_OFFSET,
+                        (data & AD7291_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static inline ssize_t ad7291_set_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        long tmp1, tmp2;
+        u16 data;
+        char *pos;
+        int ret;
+
+        pos = strchr(buf, '.');
+
+        ret = strict_strtol(buf, 10, &tmp1);
+
+        if (ret || tmp1 > 127 || tmp1 < -128)
+                return -EINVAL;
+
+        if (pos) {
+                len = strlen(pos);
+                if (len > AD7291_T_VALUE_FLOAT_OFFSET)
+                        len = AD7291_T_VALUE_FLOAT_OFFSET;
+                pos[len] = 0;
+                ret = strict_strtol(pos, 10, &tmp2);
+
+                if (!ret)
+                        tmp2 = (tmp2 / 25) * 25;
+        }
+
+        if (tmp1 < 0)
+                data = (u16)(-tmp1);
+        else
+                data = (u16)tmp1;
+        data = (data << AD7291_T_VALUE_FLOAT_OFFSET) |
+                (tmp2 & AD7291_T_VALUE_FLOAT_MASK);
+        if (tmp1 < 0)
+                /* convert positive value to supplyment */
+                data = (AD7291_T_VALUE_SIGN << 1) - data;
+
+        ret = ad7291_i2c_write(chip, bound_reg, data);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+static ssize_t ad7291_show_t_sense_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return ad7291_show_t_bound(dev, attr,
+                        AD7291_T_SENSE_HIGH, buf);
+}
+
+static inline ssize_t ad7291_set_t_sense_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return ad7291_set_t_bound(dev, attr,
+                        AD7291_T_SENSE_HIGH, buf, len);
+}
+
+static ssize_t ad7291_show_t_sense_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return ad7291_show_t_bound(dev, attr,
+                        AD7291_T_SENSE_LOW, buf);
+}
+
+static inline ssize_t ad7291_set_t_sense_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return ad7291_set_t_bound(dev, attr,
+                        AD7291_T_SENSE_LOW, buf, len);
+}
+
+static ssize_t ad7291_show_t_sense_hyst(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return ad7291_show_t_bound(dev, attr,
+                        AD7291_T_SENSE_HYST, buf);
+}
+
+static inline ssize_t ad7291_set_t_sense_hyst(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return ad7291_set_t_bound(dev, attr,
+                        AD7291_T_SENSE_HYST, buf, len);
+}
+
+static inline ssize_t ad7291_show_v_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        int ret;
+
+        if (bound_reg < AD7291_VOLTAGE_LIMIT_BASE ||
+                bound_reg >= AD7291_VOLTAGE_LIMIT_BASE +
+                AD7291_VOLTAGE_LIMIT_COUNT)
+                return -EINVAL;
+
+        ret = ad7291_i2c_read(chip, bound_reg, &data);
+        if (ret)
+                return -EIO;
+
+        data &= AD7291_VALUE_MASK;
+
+        return sprintf(buf, "%d\n", data);
+}
+
+static inline ssize_t ad7291_set_v_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7291_chip_info *chip = dev_info->dev_data;
+        unsigned long value;
+        u16 data;
+        int ret;
+
+        if (bound_reg < AD7291_VOLTAGE_LIMIT_BASE ||
+                bound_reg >= AD7291_VOLTAGE_LIMIT_BASE +
+                AD7291_VOLTAGE_LIMIT_COUNT)
+                return -EINVAL;
+
+        ret = strict_strtoul(buf, 10, &value);
+
+        if (ret || value >= 4096)
+                return -EINVAL;
+
+        data = (u16)value;
+        ret = ad7291_i2c_write(chip, bound_reg, data);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+static int ad7291_get_voltage_limit_regs(const char *channel)
+{
+        int index;
+
+        if (strlen(channel) < 3 && channel[0] != 'v')
+                return -EINVAL;
+
+        index = channel[1] - '0';
+        if (index >= AD7291_VOLTAGE_LIMIT_COUNT)
+                return -EINVAL;
+
+        return index;
+}
+
+static ssize_t ad7291_show_voltage_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_show_t_bound(dev, attr, regs, buf);
+}
+
+static inline ssize_t ad7291_set_voltage_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_set_t_bound(dev, attr, regs, buf, len);
+}
+
+static ssize_t ad7291_show_voltage_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_show_t_bound(dev, attr, regs+1, buf);
+}
+
+static inline ssize_t ad7291_set_voltage_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_set_t_bound(dev, attr, regs+1, buf, len);
+}
+
+static ssize_t ad7291_show_voltage_hyst(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_show_t_bound(dev, attr, regs+2, buf);
+}
+
+static inline ssize_t ad7291_set_voltage_hyst(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int regs;
+
+        regs = ad7291_get_voltage_limit_regs(attr->attr.name);
+
+        if (regs < 0)
+                return regs;
+
+        return ad7291_set_t_bound(dev, attr, regs+2, buf, len);
+}
+
+IIO_EVENT_ATTR_SH(t_sense_high, iio_event_ad7291,
+                ad7291_show_t_sense_high, ad7291_set_t_sense_high, 0);
+IIO_EVENT_ATTR_SH(t_sense_low, iio_event_ad7291,
+                ad7291_show_t_sense_low, ad7291_set_t_sense_low, 0);
+IIO_EVENT_ATTR_SH(t_sense_hyst, iio_event_ad7291,
+                ad7291_show_t_sense_hyst, ad7291_set_t_sense_hyst, 0);
+
+IIO_EVENT_ATTR_SH(v0_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v0_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v0_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v1_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v1_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v1_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v2_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v2_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v2_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v3_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v3_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v3_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v4_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v4_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v4_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v5_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v5_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v5_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v6_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v6_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v6_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+IIO_EVENT_ATTR_SH(v7_high, iio_event_ad7291,
+                ad7291_show_voltage_high, ad7291_set_voltage_high, 0);
+IIO_EVENT_ATTR_SH(v7_low, iio_event_ad7291,
+                ad7291_show_voltage_low, ad7291_set_voltage_low, 0);
+IIO_EVENT_ATTR_SH(v7_hyst, iio_event_ad7291,
+                ad7291_show_voltage_hyst, ad7291_set_voltage_hyst, 0);
+
+static struct attribute *ad7291_event_attributes[] = {
+        &iio_event_attr_t_sense_high.dev_attr.attr,
+        &iio_event_attr_t_sense_low.dev_attr.attr,
+        &iio_event_attr_t_sense_hyst.dev_attr.attr,
+        &iio_event_attr_v0_high.dev_attr.attr,
+        &iio_event_attr_v0_low.dev_attr.attr,
+        &iio_event_attr_v0_hyst.dev_attr.attr,
+        &iio_event_attr_v1_high.dev_attr.attr,
+        &iio_event_attr_v1_low.dev_attr.attr,
+        &iio_event_attr_v1_hyst.dev_attr.attr,
+        &iio_event_attr_v2_high.dev_attr.attr,
+        &iio_event_attr_v2_low.dev_attr.attr,
+        &iio_event_attr_v2_hyst.dev_attr.attr,
+        &iio_event_attr_v3_high.dev_attr.attr,
+        &iio_event_attr_v3_low.dev_attr.attr,
+        &iio_event_attr_v3_hyst.dev_attr.attr,
+        &iio_event_attr_v4_high.dev_attr.attr,
+        &iio_event_attr_v4_low.dev_attr.attr,
+        &iio_event_attr_v4_hyst.dev_attr.attr,
+        &iio_event_attr_v5_high.dev_attr.attr,
+        &iio_event_attr_v5_low.dev_attr.attr,
+        &iio_event_attr_v5_hyst.dev_attr.attr,
+        &iio_event_attr_v6_high.dev_attr.attr,
+        &iio_event_attr_v6_low.dev_attr.attr,
+        &iio_event_attr_v6_hyst.dev_attr.attr,
+        &iio_event_attr_v7_high.dev_attr.attr,
+        &iio_event_attr_v7_low.dev_attr.attr,
+        &iio_event_attr_v7_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group ad7291_event_attribute_group = {
+        .attrs = ad7291_event_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad7291_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct ad7291_chip_info *chip;
+        int ret = 0;
+
+        chip = kzalloc(sizeof(struct ad7291_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+        chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &ad7291_attribute_group;
+        chip->indio_dev->event_attrs = &ad7291_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        if (client->irq > 0) {
+                ret = iio_register_interrupt_line(client->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_LOW,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_ad7291.
+                 * All event attributes bind to the same event handler.
+                 * So, only register event handler once.
+                 */
+                iio_add_event_to_list(&iio_event_ad7291,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, ad7291_interrupt_bh);
+
+                /* set irq polarity low level */
+                chip->command |= AD7291_ALART_POLARITY;
+        }
+
+        ret = ad7291_i2c_write(chip, AD7291_COMMAND, chip->command);
+        if (ret) {
+                ret = -EIO;
+                goto error_unreg_irq;
+        }
+
+        dev_info(&client->dev, "%s temperature sensor registered.\n",
+                         id->name);
+
+        return 0;
+
+error_unreg_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 0);
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit ad7291_remove(struct i2c_client *client)
+{
+        struct ad7291_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        if (client->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id ad7291_id[] = {
+        { "ad7291", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, ad7291_id);
+
+static struct i2c_driver ad7291_driver = {
+        .driver = {
+                .name = "ad7291",
+        },
+        .probe = ad7291_probe,
+        .remove = __devexit_p(ad7291_remove),
+        .id_table = ad7291_id,
+};
+
+static __init int ad7291_init(void)
+{
+        return i2c_add_driver(&ad7291_driver);
+}
+
+static __exit void ad7291_exit(void)
+{
+        i2c_del_driver(&ad7291_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices AD7291 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7291_init);
+module_exit(ad7291_exit);
diff --git a/drivers/staging/iio/adc/ad7298.c b/drivers/staging/iio/adc/ad7298.c
new file mode 100644
index 000000000000..1a080c977637
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7298.c
@@ -0,0 +1,501 @@
+/*
+ * AD7298 digital temperature sensor driver supporting AD7298
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7298 command
+ */
+#define AD7298_PD                       0x1
+#define AD7298_T_AVG_MASK               0x2
+#define AD7298_EXT_REF                  0x4
+#define AD7298_T_SENSE_MASK             0x20
+#define AD7298_VOLTAGE_MASK             0x3fc0
+#define AD7298_VOLTAGE_OFFSET           0x6
+#define AD7298_VOLTAGE_LIMIT_COUNT      8
+#define AD7298_REPEAT                   0x40
+#define AD7298_WRITE                    0x80
+
+/*
+ * AD7298 value masks
+ */
+#define AD7298_CHANNEL_MASK             0xf000
+#define AD7298_VALUE_MASK               0xfff
+#define AD7298_T_VALUE_SIGN             0x400
+#define AD7298_T_VALUE_FLOAT_OFFSET     2
+#define AD7298_T_VALUE_FLOAT_MASK       0x2
+
+/*
+ * struct ad7298_chip_info - chip specifc information
+ */
+
+struct ad7298_chip_info {
+        const char *name;
+        struct spi_device *spi_dev;
+        struct iio_dev *indio_dev;
+        u16 command;
+        u16 busy_pin;
+        u8  channels;   /* Active voltage channels */
+};
+
+/*
+ * ad7298 register access by SPI
+ */
+static int ad7298_spi_write(struct ad7298_chip_info *chip, u16 data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+
+        data |= AD7298_WRITE;
+        data = cpu_to_be16(data);
+        ret = spi_write(spi_dev, (u8 *)&data, sizeof(data));
+        if (ret < 0)
+                dev_err(&spi_dev->dev, "SPI write error\n");
+
+        return ret;
+}
+
+static int ad7298_spi_read(struct ad7298_chip_info *chip, u16 mask, u16 *data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+        u8 count = chip->channels;
+        u16 command;
+        int i;
+
+        if (mask & AD7298_T_SENSE_MASK) {
+                command = chip->command & ~(AD7298_T_AVG_MASK | AD7298_VOLTAGE_MASK);
+                command |= AD7298_T_SENSE_MASK;
+                count = 1;
+        } else if (mask & AD7298_T_AVG_MASK) {
+                command = chip->command & ~AD7298_VOLTAGE_MASK;
+                command |= AD7298_T_SENSE_MASK | AD7298_T_AVG_MASK;
+                count = 2;
+        } else if (mask & AD7298_VOLTAGE_MASK) {
+                command = chip->command & ~(AD7298_T_AVG_MASK | AD7298_T_SENSE_MASK);
+                count = chip->channels;
+        }
+
+        ret = ad7298_spi_write(chip, chip->command);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write command error\n");
+                return ret;
+        }
+
+        ret = spi_read(spi_dev, (u8 *)&command, sizeof(command));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI read error\n");
+                return ret;
+        }
+
+        i = 10000;
+        while (i && gpio_get_value(chip->busy_pin)) {
+                cpu_relax();
+                i--;
+        }
+        if (!i) {
+                dev_err(&spi_dev->dev, "Always in busy convertion.\n");
+                return -EBUSY;
+        }
+
+        for (i = 0; i < count; i++) {
+                ret = spi_read(spi_dev, (u8 *)&data[i], sizeof(data[i]));
+                if (ret < 0) {
+                        dev_err(&spi_dev->dev, "SPI read error\n");
+                        return ret;
+                }
+                *data = be16_to_cpu(data[i]);
+        }
+
+        return 0;
+}
+
+static ssize_t ad7298_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+
+        if (chip->command & AD7298_REPEAT)
+                return sprintf(buf, "repeat\n");
+        else
+                return sprintf(buf, "normal\n");
+}
+
+static ssize_t ad7298_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+
+        if (strcmp(buf, "repeat"))
+                chip->command |= AD7298_REPEAT;
+        else
+                chip->command &= (~AD7298_REPEAT);
+
+        return 1;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                ad7298_show_mode,
+                ad7298_store_mode,
+                0);
+
+static ssize_t ad7298_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "normal\nrepeat\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, ad7298_show_available_modes, NULL, 0);
+
+static ssize_t ad7298_store_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command & ~AD7298_PD;
+
+        ret = ad7298_spi_write(chip, command);
+        if (ret)
+                return -EIO;
+
+        command = chip->command | AD7298_PD;
+
+        ret = ad7298_spi_write(chip, command);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR,
+                NULL,
+                ad7298_store_reset,
+                0);
+
+static ssize_t ad7298_show_ext_ref(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->command & AD7298_EXT_REF));
+}
+
+static ssize_t ad7298_store_ext_ref(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        u16 command;
+        int ret;
+
+        command = chip->command & (~AD7298_EXT_REF);
+        if (strcmp(buf, "1"))
+                command |= AD7298_EXT_REF;
+
+        ret = ad7298_spi_write(chip, command);
+        if (ret)
+                return -EIO;
+
+        chip->command = command;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(ext_ref, S_IRUGO | S_IWUSR,
+                ad7298_show_ext_ref,
+                ad7298_store_ext_ref,
+                0);
+
+static ssize_t ad7298_show_t_sense(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        ret = ad7298_spi_read(chip, AD7298_T_SENSE_MASK, &data);
+        if (ret)
+                return -EIO;
+
+        if (data & AD7298_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (AD7298_T_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                (data >> AD7298_T_VALUE_FLOAT_OFFSET),
+                (data & AD7298_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static IIO_DEVICE_ATTR(t_sense, S_IRUGO, ad7298_show_t_sense, NULL, 0);
+
+static ssize_t ad7298_show_t_average(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        u16 data[2];
+        char sign = ' ';
+        int ret;
+
+        ret = ad7298_spi_read(chip, AD7298_T_AVG_MASK, data);
+        if (ret)
+                return -EIO;
+
+        if (data[1] & AD7298_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data[1] = (AD7298_T_VALUE_SIGN << 1) - data[1];
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                (data[1] >> AD7298_T_VALUE_FLOAT_OFFSET),
+                (data[1] & AD7298_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static IIO_DEVICE_ATTR(t_average, S_IRUGO, ad7298_show_t_average, NULL, 0);
+
+static ssize_t ad7298_show_voltage(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        u16 data[AD7298_VOLTAGE_LIMIT_COUNT];
+        int i, size, ret;
+
+        ret = ad7298_spi_read(chip, AD7298_VOLTAGE_MASK, data);
+        if (ret)
+                return -EIO;
+
+        for (i = 0; i < AD7298_VOLTAGE_LIMIT_COUNT; i++) {
+                if (chip->command & (AD7298_T_SENSE_MASK << i)) {
+                        ret = sprintf(buf, "channel[%d]=%d\n", i,
+                                        data[i] & AD7298_VALUE_MASK);
+                        if (ret < 0)
+                                break;
+                        buf += ret;
+                        size += ret;
+                }
+        }
+
+        return size;
+}
+
+static IIO_DEVICE_ATTR(voltage, S_IRUGO, ad7298_show_voltage, NULL, 0);
+
+static ssize_t ad7298_show_channel_mask(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%x\n", (chip->command & AD7298_VOLTAGE_MASK) >>
+                        AD7298_VOLTAGE_OFFSET);
+}
+
+static ssize_t ad7298_store_channel_mask(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int i, ret;
+
+        ret = strict_strtoul(buf, 16, &data);
+        if (ret || data > 0xff)
+                return -EINVAL;
+
+        chip->command &= (~AD7298_VOLTAGE_MASK);
+        chip->command |= data << AD7298_VOLTAGE_OFFSET;
+
+        for (i = 0, chip->channels = 0; i < AD7298_VOLTAGE_LIMIT_COUNT; i++) {
+                if (chip->command & (AD7298_T_SENSE_MASK << i))
+                        chip->channels++;
+        }
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(channel_mask, S_IRUGO | S_IWUSR,
+                ad7298_show_channel_mask,
+                ad7298_store_channel_mask,
+                0);
+
+static ssize_t ad7298_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7298_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7298_show_name, NULL, 0);
+
+static struct attribute *ad7298_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_dev_attr_ext_ref.dev_attr.attr,
+        &iio_dev_attr_t_sense.dev_attr.attr,
+        &iio_dev_attr_t_average.dev_attr.attr,
+        &iio_dev_attr_voltage.dev_attr.attr,
+        &iio_dev_attr_channel_mask.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7298_attribute_group = {
+        .attrs = ad7298_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+static int __devinit ad7298_probe(struct spi_device *spi_dev)
+{
+        struct ad7298_chip_info *chip;
+        unsigned short *pins = spi_dev->dev.platform_data;
+        int ret = 0;
+
+        chip = kzalloc(sizeof(struct ad7298_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        dev_set_drvdata(&spi_dev->dev, chip);
+
+        chip->spi_dev = spi_dev;
+        chip->name = spi_dev->modalias;
+        chip->busy_pin = pins[0];
+
+        ret = gpio_request(chip->busy_pin, chip->name);
+        if (ret) {
+                dev_err(&spi_dev->dev, "Fail to request busy gpio PIN %d.\n",
+                        chip->busy_pin);
+                goto error_free_chip;
+        }
+        gpio_direction_input(chip->busy_pin);
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_gpio;
+        }
+
+        chip->indio_dev->dev.parent = &spi_dev->dev;
+        chip->indio_dev->attrs = &ad7298_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        dev_info(&spi_dev->dev, "%s temperature sensor and ADC registered.\n",
+                         chip->name);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_gpio:
+        gpio_free(chip->busy_pin);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit ad7298_remove(struct spi_device *spi_dev)
+{
+        struct ad7298_chip_info *chip = dev_get_drvdata(&spi_dev->dev);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        dev_set_drvdata(&spi_dev->dev, NULL);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        gpio_free(chip->busy_pin);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct spi_device_id ad7298_id[] = {
+        { "ad7298", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(spi, ad7298_id);
+
+static struct spi_driver ad7298_driver = {
+        .driver = {
+                .name = "ad7298",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad7298_probe,
+        .remove = __devexit_p(ad7298_remove),
+        .id_table = ad7298_id,
+};
+
+static __init int ad7298_init(void)
+{
+        return spi_register_driver(&ad7298_driver);
+}
+
+static __exit void ad7298_exit(void)
+{
+        spi_unregister_driver(&ad7298_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices AD7298 digital"
+                        " temperature sensor and ADC driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7298_init);
+module_exit(ad7298_exit);
diff --git a/drivers/staging/iio/adc/ad7314.c b/drivers/staging/iio/adc/ad7314.c
new file mode 100644
index 000000000000..8c17b1fe9026
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7314.c
@@ -0,0 +1,308 @@
+/*
+ * AD7314 digital temperature sensor driver for AD7314, ADT7301 and ADT7302
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7314 power mode
+ */
+#define AD7314_PD               0x2000
+
+/*
+ * AD7314 temperature masks
+ */
+#define AD7314_TEMP_SIGN                0x200
+#define AD7314_TEMP_MASK                0x7FE0
+#define AD7314_TEMP_OFFSET              5
+#define AD7314_TEMP_FLOAT_OFFSET        2
+#define AD7314_TEMP_FLOAT_MASK          0x3
+
+/*
+ * ADT7301 and ADT7302 temperature masks
+ */
+#define ADT7301_TEMP_SIGN               0x2000
+#define ADT7301_TEMP_MASK               0x2FFF
+#define ADT7301_TEMP_FLOAT_OFFSET       5
+#define ADT7301_TEMP_FLOAT_MASK         0x1F
+
+/*
+ * struct ad7314_chip_info - chip specifc information
+ */
+
+struct ad7314_chip_info {
+        const char *name;
+        struct spi_device *spi_dev;
+        struct iio_dev *indio_dev;
+        s64 last_timestamp;
+        u8  mode;
+};
+
+/*
+ * ad7314 register access by SPI
+ */
+
+static int ad7314_spi_read(struct ad7314_chip_info *chip, u16 *data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+        u16 value;
+
+        ret = spi_read(spi_dev, (u8 *)&value, sizeof(value));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI read error\n");
+                return ret;
+        }
+
+        *data = be16_to_cpu((u16)value);
+
+        return ret;
+}
+
+static int ad7314_spi_write(struct ad7314_chip_info *chip, u16 data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+        u16 value = cpu_to_be16(data);
+
+        ret = spi_write(spi_dev, (u8 *)&value, sizeof(value));
+        if (ret < 0)
+                dev_err(&spi_dev->dev, "SPI write error\n");
+
+        return ret;
+}
+
+static ssize_t ad7314_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7314_chip_info *chip = dev_info->dev_data;
+
+        if (chip->mode)
+                return sprintf(buf, "power-save\n");
+        else
+                return sprintf(buf, "full\n");
+}
+
+static ssize_t ad7314_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7314_chip_info *chip = dev_info->dev_data;
+        u16 mode = 0;
+        int ret;
+
+        if (!strcmp(buf, "full"))
+                mode = AD7314_PD;
+
+        ret = ad7314_spi_write(chip, mode);
+        if (ret)
+                return -EIO;
+
+        chip->mode = mode;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                ad7314_show_mode,
+                ad7314_store_mode,
+                0);
+
+static ssize_t ad7314_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "full\npower-save\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, ad7314_show_available_modes, NULL, 0);
+
+static ssize_t ad7314_show_temperature(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7314_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        if (chip->mode) {
+                ret = ad7314_spi_write(chip, 0);
+                if (ret)
+                        return -EIO;
+        }
+
+        ret = ad7314_spi_read(chip, &data);
+        if (ret)
+                return -EIO;
+
+        if (chip->mode)
+                ad7314_spi_write(chip, chip->mode);
+
+        if (strcmp(chip->name, "ad7314")) {
+                data = (data & AD7314_TEMP_MASK) >>
+                        AD7314_TEMP_OFFSET;
+                if (data & AD7314_TEMP_SIGN) {
+                        data = (AD7314_TEMP_SIGN << 1) - data;
+                        sign = '-';
+                }
+
+                return sprintf(buf, "%c%d.%.2d\n", sign,
+                                data >> AD7314_TEMP_FLOAT_OFFSET,
+                                (data & AD7314_TEMP_FLOAT_MASK) * 25);
+        } else {
+                data &= ADT7301_TEMP_MASK;
+                if (data & ADT7301_TEMP_SIGN) {
+                        data = (ADT7301_TEMP_SIGN << 1) - data;
+                        sign = '-';
+                }
+
+                return sprintf(buf, "%c%d.%.5d\n", sign,
+                                data >> ADT7301_TEMP_FLOAT_OFFSET,
+                                (data & ADT7301_TEMP_FLOAT_MASK) * 3125);
+        }
+}
+
+static IIO_DEVICE_ATTR(temperature, S_IRUGO, ad7314_show_temperature, NULL, 0);
+
+static ssize_t ad7314_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7314_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7314_show_name, NULL, 0);
+
+static struct attribute *ad7314_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_temperature.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7314_attribute_group = {
+        .attrs = ad7314_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad7314_probe(struct spi_device *spi_dev)
+{
+        struct ad7314_chip_info *chip;
+        int ret = 0;
+
+        chip = kzalloc(sizeof(struct ad7314_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        dev_set_drvdata(&spi_dev->dev, chip);
+
+        chip->spi_dev = spi_dev;
+        chip->name = spi_dev->modalias;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = &spi_dev->dev;
+        chip->indio_dev->attrs = &ad7314_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        dev_info(&spi_dev->dev, "%s temperature sensor registered.\n",
+                         chip->name);
+
+        return 0;
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit ad7314_remove(struct spi_device *spi_dev)
+{
+        struct ad7314_chip_info *chip = dev_get_drvdata(&spi_dev->dev);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        dev_set_drvdata(&spi_dev->dev, NULL);
+        if (spi_dev->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct spi_device_id ad7314_id[] = {
+        { "adt7301", 0 },
+        { "adt7302", 0 },
+        { "ad7314", 0 },
+        {}
+};
+
+static struct spi_driver ad7314_driver = {
+        .driver = {
+                .name = "ad7314",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad7314_probe,
+        .remove = __devexit_p(ad7314_remove),
+        .id_table = ad7314_id,
+};
+
+static __init int ad7314_init(void)
+{
+        return spi_register_driver(&ad7314_driver);
+}
+
+static __exit void ad7314_exit(void)
+{
+        spi_unregister_driver(&ad7314_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7314_init);
+module_exit(ad7314_exit);
diff --git a/drivers/staging/iio/adc/ad7745.c b/drivers/staging/iio/adc/ad7745.c
new file mode 100644
index 000000000000..ab7ef8450ae2
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7745.c
@@ -0,0 +1,734 @@
+/*
+ * AD774X capacitive sensor driver supporting AD7745/6/7
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD774X registers definition
+ */
+
+#define AD774X_STATUS           0
+#define AD774X_STATUS_RDY       (1 << 2)
+#define AD774X_STATUS_RDYVT     (1 << 1)
+#define AD774X_STATUS_RDYCAP    (1 << 0)
+#define AD774X_CAP_DATA_HIGH    1
+#define AD774X_CAP_DATA_MID     2
+#define AD774X_CAP_DATA_LOW     3
+#define AD774X_VT_DATA_HIGH     4
+#define AD774X_VT_DATA_MID      5
+#define AD774X_VT_DATA_LOW      6
+#define AD774X_CAP_SETUP        7
+#define AD774X_VT_SETUP         8
+#define AD774X_EXEC_SETUP       9
+#define AD774X_CFG              10
+#define AD774X_CAPDACA          11
+#define AD774X_CAPDACB          12
+#define AD774X_CAPDAC_EN        (1 << 7)
+#define AD774X_CAP_OFFH         13
+#define AD774X_CAP_OFFL         14
+#define AD774X_CAP_GAINH        15
+#define AD774X_CAP_GAINL        16
+#define AD774X_VOLT_GAINH       17
+#define AD774X_VOLT_GAINL       18
+
+#define AD774X_MAX_CONV_MODE    6
+
+/*
+ * struct ad774x_chip_info - chip specifc information
+ */
+
+struct ad774x_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        bool inter;
+        s64 last_timestamp;
+        u16 cap_offs;                   /* Capacitive offset */
+        u16 cap_gain;                   /* Capacitive gain calibration */
+        u16 volt_gain;                  /* Voltage gain calibration */
+        u8  cap_setup;
+        u8  vt_setup;
+        u8  exec_setup;
+
+        char *conversion_mode;
+};
+
+struct ad774x_conversion_mode {
+        char *name;
+        u8 reg_cfg;
+};
+
+struct ad774x_conversion_mode ad774x_conv_mode_table[AD774X_MAX_CONV_MODE] = {
+        { "idle", 0 },
+        { "continuous-conversion", 1 },
+        { "single-conversion", 2 },
+        { "power-down", 3 },
+        { "offset-calibration", 5 },
+        { "gain-calibration", 6 },
+};
+
+/*
+ * ad774x register access by I2C
+ */
+
+static int ad774x_i2c_read(struct ad774x_chip_info *chip, u8 reg, u8 *data, int len)
+{
+        struct i2c_client *client = chip->client;
+        int ret;
+
+        ret = i2c_master_send(client, &reg, 1);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C write error\n");
+                return ret;
+        }
+
+        ret = i2c_master_recv(client, data, len);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int ad774x_i2c_write(struct ad774x_chip_info *chip, u8 reg, u8 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret;
+
+        u8 tx[2] = {
+                reg,
+                data,
+        };
+
+        ret = i2c_master_send(client, tx, 2);
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+/*
+ * sysfs nodes
+ */
+
+#define IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(_show)                              \
+        IIO_DEVICE_ATTR(available_conversion_modes, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_CONVERSION_MODE(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(conversion_mode, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CAP_SETUP(_mode, _show, _store)            \
+        IIO_DEVICE_ATTR(cap_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_VT_SETUP(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(in0_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_EXEC_SETUP(_mode, _show, _store)              \
+        IIO_DEVICE_ATTR(exec_setup, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_VOLT_GAIN(_mode, _show, _store)            \
+        IIO_DEVICE_ATTR(in0_gain, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CAP_OFFS(_mode, _show, _store)             \
+        IIO_DEVICE_ATTR(cap_offs, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CAP_GAIN(_mode, _show, _store)             \
+        IIO_DEVICE_ATTR(cap_gain, _mode, _show, _store, 0)
+#define IIO_DEV_ATTR_CAP_DATA(_show)            \
+        IIO_DEVICE_ATTR(cap0_raw, S_IRUGO, _show, NULL, 0)
+#define IIO_DEV_ATTR_VT_DATA(_show)             \
+        IIO_DEVICE_ATTR(in0_raw, S_IRUGO, _show, NULL, 0)
+
+static ssize_t ad774x_show_conversion_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int i;
+        int len = 0;
+
+        for (i = 0; i < AD774X_MAX_CONV_MODE; i++)
+                len += sprintf(buf + len, "%s ", ad774x_conv_mode_table[i].name);
+
+        len += sprintf(buf + len, "\n");
+
+        return len;
+}
+
+static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad774x_show_conversion_modes);
+
+static ssize_t ad774x_show_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%s\n", chip->conversion_mode);
+}
+
+static ssize_t ad774x_store_conversion_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        u8 cfg;
+        int i;
+
+        ad774x_i2c_read(chip, AD774X_CFG, &cfg, 1);
+
+        for (i = 0; i < AD774X_MAX_CONV_MODE; i++) {
+                if (strncmp(buf, ad774x_conv_mode_table[i].name,
+                                strlen(ad774x_conv_mode_table[i].name) - 1) == 0) {
+                        chip->conversion_mode = ad774x_conv_mode_table[i].name;
+                        cfg |= 0x18 | ad774x_conv_mode_table[i].reg_cfg;
+                        ad774x_i2c_write(chip, AD774X_CFG, cfg);
+                        return len;
+                }
+        }
+
+        dev_err(dev, "not supported conversion mode\n");
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
+                ad774x_show_conversion_mode,
+                ad774x_store_conversion_mode);
+
+static ssize_t ad774x_show_dac_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        u8 data;
+
+        ad774x_i2c_read(chip, this_attr->address, &data, 1);
+
+        return sprintf(buf, "%02x\n", data & 0x7F);
+}
+
+static ssize_t ad774x_store_dac_value(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if (!ret) {
+                ad774x_i2c_write(chip, this_attr->address,
+                        (data ? AD774X_CAPDAC_EN : 0) | (data & 0x7F));
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEVICE_ATTR(capdac0_raw, S_IRUGO | S_IWUSR,
+                        ad774x_show_dac_value,
+                        ad774x_store_dac_value,
+                        AD774X_CAPDACA);
+
+static IIO_DEVICE_ATTR(capdac1_raw, S_IRUGO | S_IWUSR,
+                        ad774x_show_dac_value,
+                        ad774x_store_dac_value,
+                        AD774X_CAPDACB);
+
+static ssize_t ad774x_show_cap_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->cap_setup);
+}
+
+static ssize_t ad774x_store_cap_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad774x_i2c_write(chip, AD774X_CAP_SETUP, data);
+                chip->cap_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CAP_SETUP(S_IRUGO | S_IWUSR,
+                ad774x_show_cap_setup,
+                ad774x_store_cap_setup);
+
+static ssize_t ad774x_show_vt_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->vt_setup);
+}
+
+static ssize_t ad774x_store_vt_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad774x_i2c_write(chip, AD774X_VT_SETUP, data);
+                chip->vt_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_VT_SETUP(S_IRUGO | S_IWUSR,
+                ad774x_show_vt_setup,
+                ad774x_store_vt_setup);
+
+static ssize_t ad774x_show_exec_setup(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%02x\n", chip->exec_setup);
+}
+
+static ssize_t ad774x_store_exec_setup(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x100)) {
+                ad774x_i2c_write(chip, AD774X_EXEC_SETUP, data);
+                chip->exec_setup = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_EXEC_SETUP(S_IRUGO | S_IWUSR,
+                ad774x_show_exec_setup,
+                ad774x_store_exec_setup);
+
+static ssize_t ad774x_show_volt_gain(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->volt_gain);
+}
+
+static ssize_t ad774x_store_volt_gain(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad774x_i2c_write(chip, AD774X_VOLT_GAINH, data >> 8);
+                ad774x_i2c_write(chip, AD774X_VOLT_GAINL, data);
+                chip->volt_gain = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_VOLT_GAIN(S_IRUGO | S_IWUSR,
+                ad774x_show_volt_gain,
+                ad774x_store_volt_gain);
+
+static ssize_t ad774x_show_cap_data(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        char tmp[3];
+
+        ad774x_i2c_read(chip, AD774X_CAP_DATA_HIGH, tmp, 3);
+        data = ((int)tmp[0] << 16) | ((int)tmp[1] << 8) | (int)tmp[2];
+
+        return sprintf(buf, "%ld\n", data);
+}
+
+static IIO_DEV_ATTR_CAP_DATA(ad774x_show_cap_data);
+
+static ssize_t ad774x_show_vt_data(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        char tmp[3];
+
+        ad774x_i2c_read(chip, AD774X_VT_DATA_HIGH, tmp, 3);
+        data = ((int)tmp[0] << 16) | ((int)tmp[1] << 8) | (int)tmp[2];
+
+        return sprintf(buf, "%ld\n", data);
+}
+
+static IIO_DEV_ATTR_VT_DATA(ad774x_show_vt_data);
+
+static ssize_t ad774x_show_cap_offs(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->cap_offs);
+}
+
+static ssize_t ad774x_store_cap_offs(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad774x_i2c_write(chip, AD774X_CAP_OFFH, data >> 8);
+                ad774x_i2c_write(chip, AD774X_CAP_OFFL, data);
+                chip->cap_offs = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CAP_OFFS(S_IRUGO | S_IWUSR,
+                ad774x_show_cap_offs,
+                ad774x_store_cap_offs);
+
+static ssize_t ad774x_show_cap_gain(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->cap_gain);
+}
+
+static ssize_t ad774x_store_cap_gain(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+
+        if ((!ret) && (data < 0x10000)) {
+                ad774x_i2c_write(chip, AD774X_CAP_GAINH, data >> 8);
+                ad774x_i2c_write(chip, AD774X_CAP_GAINL, data);
+                chip->cap_gain = data;
+                return len;
+        }
+
+        return -EINVAL;
+}
+
+static IIO_DEV_ATTR_CAP_GAIN(S_IRUGO | S_IWUSR,
+                ad774x_show_cap_gain,
+                ad774x_store_cap_gain);
+
+static ssize_t ad774x_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad774x_show_name, NULL, 0);
+
+static struct attribute *ad774x_attributes[] = {
+        &iio_dev_attr_available_conversion_modes.dev_attr.attr,
+        &iio_dev_attr_conversion_mode.dev_attr.attr,
+        &iio_dev_attr_cap_setup.dev_attr.attr,
+        &iio_dev_attr_in0_setup.dev_attr.attr,
+        &iio_dev_attr_exec_setup.dev_attr.attr,
+        &iio_dev_attr_cap_offs.dev_attr.attr,
+        &iio_dev_attr_cap_gain.dev_attr.attr,
+        &iio_dev_attr_in0_gain.dev_attr.attr,
+        &iio_dev_attr_in0_raw.dev_attr.attr,
+        &iio_dev_attr_cap0_raw.dev_attr.attr,
+        &iio_dev_attr_capdac0_raw.dev_attr.attr,
+        &iio_dev_attr_capdac1_raw.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad774x_attribute_group = {
+        .attrs = ad774x_attributes,
+};
+
+/*
+ * data ready events
+ */
+
+#define IIO_EVENT_CODE_CAP_RDY     IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_VT_RDY      IIO_BUFFER_EVENT_CODE(1)
+
+#define IIO_EVENT_ATTR_CAP_RDY_SH(_evlist, _show, _store, _mask)        \
+        IIO_EVENT_ATTR_SH(cap_rdy, _evlist, _show, _store, _mask)
+
+#define IIO_EVENT_ATTR_VT_RDY_SH(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(vt_rdy, _evlist, _show, _store, _mask)
+
+static void ad774x_interrupt_handler_bh(struct work_struct *work_s)
+{
+        struct ad774x_chip_info *chip =
+                container_of(work_s, struct ad774x_chip_info, thresh_work);
+        u8 int_status;
+
+        enable_irq(chip->client->irq);
+
+        ad774x_i2c_read(chip, AD774X_STATUS, &int_status, 1);
+
+        if (int_status & AD774X_STATUS_RDYCAP)
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_CAP_RDY,
+                                chip->last_timestamp);
+
+        if (int_status & AD774X_STATUS_RDYVT)
+                iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_VT_RDY,
+                                chip->last_timestamp);
+}
+
+static int ad774x_interrupt_handler_th(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct ad774x_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(data_rdy, &ad774x_interrupt_handler_th);
+
+static ssize_t ad774x_query_out_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        /*
+         * AD774X provides one /RDY pin, which can be used as interrupt
+         * but the pin is not configurable
+         */
+        return sprintf(buf, "1\n");
+}
+
+static ssize_t ad774x_set_out_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return len;
+}
+
+IIO_EVENT_ATTR_CAP_RDY_SH(iio_event_data_rdy, ad774x_query_out_mode, ad774x_set_out_mode, 0);
+IIO_EVENT_ATTR_VT_RDY_SH(iio_event_data_rdy, ad774x_query_out_mode, ad774x_set_out_mode, 0);
+
+static struct attribute *ad774x_event_attributes[] = {
+        &iio_event_attr_cap_rdy.dev_attr.attr,
+        &iio_event_attr_vt_rdy.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group ad774x_event_attribute_group = {
+        .attrs = ad774x_event_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad774x_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        int ret = 0, regdone = 0;
+        struct ad774x_chip_info *chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        /* Establish that the iio_dev is a child of the i2c device */
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &ad774x_attribute_group;
+        chip->indio_dev->event_attrs = &ad774x_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)(chip);
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+        regdone = 1;
+
+        if (client->irq) {
+                ret = iio_register_interrupt_line(client->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ad774x");
+                if (ret)
+                        goto error_free_dev;
+
+                iio_add_event_to_list(iio_event_attr_cap_rdy.listel,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, ad774x_interrupt_handler_bh);
+        }
+
+        dev_err(&client->dev, "%s capacitive sensor registered, irq: %d\n", id->name, client->irq);
+
+        return 0;
+
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(chip->indio_dev);
+        else
+                iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad774x_remove(struct i2c_client *client)
+{
+        struct ad774x_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        if (client->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id ad774x_id[] = {
+        { "ad7745", 0 },
+        { "ad7746", 0 },
+        { "ad7747", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, ad774x_id);
+
+static struct i2c_driver ad774x_driver = {
+        .driver = {
+                .name = "ad774x",
+        },
+        .probe = ad774x_probe,
+        .remove = __devexit_p(ad774x_remove),
+        .id_table = ad774x_id,
+};
+
+static __init int ad774x_init(void)
+{
+        return i2c_add_driver(&ad774x_driver);
+}
+
+static __exit void ad774x_exit(void)
+{
+        i2c_del_driver(&ad774x_driver);
+}
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ad7745/6/7 capacitive sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad774x_init);
+module_exit(ad774x_exit);
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
new file mode 100644
index 000000000000..ad7415a6b8d9
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -0,0 +1,535 @@
+/*
+ * AD7816 digital temperature sensor driver supporting AD7816/7/8
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * AD7816 config masks
+ */
+#define AD7816_FULL                     0x1
+#define AD7816_PD                       0x2
+#define AD7816_CS_MASK                  0x7
+#define AD7816_CS_MAX                   0x4
+
+/*
+ * AD7816 temperature masks
+ */
+#define AD7816_VALUE_OFFSET             6
+#define AD7816_BOUND_VALUE_BASE         0x8
+#define AD7816_BOUND_VALUE_MIN          -95
+#define AD7816_BOUND_VALUE_MAX          152
+#define AD7816_TEMP_FLOAT_OFFSET        2
+#define AD7816_TEMP_FLOAT_MASK          0x3
+
+
+/*
+ * struct ad7816_chip_info - chip specifc information
+ */
+
+struct ad7816_chip_info {
+        const char *name;
+        struct spi_device *spi_dev;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        s64 last_timestamp;
+        u16 rdwr_pin;
+        u16 convert_pin;
+        u16 busy_pin;
+        u8  oti_data[AD7816_CS_MAX+1];
+        u8  channel_id; /* 0 always be temperature */
+        u8  mode;
+};
+
+/*
+ * ad7816 data access by SPI
+ */
+static int ad7816_spi_read(struct ad7816_chip_info *chip, u16 *data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+
+        gpio_set_value(chip->rdwr_pin, 1);
+        gpio_set_value(chip->rdwr_pin, 0);
+        ret = spi_write(spi_dev, &chip->channel_id, sizeof(chip->channel_id));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI channel setting error\n");
+                return ret;
+        }
+        gpio_set_value(chip->rdwr_pin, 1);
+
+
+        if (chip->mode == AD7816_PD) { /* operating mode 2 */
+                gpio_set_value(chip->convert_pin, 1);
+                gpio_set_value(chip->convert_pin, 0);
+        } else { /* operating mode 1 */
+                gpio_set_value(chip->convert_pin, 0);
+                gpio_set_value(chip->convert_pin, 1);
+        }
+
+        while (gpio_get_value(chip->busy_pin))
+                cpu_relax();
+
+        gpio_set_value(chip->rdwr_pin, 0);
+        gpio_set_value(chip->rdwr_pin, 1);
+        ret = spi_read(spi_dev, (u8 *)data, sizeof(*data));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI data read error\n");
+                return ret;
+        }
+
+        *data = be16_to_cpu(*data);
+
+        return ret;
+}
+
+static int ad7816_spi_write(struct ad7816_chip_info *chip, u8 data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        int ret = 0;
+
+        gpio_set_value(chip->rdwr_pin, 1);
+        gpio_set_value(chip->rdwr_pin, 0);
+        ret = spi_write(spi_dev, &data, sizeof(data));
+        if (ret < 0)
+                dev_err(&spi_dev->dev, "SPI oti data write error\n");
+
+        return ret;
+}
+
+static ssize_t ad7816_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+
+        if (chip->mode)
+                return sprintf(buf, "power-save\n");
+        else
+                return sprintf(buf, "full\n");
+}
+
+static ssize_t ad7816_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+
+        if (strcmp(buf, "full")) {
+                gpio_set_value(chip->rdwr_pin, 1);
+                chip->mode = AD7816_FULL;
+        } else {
+                gpio_set_value(chip->rdwr_pin, 0);
+                chip->mode = AD7816_PD;
+        }
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                ad7816_show_mode,
+                ad7816_store_mode,
+                0);
+
+static ssize_t ad7816_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "full\npower-save\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, ad7816_show_available_modes, NULL, 0);
+
+static ssize_t ad7816_show_channel(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", chip->channel_id);
+}
+
+static ssize_t ad7816_store_channel(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        if (data > AD7816_CS_MAX && data != AD7816_CS_MASK) {
+                dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for %s.\n",
+                        data, chip->name);
+                return -EINVAL;
+        } else if (strcmp(chip->name, "ad7818") == 0 && data > 1) {
+                dev_err(&chip->spi_dev->dev,
+                        "Invalid channel id %lu for ad7818.\n", data);
+                return -EINVAL;
+        } else if (strcmp(chip->name, "ad7816") == 0 && data > 0) {
+                dev_err(&chip->spi_dev->dev,
+                        "Invalid channel id %lu for ad7816.\n", data);
+                return -EINVAL;
+        }
+
+        chip->channel_id = data;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(channel, S_IRUGO | S_IWUSR,
+                ad7816_show_channel,
+                ad7816_store_channel,
+                0);
+
+
+static ssize_t ad7816_show_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        s8 value;
+        int ret;
+
+        ret = ad7816_spi_read(chip, &data);
+        if (ret)
+                return -EIO;
+
+        data >>= AD7816_VALUE_OFFSET;
+
+        if (chip->channel_id == 0) {
+                value = (s8)((data >> AD7816_TEMP_FLOAT_OFFSET) - 103);
+                data &= AD7816_TEMP_FLOAT_MASK;
+                if (value < 0)
+                        data = (1 << AD7816_TEMP_FLOAT_OFFSET) - data;
+                return sprintf(buf, "%d.%.2d\n", value, data * 25);
+        } else
+                return sprintf(buf, "%u\n", data);
+}
+
+static IIO_DEVICE_ATTR(value, S_IRUGO, ad7816_show_value, NULL, 0);
+
+static ssize_t ad7816_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7816_show_name, NULL, 0);
+
+static struct attribute *ad7816_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_channel.dev_attr.attr,
+        &iio_dev_attr_value.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad7816_attribute_group = {
+        .attrs = ad7816_attributes,
+};
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_AD7816_OTI    IIO_BUFFER_EVENT_CODE(0)
+
+static void ad7816_interrupt_bh(struct work_struct *work_s)
+{
+        struct ad7816_chip_info *chip =
+                container_of(work_s, struct ad7816_chip_info, thresh_work);
+
+        enable_irq(chip->spi_dev->irq);
+
+        iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_AD7816_OTI,
+                        chip->last_timestamp);
+}
+
+static int ad7816_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(ad7816, &ad7816_interrupt);
+
+static ssize_t ad7816_show_oti(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+        int value;
+
+        if (chip->channel_id > AD7816_CS_MAX) {
+                dev_err(dev, "Invalid oti channel id %d.\n", chip->channel_id);
+                return -EINVAL;
+        } else if (chip->channel_id == 0) {
+                value = AD7816_BOUND_VALUE_MIN +
+                        (chip->oti_data[chip->channel_id] -
+                        AD7816_BOUND_VALUE_BASE);
+                return sprintf(buf, "%d\n", value);
+        } else
+                return sprintf(buf, "%u\n", chip->oti_data[chip->channel_id]);
+}
+
+static inline ssize_t ad7816_set_oti(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7816_chip_info *chip = dev_info->dev_data;
+        long value;
+        u8 data;
+        int ret;
+
+        ret = strict_strtol(buf, 10, &value);
+
+        if (chip->channel_id > AD7816_CS_MAX) {
+                dev_err(dev, "Invalid oti channel id %d.\n", chip->channel_id);
+                return -EINVAL;
+        } else if (chip->channel_id == 0) {
+                if (ret || value < AD7816_BOUND_VALUE_MIN ||
+                        value > AD7816_BOUND_VALUE_MAX)
+                        return -EINVAL;
+
+                data = (u8)(value - AD7816_BOUND_VALUE_MIN +
+                        AD7816_BOUND_VALUE_BASE);
+        } else {
+                if (ret || value < AD7816_BOUND_VALUE_BASE || value > 255)
+                        return -EINVAL;
+
+                data = (u8)value;
+        }
+
+        ret = ad7816_spi_write(chip, data);
+        if (ret)
+                return -EIO;
+
+        chip->oti_data[chip->channel_id] = data;
+
+        return len;
+}
+
+IIO_EVENT_ATTR_SH(oti, iio_event_ad7816,
+                ad7816_show_oti, ad7816_set_oti, 0);
+
+static struct attribute *ad7816_event_attributes[] = {
+        &iio_event_attr_oti.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group ad7816_event_attribute_group = {
+        .attrs = ad7816_event_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit ad7816_probe(struct spi_device *spi_dev)
+{
+        struct ad7816_chip_info *chip;
+        unsigned short *pins = spi_dev->dev.platform_data;
+        int ret = 0;
+        int i;
+
+        if (!pins) {
+                dev_err(&spi_dev->dev, "No necessary GPIO platform data.\n");
+                return -EINVAL;
+        }
+
+        chip = kzalloc(sizeof(struct ad7816_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        dev_set_drvdata(&spi_dev->dev, chip);
+
+        chip->spi_dev = spi_dev;
+        chip->name = spi_dev->modalias;
+        for (i = 0; i <= AD7816_CS_MAX; i++)
+                chip->oti_data[i] = 203;
+        chip->rdwr_pin = pins[0];
+        chip->convert_pin = pins[1];
+        chip->busy_pin = pins[2];
+
+        ret = gpio_request(chip->rdwr_pin, chip->name);
+        if (ret) {
+                dev_err(&spi_dev->dev, "Fail to request rdwr gpio PIN %d.\n",
+                        chip->rdwr_pin);
+                goto error_free_chip;
+        }
+        gpio_direction_input(chip->rdwr_pin);
+        ret = gpio_request(chip->convert_pin, chip->name);
+        if (ret) {
+                dev_err(&spi_dev->dev, "Fail to request convert gpio PIN %d.\n",
+                        chip->convert_pin);
+                goto error_free_gpio_rdwr;
+        }
+        gpio_direction_input(chip->convert_pin);
+        ret = gpio_request(chip->busy_pin, chip->name);
+        if (ret) {
+                dev_err(&spi_dev->dev, "Fail to request busy gpio PIN %d.\n",
+                        chip->busy_pin);
+                goto error_free_gpio_convert;
+        }
+        gpio_direction_input(chip->busy_pin);
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_gpio;
+        }
+
+        chip->indio_dev->dev.parent = &spi_dev->dev;
+        chip->indio_dev->attrs = &ad7816_attribute_group;
+        chip->indio_dev->event_attrs = &ad7816_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        if (spi_dev->irq) {
+                /* Only low trigger is supported in ad7816/7/8 */
+                ret = iio_register_interrupt_line(spi_dev->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_LOW,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_ad7816.
+                 * All event attributes bind to the same event handler.
+                 * So, only register event handler once.
+                 */
+                iio_add_event_to_list(&iio_event_ad7816,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, ad7816_interrupt_bh);
+        }
+
+        dev_info(&spi_dev->dev, "%s temperature sensor and ADC registered.\n",
+                         chip->name);
+
+        return 0;
+
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_gpio:
+        gpio_free(chip->busy_pin);
+error_free_gpio_convert:
+        gpio_free(chip->convert_pin);
+error_free_gpio_rdwr:
+        gpio_free(chip->rdwr_pin);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit ad7816_remove(struct spi_device *spi_dev)
+{
+        struct ad7816_chip_info *chip = dev_get_drvdata(&spi_dev->dev);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        dev_set_drvdata(&spi_dev->dev, NULL);
+        if (spi_dev->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        gpio_free(chip->busy_pin);
+        gpio_free(chip->convert_pin);
+        gpio_free(chip->rdwr_pin);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct spi_device_id ad7816_id[] = {
+        { "ad7816", 0 },
+        { "ad7817", 0 },
+        { "ad7818", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(spi, ad7816_id);
+
+static struct spi_driver ad7816_driver = {
+        .driver = {
+                .name = "ad7816",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad7816_probe,
+        .remove = __devexit_p(ad7816_remove),
+        .id_table = ad7816_id,
+};
+
+static __init int ad7816_init(void)
+{
+        return spi_register_driver(&ad7816_driver);
+}
+
+static __exit void ad7816_exit(void)
+{
+        spi_unregister_driver(&ad7816_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices AD7816/7/8 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(ad7816_init);
+module_exit(ad7816_exit);
diff --git a/drivers/staging/iio/adc/ad7887.h b/drivers/staging/iio/adc/ad7887.h
new file mode 100644
index 000000000000..8c2a218c9496
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7887.h
@@ -0,0 +1,105 @@
+/*
+ * AD7887 SPI ADC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef IIO_ADC_AD7887_H_
+#define IIO_ADC_AD7887_H_
+
+#define AD7887_REF_DIS          (1 << 5) /* on-chip reference disable */
+#define AD7887_DUAL             (1 << 4) /* dual-channel mode */
+#define AD7887_CH_AIN1          (1 << 3) /* convert on channel 1, DUAL=1 */
+#define AD7887_CH_AIN0          (0 << 3) /* convert on channel 0, DUAL=0,1 */
+#define AD7887_PM_MODE1         (0)      /* CS based shutdown */
+#define AD7887_PM_MODE2         (1)      /* full on */
+#define AD7887_PM_MODE3         (2)      /* auto shutdown after conversion */
+#define AD7887_PM_MODE4         (3)      /* standby mode */
+
+enum ad7887_channels {
+        AD7887_CH0,
+        AD7887_CH0_CH1,
+        AD7887_CH1,
+};
+
+#define RES_MASK(bits)  ((1 << (bits)) - 1) /* TODO: move this into a common header */
+
+/*
+ * TODO: struct ad7887_platform_data needs to go into include/linux/iio
+ */
+
+struct ad7887_platform_data {
+        /* External Vref voltage applied */
+        u16                             vref_mv;
+        /*
+         * AD7887:
+         * In single channel mode en_dual = flase, AIN1/Vref pins assumes its
+         * Vref function. In dual channel mode en_dual = true, AIN1 becomes the
+         * second input channel, and Vref is internally connected to Vdd.
+         */
+        bool                            en_dual;
+        /*
+         * AD7887:
+         * use_onchip_ref = true, the Vref is internally connected to the 2.500V
+         * Voltage reference. If use_onchip_ref = false, the reference voltage
+         * is supplied by AIN1/Vref
+         */
+        bool                            use_onchip_ref;
+};
+
+struct ad7887_chip_info {
+        u8                              bits;           /* number of ADC bits */
+        u8                              storagebits;    /* number of bits read from the ADC */
+        u8                              left_shift;     /* number of bits the sample must be shifted */
+        char                            sign;           /* [s]igned or [u]nsigned */
+        u16                             int_vref_mv;    /* internal reference voltage */
+};
+
+struct ad7887_state {
+        struct iio_dev                  *indio_dev;
+        struct spi_device               *spi;
+        const struct ad7887_chip_info   *chip_info;
+        struct regulator                *reg;
+        struct work_struct              poll_work;
+        atomic_t                        protect_ring;
+        u16                             int_vref_mv;
+        bool                            en_dual;
+        struct spi_transfer             xfer[4];
+        struct spi_message              msg[3];
+        struct spi_message              *ring_msg;
+        unsigned char                   tx_cmd_buf[8];
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+
+        unsigned char                   data[4] ____cacheline_aligned;
+};
+
+enum ad7887_supported_device_ids {
+        ID_AD7887
+};
+
+#ifdef CONFIG_IIO_RING_BUFFER
+int ad7887_scan_from_ring(struct ad7887_state *st, long mask);
+int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev);
+void ad7887_ring_cleanup(struct iio_dev *indio_dev);
+#else /* CONFIG_IIO_RING_BUFFER */
+static inline int ad7887_scan_from_ring(struct ad7887_state *st, long mask)
+{
+        return 0;
+}
+
+static inline int
+ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void ad7887_ring_cleanup(struct iio_dev *indio_dev)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* IIO_ADC_AD7887_H_ */
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
new file mode 100644
index 000000000000..685908995d49
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -0,0 +1,305 @@
+/*
+ * AD7887 SPI ADC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../ring_generic.h"
+#include "adc.h"
+
+#include "ad7887.h"
+
+static int ad7887_scan_direct(struct ad7887_state *st, unsigned ch)
+{
+        int ret = spi_sync(st->spi, &st->msg[ch]);
+        if (ret)
+                return ret;
+
+        return (st->data[(ch * 2)] << 8) | st->data[(ch * 2) + 1];
+}
+
+static ssize_t ad7887_scan(struct device *dev,
+                            struct device_attribute *attr,
+                            char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7887_state *st = dev_info->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+
+        mutex_lock(&dev_info->mlock);
+        if (iio_ring_enabled(dev_info))
+                ret = ad7887_scan_from_ring(st, 1 << this_attr->address);
+        else
+                ret = ad7887_scan_direct(st, this_attr->address);
+        mutex_unlock(&dev_info->mlock);
+
+        if (ret < 0)
+                return ret;
+
+        return sprintf(buf, "%d\n", (ret >> st->chip_info->left_shift) &
+                       RES_MASK(st->chip_info->bits));
+}
+static IIO_DEV_ATTR_IN_RAW(0, ad7887_scan, 0);
+static IIO_DEV_ATTR_IN_RAW(1, ad7887_scan, 1);
+
+static ssize_t ad7887_show_scale(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        /* Driver currently only support internal vref */
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7887_state *st = iio_dev_get_devdata(dev_info);
+        /* Corresponds to Vref / 2^(bits) */
+        unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
+
+        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+}
+static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7887_show_scale, NULL, 0);
+
+static ssize_t ad7887_show_name(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7887_state *st = iio_dev_get_devdata(dev_info);
+
+        return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name);
+}
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad7887_show_name, NULL, 0);
+
+static struct attribute *ad7887_attributes[] = {
+        &iio_dev_attr_in0_raw.dev_attr.attr,
+        &iio_dev_attr_in1_raw.dev_attr.attr,
+        &iio_dev_attr_in_scale.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static mode_t ad7887_attr_is_visible(struct kobject *kobj,
+                                     struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad7887_state *st = iio_dev_get_devdata(dev_info);
+
+        mode_t mode = attr->mode;
+
+        if ((attr == &iio_dev_attr_in1_raw.dev_attr.attr) && !st->en_dual)
+                        mode = 0;
+
+        return mode;
+}
+
+static const struct attribute_group ad7887_attribute_group = {
+        .attrs = ad7887_attributes,
+        .is_visible = ad7887_attr_is_visible,
+};
+
+static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
+        /*
+         * More devices added in future
+         */
+        [ID_AD7887] = {
+                .bits = 12,
+                .storagebits = 16,
+                .left_shift = 0,
+                .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+                .int_vref_mv = 2500,
+        },
+};
+
+static int __devinit ad7887_probe(struct spi_device *spi)
+{
+        struct ad7887_platform_data *pdata = spi->dev.platform_data;
+        struct ad7887_state *st;
+        int ret, voltage_uv = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        st->reg = regulator_get(&spi->dev, "vcc");
+        if (!IS_ERR(st->reg)) {
+                ret = regulator_enable(st->reg);
+                if (ret)
+                        goto error_put_reg;
+
+                voltage_uv = regulator_get_voltage(st->reg);
+        }
+
+        st->chip_info =
+                &ad7887_chip_info_tbl[spi_get_device_id(spi)->driver_data];
+
+        spi_set_drvdata(spi, st);
+
+        atomic_set(&st->protect_ring, 0);
+        st->spi = spi;
+
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_disable_reg;
+        }
+
+        /* Estabilish that the iio_dev is a child of the spi device */
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->attrs = &ad7887_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        /* Setup default message */
+
+        st->tx_cmd_buf[0] = AD7887_CH_AIN0 | AD7887_PM_MODE4 |
+                            ((pdata && pdata->use_onchip_ref) ?
+                            0 : AD7887_REF_DIS);
+
+        st->xfer[0].rx_buf = &st->data[0];
+        st->xfer[0].tx_buf = &st->tx_cmd_buf[0];
+        st->xfer[0].len = 2;
+
+        spi_message_init(&st->msg[AD7887_CH0]);
+        spi_message_add_tail(&st->xfer[0], &st->msg[AD7887_CH0]);
+
+        if (pdata && pdata->en_dual) {
+                st->tx_cmd_buf[0] |= AD7887_DUAL | AD7887_REF_DIS;
+
+                st->tx_cmd_buf[2] = AD7887_CH_AIN1 | AD7887_DUAL |
+                                    AD7887_REF_DIS | AD7887_PM_MODE4;
+                st->tx_cmd_buf[4] = AD7887_CH_AIN0 | AD7887_DUAL |
+                                    AD7887_REF_DIS | AD7887_PM_MODE4;
+                st->tx_cmd_buf[6] = AD7887_CH_AIN1 | AD7887_DUAL |
+                                    AD7887_REF_DIS | AD7887_PM_MODE4;
+
+                st->xfer[1].rx_buf = &st->data[0];
+                st->xfer[1].tx_buf = &st->tx_cmd_buf[2];
+                st->xfer[1].len = 2;
+
+                st->xfer[2].rx_buf = &st->data[2];
+                st->xfer[2].tx_buf = &st->tx_cmd_buf[4];
+                st->xfer[2].len = 2;
+
+                spi_message_init(&st->msg[AD7887_CH0_CH1]);
+                spi_message_add_tail(&st->xfer[1], &st->msg[AD7887_CH0_CH1]);
+                spi_message_add_tail(&st->xfer[2], &st->msg[AD7887_CH0_CH1]);
+
+                st->xfer[3].rx_buf = &st->data[0];
+                st->xfer[3].tx_buf = &st->tx_cmd_buf[6];
+                st->xfer[3].len = 2;
+
+                spi_message_init(&st->msg[AD7887_CH1]);
+                spi_message_add_tail(&st->xfer[3], &st->msg[AD7887_CH1]);
+
+                st->en_dual = true;
+
+                if (pdata && pdata->vref_mv)
+                        st->int_vref_mv = pdata->vref_mv;
+                else if (voltage_uv)
+                        st->int_vref_mv = voltage_uv / 1000;
+                else
+                        dev_warn(&spi->dev, "reference voltage unspecified\n");
+
+        } else {
+                if (pdata && pdata->vref_mv)
+                        st->int_vref_mv = pdata->vref_mv;
+                else if (pdata && pdata->use_onchip_ref)
+                        st->int_vref_mv = st->chip_info->int_vref_mv;
+                else
+                        dev_warn(&spi->dev, "reference voltage unspecified\n");
+        }
+
+
+        ret = ad7887_register_ring_funcs_and_init(st->indio_dev);
+        if (ret)
+                goto error_free_device;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_free_device;
+
+        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
+        if (ret)
+                goto error_cleanup_ring;
+        return 0;
+
+error_cleanup_ring:
+        ad7887_ring_cleanup(st->indio_dev);
+        iio_device_unregister(st->indio_dev);
+error_free_device:
+        iio_free_device(st->indio_dev);
+error_disable_reg:
+        if (!IS_ERR(st->reg))
+                regulator_disable(st->reg);
+error_put_reg:
+        if (!IS_ERR(st->reg))
+                regulator_put(st->reg);
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int ad7887_remove(struct spi_device *spi)
+{
+        struct ad7887_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+        iio_ring_buffer_unregister(indio_dev->ring);
+        ad7887_ring_cleanup(indio_dev);
+        iio_device_unregister(indio_dev);
+        if (!IS_ERR(st->reg)) {
+                regulator_disable(st->reg);
+                regulator_put(st->reg);
+        }
+        kfree(st);
+        return 0;
+}
+
+static const struct spi_device_id ad7887_id[] = {
+        {"ad7887", ID_AD7887},
+        {}
+};
+
+static struct spi_driver ad7887_driver = {
+        .driver = {
+                .name   = "ad7887",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ad7887_probe,
+        .remove         = __devexit_p(ad7887_remove),
+        .id_table       = ad7887_id,
+};
+
+static int __init ad7887_init(void)
+{
+        return spi_register_driver(&ad7887_driver);
+}
+module_init(ad7887_init);
+
+static void __exit ad7887_exit(void)
+{
+        spi_unregister_driver(&ad7887_driver);
+}
+module_exit(ad7887_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("Analog Devices AD7887 ADC");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad7887");
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
new file mode 100644
index 000000000000..6b9cb1f95a1e
--- /dev/null
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2010 Analog Devices Inc.
+ * Copyright (C) 2008 Jonathan Cameron
+ *
+ * Licensed under the GPL-2 or later.
+ *
+ * ad7887_ring.c
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+
+#include "../iio.h"
+#include "../ring_generic.h"
+#include "../ring_sw.h"
+#include "../trigger.h"
+#include "../sysfs.h"
+
+#include "ad7887.h"
+
+static IIO_SCAN_EL_C(in0, 0, 0, NULL);
+static IIO_SCAN_EL_C(in1, 1, 0, NULL);
+
+static ssize_t ad7887_show_type(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = ring->indio_dev;
+        struct ad7887_state *st = indio_dev->dev_data;
+
+        return sprintf(buf, "%c%d/%d>>%d\n", st->chip_info->sign,
+                       st->chip_info->bits, st->chip_info->storagebits,
+                       st->chip_info->left_shift);
+}
+static IIO_DEVICE_ATTR(in_type, S_IRUGO, ad7887_show_type, NULL, 0);
+
+static struct attribute *ad7887_scan_el_attrs[] = {
+        &iio_scan_el_in0.dev_attr.attr,
+        &iio_const_attr_in0_index.dev_attr.attr,
+        &iio_scan_el_in1.dev_attr.attr,
+        &iio_const_attr_in1_index.dev_attr.attr,
+        &iio_dev_attr_in_type.dev_attr.attr,
+        NULL,
+};
+
+static mode_t ad7887_scan_el_attr_is_visible(struct kobject *kobj,
+                                     struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = ring->indio_dev;
+        struct ad7887_state *st = indio_dev->dev_data;
+
+        mode_t mode = attr->mode;
+
+        if ((attr == &iio_scan_el_in1.dev_attr.attr) ||
+                (attr == &iio_const_attr_in1_index.dev_attr.attr))
+                if (!st->en_dual)
+                        mode = 0;
+
+        return mode;
+}
+
+static struct attribute_group ad7887_scan_el_group = {
+        .name = "scan_elements",
+        .attrs = ad7887_scan_el_attrs,
+        .is_visible = ad7887_scan_el_attr_is_visible,
+};
+
+int ad7887_scan_from_ring(struct ad7887_state *st, long mask)
+{
+        struct iio_ring_buffer *ring = st->indio_dev->ring;
+        int count = 0, ret;
+        u16 *ring_data;
+
+        if (!(ring->scan_mask & mask)) {
+                ret = -EBUSY;
+                goto error_ret;
+        }
+
+        ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL);
+        if (ring_data == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        ret = ring->access.read_last(ring, (u8 *) ring_data);
+        if (ret)
+                goto error_free_ring_data;
+
+        /* for single channel scan the result is stored with zero offset */
+        if ((ring->scan_mask == ((1 << 1) | (1 << 0))) && (mask == (1 << 1)))
+                count = 1;
+
+        ret = be16_to_cpu(ring_data[count]);
+
+error_free_ring_data:
+        kfree(ring_data);
+error_ret:
+        return ret;
+}
+
+/**
+ * ad7887_ring_preenable() setup the parameters of the ring before enabling
+ *
+ * The complex nature of the setting of the nuber of bytes per datum is due
+ * to this driver currently ensuring that the timestamp is stored at an 8
+ * byte boundary.
+ **/
+static int ad7887_ring_preenable(struct iio_dev *indio_dev)
+{
+        struct ad7887_state *st = indio_dev->dev_data;
+        struct iio_ring_buffer *ring = indio_dev->ring;
+        size_t d_size;
+
+        if (indio_dev->ring->access.set_bytes_per_datum) {
+                d_size = st->chip_info->storagebits / 8 + sizeof(s64);
+                if (d_size % 8)
+                        d_size += 8 - (d_size % 8);
+                indio_dev->ring->access.set_bytes_per_datum(indio_dev->ring,
+                                                            d_size);
+        }
+
+        switch (ring->scan_mask) {
+        case (1 << 0):
+                st->ring_msg = &st->msg[AD7887_CH0];
+                break;
+        case (1 << 1):
+                st->ring_msg = &st->msg[AD7887_CH1];
+                /* Dummy read: push CH1 setting down to hardware */
+                spi_sync(st->spi, st->ring_msg);
+                break;
+        case ((1 << 1) | (1 << 0)):
+                st->ring_msg = &st->msg[AD7887_CH0_CH1];
+                break;
+        }
+
+        return 0;
+}
+
+static int ad7887_ring_postdisable(struct iio_dev *indio_dev)
+{
+        struct ad7887_state *st = indio_dev->dev_data;
+
+        /* dummy read: restore default CH0 settin */
+        return spi_sync(st->spi, &st->msg[AD7887_CH0]);
+}
+
+/**
+ * ad7887_poll_func_th() th of trigger launched polling to ring buffer
+ *
+ * As sampling only occurs on spi comms occuring, leave timestamping until
+ * then.  Some triggers will generate their own time stamp.  Currently
+ * there is no way of notifying them when no one cares.
+ **/
+static void ad7887_poll_func_th(struct iio_dev *indio_dev, s64 time)
+{
+        struct ad7887_state *st = indio_dev->dev_data;
+
+        schedule_work(&st->poll_work);
+        return;
+}
+/**
+ * ad7887_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 ad7887_poll_bh_to_ring(struct work_struct *work_s)
+{
+        struct ad7887_state *st = container_of(work_s, struct ad7887_state,
+                                                  poll_work);
+        struct iio_dev *indio_dev = st->indio_dev;
+        struct iio_sw_ring_buffer *sw_ring = iio_to_sw_ring(indio_dev->ring);
+        struct iio_ring_buffer *ring = indio_dev->ring;
+        s64 time_ns;
+        __u8 *buf;
+        int b_sent;
+        size_t d_size;
+
+        unsigned int bytes = ring->scan_count * st->chip_info->storagebits / 8;
+
+        /* Ensure the timestamp is 8 byte aligned */
+        d_size = bytes + sizeof(s64);
+        if (d_size % sizeof(s64))
+                d_size += sizeof(s64) - (d_size % sizeof(s64));
+
+        /* Ensure only one copy of this function running at a time */
+        if (atomic_inc_return(&st->protect_ring) > 1)
+                return;
+
+        buf = kzalloc(d_size, GFP_KERNEL);
+        if (buf == NULL)
+                return;
+
+        b_sent = spi_sync(st->spi, st->ring_msg);
+        if (b_sent)
+                goto done;
+
+        time_ns = iio_get_time_ns();
+
+        memcpy(buf, st->data, bytes);
+        memcpy(buf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
+
+        indio_dev->ring->access.store_to(&sw_ring->buf, buf, time_ns);
+done:
+        kfree(buf);
+        atomic_dec(&st->protect_ring);
+}
+
+int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+{
+        struct ad7887_state *st = indio_dev->dev_data;
+        int ret;
+
+        indio_dev->ring = iio_sw_rb_allocate(indio_dev);
+        if (!indio_dev->ring) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        /* Effectively select the ring buffer implementation */
+        iio_ring_sw_register_funcs(&indio_dev->ring->access);
+        ret = iio_alloc_pollfunc(indio_dev, NULL, &ad7887_poll_func_th);
+        if (ret)
+                goto error_deallocate_sw_rb;
+
+        /* Ring buffer functions - here trigger setup related */
+
+        indio_dev->ring->preenable = &ad7887_ring_preenable;
+        indio_dev->ring->postenable = &iio_triggered_ring_postenable;
+        indio_dev->ring->predisable = &iio_triggered_ring_predisable;
+        indio_dev->ring->postdisable = &ad7887_ring_postdisable;
+        indio_dev->ring->scan_el_attrs = &ad7887_scan_el_group;
+
+        INIT_WORK(&st->poll_work, &ad7887_poll_bh_to_ring);
+
+        /* Flag that polled ring buffering is possible */
+        indio_dev->modes |= INDIO_RING_TRIGGERED;
+        return 0;
+error_deallocate_sw_rb:
+        iio_sw_rb_free(indio_dev->ring);
+error_ret:
+        return ret;
+}
+
+void ad7887_ring_cleanup(struct iio_dev *indio_dev)
+{
+        /* ensure that the trigger has been detached */
+        if (indio_dev->trig) {
+                iio_put_trigger(indio_dev->trig);
+                iio_trigger_dettach_poll_func(indio_dev->trig,
+                                              indio_dev->pollfunc);
+        }
+        kfree(indio_dev->pollfunc);
+        iio_sw_rb_free(indio_dev->ring);
+}
diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c
new file mode 100644
index 000000000000..771a409ee94c
--- /dev/null
+++ b/drivers/staging/iio/adc/adt7310.c
@@ -0,0 +1,952 @@
+/*
+ * ADT7310 digital temperature sensor driver supporting ADT7310
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * ADT7310 registers definition
+ */
+
+#define ADT7310_STATUS                  0
+#define ADT7310_CONFIG                  1
+#define ADT7310_TEMPERATURE             2
+#define ADT7310_ID                      3
+#define ADT7310_T_CRIT                  4
+#define ADT7310_T_HYST                  5
+#define ADT7310_T_ALARM_HIGH            6
+#define ADT7310_T_ALARM_LOW             7
+
+/*
+ * ADT7310 status
+ */
+#define ADT7310_STAT_T_LOW              0x10
+#define ADT7310_STAT_T_HIGH             0x20
+#define ADT7310_STAT_T_CRIT             0x40
+#define ADT7310_STAT_NOT_RDY            0x80
+
+/*
+ * ADT7310 config
+ */
+#define ADT7310_FAULT_QUEUE_MASK        0x3
+#define ADT7310_CT_POLARITY             0x4
+#define ADT7310_INT_POLARITY            0x8
+#define ADT7310_EVENT_MODE              0x10
+#define ADT7310_MODE_MASK               0x60
+#define ADT7310_ONESHOT                 0x20
+#define ADT7310_SPS                     0x40
+#define ADT7310_PD                      0x60
+#define ADT7310_RESOLUTION              0x80
+
+/*
+ * ADT7310 masks
+ */
+#define ADT7310_T16_VALUE_SIGN                  0x8000
+#define ADT7310_T16_VALUE_FLOAT_OFFSET          7
+#define ADT7310_T16_VALUE_FLOAT_MASK            0x7F
+#define ADT7310_T13_VALUE_SIGN                  0x1000
+#define ADT7310_T13_VALUE_OFFSET                3
+#define ADT7310_T13_VALUE_FLOAT_OFFSET          4
+#define ADT7310_T13_VALUE_FLOAT_MASK            0xF
+#define ADT7310_T_HYST_MASK                     0xF
+#define ADT7310_DEVICE_ID_MASK                  0x7
+#define ADT7310_MANUFACTORY_ID_MASK             0xF8
+#define ADT7310_MANUFACTORY_ID_OFFSET           3
+
+
+#define ADT7310_CMD_REG_MASK                    0x28
+#define ADT7310_CMD_REG_OFFSET                  3
+#define ADT7310_CMD_READ                        0x40
+#define ADT7310_CMD_CON_READ                    0x4
+
+#define ADT7310_IRQS                            2
+
+/*
+ * struct adt7310_chip_info - chip specifc information
+ */
+
+struct adt7310_chip_info {
+        const char *name;
+        struct spi_device *spi_dev;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        s64 last_timestamp;
+        u8  config;
+};
+
+/*
+ * adt7310 register access by SPI
+ */
+
+static int adt7310_spi_read_word(struct adt7310_chip_info *chip, u8 reg, u16 *data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        u8 command = (reg << ADT7310_CMD_REG_OFFSET) & ADT7310_CMD_REG_MASK;
+        int ret = 0;
+
+        command |= ADT7310_CMD_READ;
+        ret = spi_write(spi_dev, &command, sizeof(command));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write command error\n");
+                return ret;
+        }
+
+        ret = spi_read(spi_dev, (u8 *)data, sizeof(*data));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI read word error\n");
+                return ret;
+        }
+
+        *data = be16_to_cpu(*data);
+
+        return 0;
+}
+
+static int adt7310_spi_write_word(struct adt7310_chip_info *chip, u8 reg, u16 data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        u8 buf[3];
+        int ret = 0;
+
+        buf[0] = (reg << ADT7310_CMD_REG_OFFSET) & ADT7310_CMD_REG_MASK;
+        buf[1] = (u8)(data >> 8);
+        buf[2] = (u8)(data & 0xFF);
+
+        ret = spi_write(spi_dev, buf, 3);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write word error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int adt7310_spi_read_byte(struct adt7310_chip_info *chip, u8 reg, u8 *data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        u8 command = (reg << ADT7310_CMD_REG_OFFSET) & ADT7310_CMD_REG_MASK;
+        int ret = 0;
+
+        command |= ADT7310_CMD_READ;
+        ret = spi_write(spi_dev, &command, sizeof(command));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write command error\n");
+                return ret;
+        }
+
+        ret = spi_read(spi_dev, data, sizeof(*data));
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI read byte error\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int adt7310_spi_write_byte(struct adt7310_chip_info *chip, u8 reg, u8 data)
+{
+        struct spi_device *spi_dev = chip->spi_dev;
+        u8 buf[2];
+        int ret = 0;
+
+        buf[0] = (reg << ADT7310_CMD_REG_OFFSET) & ADT7310_CMD_REG_MASK;
+        buf[1] = data;
+
+        ret = spi_write(spi_dev, buf, 2);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write byte error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static ssize_t adt7310_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u8 config;
+
+        config = chip->config & ADT7310_MODE_MASK;
+
+        switch (config) {
+        case ADT7310_PD:
+                return sprintf(buf, "power-down\n");
+        case ADT7310_ONESHOT:
+                return sprintf(buf, "one-shot\n");
+        case ADT7310_SPS:
+                return sprintf(buf, "sps\n");
+        default:
+                return sprintf(buf, "full\n");
+        }
+}
+
+static ssize_t adt7310_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u16 config;
+        int ret;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & (~ADT7310_MODE_MASK);
+        if (strcmp(buf, "power-down"))
+                config |= ADT7310_PD;
+        else if (strcmp(buf, "one-shot"))
+                config |= ADT7310_ONESHOT;
+        else if (strcmp(buf, "sps"))
+                config |= ADT7310_SPS;
+
+        ret = adt7310_spi_write_byte(chip, ADT7310_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                adt7310_show_mode,
+                adt7310_store_mode,
+                0);
+
+static ssize_t adt7310_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "full\none-shot\nsps\npower-down\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, adt7310_show_available_modes, NULL, 0);
+
+static ssize_t adt7310_show_resolution(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        int ret;
+        int bits;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        if (chip->config & ADT7310_RESOLUTION)
+                bits = 16;
+        else
+                bits = 13;
+
+        return sprintf(buf, "%d bits\n", bits);
+}
+
+static ssize_t adt7310_store_resolution(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        u16 config;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & (~ADT7310_RESOLUTION);
+        if (data)
+                config |= ADT7310_RESOLUTION;
+
+        ret = adt7310_spi_write_byte(chip, ADT7310_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(resolution, S_IRUGO | S_IWUSR,
+                adt7310_show_resolution,
+                adt7310_store_resolution,
+                0);
+
+static ssize_t adt7310_show_id(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u8 id;
+        int ret;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_ID, &id);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "device id: 0x%x\nmanufactory id: 0x%x\n",
+                        id & ADT7310_DEVICE_ID_MASK,
+                        (id & ADT7310_MANUFACTORY_ID_MASK) >> ADT7310_MANUFACTORY_ID_OFFSET);
+}
+
+static IIO_DEVICE_ATTR(id, S_IRUGO | S_IWUSR,
+                adt7310_show_id,
+                NULL,
+                0);
+
+static ssize_t adt7310_convert_temperature(struct adt7310_chip_info *chip,
+                u16 data, char *buf)
+{
+        char sign = ' ';
+
+        if (chip->config & ADT7310_RESOLUTION) {
+                if (data & ADT7310_T16_VALUE_SIGN) {
+                        /* convert supplement to positive value */
+                        data = (u16)((ADT7310_T16_VALUE_SIGN << 1) - (u32)data);
+                        sign = '-';
+                }
+                return sprintf(buf, "%c%d.%.7d\n", sign,
+                                (data >> ADT7310_T16_VALUE_FLOAT_OFFSET),
+                                (data & ADT7310_T16_VALUE_FLOAT_MASK) * 78125);
+        } else {
+                if (data & ADT7310_T13_VALUE_SIGN) {
+                        /* convert supplement to positive value */
+                        data >>= ADT7310_T13_VALUE_OFFSET;
+                        data = (ADT7310_T13_VALUE_SIGN << 1) - data;
+                        sign = '-';
+                }
+                return sprintf(buf, "%c%d.%.4d\n", sign,
+                                (data >> ADT7310_T13_VALUE_FLOAT_OFFSET),
+                                (data & ADT7310_T13_VALUE_FLOAT_MASK) * 625);
+        }
+}
+
+static ssize_t adt7310_show_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u8 status;
+        u16 data;
+        int ret, i = 0;
+
+        do {
+                ret = adt7310_spi_read_byte(chip, ADT7310_STATUS, &status);
+                if (ret)
+                        return -EIO;
+                i++;
+                if (i == 10000)
+                        return -EIO;
+        } while (status & ADT7310_STAT_NOT_RDY);
+
+        ret = adt7310_spi_read_word(chip, ADT7310_TEMPERATURE, &data);
+        if (ret)
+                return -EIO;
+
+        return adt7310_convert_temperature(chip, data, buf);
+}
+
+static IIO_DEVICE_ATTR(value, S_IRUGO, adt7310_show_value, NULL, 0);
+
+static ssize_t adt7310_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, adt7310_show_name, NULL, 0);
+
+static struct attribute *adt7310_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_resolution.dev_attr.attr,
+        &iio_dev_attr_id.dev_attr.attr,
+        &iio_dev_attr_value.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group adt7310_attribute_group = {
+        .attrs = adt7310_attributes,
+};
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_ADT7310_ABOVE_ALARM    IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_ADT7310_BELLOW_ALARM   IIO_BUFFER_EVENT_CODE(1)
+#define IIO_EVENT_CODE_ADT7310_ABOVE_CRIT     IIO_BUFFER_EVENT_CODE(2)
+
+static void adt7310_interrupt_bh(struct work_struct *work_s)
+{
+        struct adt7310_chip_info *chip =
+                container_of(work_s, struct adt7310_chip_info, thresh_work);
+        u8 status;
+
+        if (adt7310_spi_read_byte(chip, ADT7310_STATUS, &status))
+                return;
+
+        if (status & ADT7310_STAT_T_HIGH)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7310_ABOVE_ALARM,
+                        chip->last_timestamp);
+        if (status & ADT7310_STAT_T_LOW)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7310_BELLOW_ALARM,
+                        chip->last_timestamp);
+        if (status & ADT7310_STAT_T_CRIT)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7310_ABOVE_CRIT,
+                        chip->last_timestamp);
+}
+
+static int adt7310_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(adt7310, &adt7310_interrupt);
+IIO_EVENT_SH(adt7310_ct, &adt7310_interrupt);
+
+static ssize_t adt7310_show_event_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        if (chip->config & ADT7310_EVENT_MODE)
+                return sprintf(buf, "interrupt\n");
+        else
+                return sprintf(buf, "comparator\n");
+}
+
+static ssize_t adt7310_set_event_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u16 config;
+        int ret;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config &= ~ADT7310_EVENT_MODE;
+        if (strcmp(buf, "comparator") != 0)
+                config |= ADT7310_EVENT_MODE;
+
+        ret = adt7310_spi_write_byte(chip, ADT7310_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return len;
+}
+
+static ssize_t adt7310_show_available_event_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "comparator\ninterrupt\n");
+}
+
+static ssize_t adt7310_show_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", chip->config & ADT7310_FAULT_QUEUE_MASK);
+}
+
+static ssize_t adt7310_set_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+        u8 config;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret || data > 3)
+                return -EINVAL;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT7310_FAULT_QUEUE_MASK;
+        config |= data;
+        ret = adt7310_spi_write_byte(chip, ADT7310_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return len;
+}
+
+static inline ssize_t adt7310_show_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        int ret;
+
+        ret = adt7310_spi_read_word(chip, bound_reg, &data);
+        if (ret)
+                return -EIO;
+
+        return adt7310_convert_temperature(chip, data, buf);
+}
+
+static inline ssize_t adt7310_set_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        long tmp1, tmp2;
+        u16 data;
+        char *pos;
+        int ret;
+
+        pos = strchr(buf, '.');
+
+        ret = strict_strtol(buf, 10, &tmp1);
+
+        if (ret || tmp1 > 127 || tmp1 < -128)
+                return -EINVAL;
+
+        if (pos) {
+                len = strlen(pos);
+
+                if (chip->config & ADT7310_RESOLUTION) {
+                        if (len > ADT7310_T16_VALUE_FLOAT_OFFSET)
+                                len = ADT7310_T16_VALUE_FLOAT_OFFSET;
+                        pos[len] = 0;
+                        ret = strict_strtol(pos, 10, &tmp2);
+
+                        if (!ret)
+                                tmp2 = (tmp2 / 78125) * 78125;
+                } else {
+                        if (len > ADT7310_T13_VALUE_FLOAT_OFFSET)
+                                len = ADT7310_T13_VALUE_FLOAT_OFFSET;
+                        pos[len] = 0;
+                        ret = strict_strtol(pos, 10, &tmp2);
+
+                        if (!ret)
+                                tmp2 = (tmp2 / 625) * 625;
+                }
+        }
+
+        if (tmp1 < 0)
+                data = (u16)(-tmp1);
+        else
+                data = (u16)tmp1;
+
+        if (chip->config & ADT7310_RESOLUTION) {
+                data = (data << ADT7310_T16_VALUE_FLOAT_OFFSET) |
+                        (tmp2 & ADT7310_T16_VALUE_FLOAT_MASK);
+
+                if (tmp1 < 0)
+                        /* convert positive value to supplyment */
+                        data = (u16)((ADT7310_T16_VALUE_SIGN << 1) - (u32)data);
+        } else {
+                data = (data << ADT7310_T13_VALUE_FLOAT_OFFSET) |
+                        (tmp2 & ADT7310_T13_VALUE_FLOAT_MASK);
+
+                if (tmp1 < 0)
+                        /* convert positive value to supplyment */
+                        data = (ADT7310_T13_VALUE_SIGN << 1) - data;
+                data <<= ADT7310_T13_VALUE_OFFSET;
+        }
+
+        ret = adt7310_spi_write_word(chip, bound_reg, data);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static ssize_t adt7310_show_t_alarm_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7310_show_t_bound(dev, attr,
+                        ADT7310_T_ALARM_HIGH, buf);
+}
+
+static inline ssize_t adt7310_set_t_alarm_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7310_set_t_bound(dev, attr,
+                        ADT7310_T_ALARM_HIGH, buf, len);
+}
+
+static ssize_t adt7310_show_t_alarm_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7310_show_t_bound(dev, attr,
+                        ADT7310_T_ALARM_LOW, buf);
+}
+
+static inline ssize_t adt7310_set_t_alarm_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7310_set_t_bound(dev, attr,
+                        ADT7310_T_ALARM_LOW, buf, len);
+}
+
+static ssize_t adt7310_show_t_crit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7310_show_t_bound(dev, attr,
+                        ADT7310_T_CRIT, buf);
+}
+
+static inline ssize_t adt7310_set_t_crit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7310_set_t_bound(dev, attr,
+                        ADT7310_T_CRIT, buf, len);
+}
+
+static ssize_t adt7310_show_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        int ret;
+        u8 t_hyst;
+
+        ret = adt7310_spi_read_byte(chip, ADT7310_T_HYST, &t_hyst);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", t_hyst & ADT7310_T_HYST_MASK);
+}
+
+static inline ssize_t adt7310_set_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7310_chip_info *chip = dev_info->dev_data;
+        int ret;
+        unsigned long data;
+        u8 t_hyst;
+
+        ret = strict_strtol(buf, 10, &data);
+
+        if (ret || data > ADT7310_T_HYST_MASK)
+                return -EINVAL;
+
+        t_hyst = (u8)data;
+
+        ret = adt7310_spi_write_byte(chip, ADT7310_T_HYST, t_hyst);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+IIO_EVENT_ATTR_SH(event_mode, iio_event_adt7310,
+                adt7310_show_event_mode, adt7310_set_event_mode, 0);
+IIO_EVENT_ATTR_SH(available_event_modes, iio_event_adt7310,
+                adt7310_show_available_event_modes, NULL, 0);
+IIO_EVENT_ATTR_SH(fault_queue, iio_event_adt7310,
+                adt7310_show_fault_queue, adt7310_set_fault_queue, 0);
+IIO_EVENT_ATTR_SH(t_alarm_high, iio_event_adt7310,
+                adt7310_show_t_alarm_high, adt7310_set_t_alarm_high, 0);
+IIO_EVENT_ATTR_SH(t_alarm_low, iio_event_adt7310,
+                adt7310_show_t_alarm_low, adt7310_set_t_alarm_low, 0);
+IIO_EVENT_ATTR_SH(t_crit, iio_event_adt7310_ct,
+                adt7310_show_t_crit, adt7310_set_t_crit, 0);
+IIO_EVENT_ATTR_SH(t_hyst, iio_event_adt7310,
+                adt7310_show_t_hyst, adt7310_set_t_hyst, 0);
+
+static struct attribute *adt7310_event_int_attributes[] = {
+        &iio_event_attr_event_mode.dev_attr.attr,
+        &iio_event_attr_available_event_modes.dev_attr.attr,
+        &iio_event_attr_fault_queue.dev_attr.attr,
+        &iio_event_attr_t_alarm_high.dev_attr.attr,
+        &iio_event_attr_t_alarm_low.dev_attr.attr,
+        &iio_event_attr_t_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute *adt7310_event_ct_attributes[] = {
+        &iio_event_attr_event_mode.dev_attr.attr,
+        &iio_event_attr_available_event_modes.dev_attr.attr,
+        &iio_event_attr_fault_queue.dev_attr.attr,
+        &iio_event_attr_t_crit.dev_attr.attr,
+        &iio_event_attr_t_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adt7310_event_attribute_group[ADT7310_IRQS] = {
+        {
+                .attrs = adt7310_event_int_attributes,
+        },
+        {
+                .attrs = adt7310_event_ct_attributes,
+        }
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit adt7310_probe(struct spi_device *spi_dev)
+{
+        struct adt7310_chip_info *chip;
+        int ret = 0;
+        unsigned long *adt7310_platform_data = spi_dev->dev.platform_data;
+        unsigned long irq_flags;
+
+        chip = kzalloc(sizeof(struct adt7310_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        dev_set_drvdata(&spi_dev->dev, chip);
+
+        chip->spi_dev = spi_dev;
+        chip->name = spi_dev->modalias;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = &spi_dev->dev;
+        chip->indio_dev->attrs = &adt7310_attribute_group;
+        chip->indio_dev->event_attrs = adt7310_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = ADT7310_IRQS;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        /* CT critcal temperature event. line 0 */
+        if (spi_dev->irq) {
+                if (adt7310_platform_data[2])
+                        irq_flags = adt7310_platform_data[2];
+                else
+                        irq_flags = IRQF_TRIGGER_LOW;
+                ret = iio_register_interrupt_line(spi_dev->irq,
+                                chip->indio_dev,
+                                0,
+                                irq_flags,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_adt7310.
+                 * All event attributes bind to the same event handler.
+                 * One event handler can only be added to one event list.
+                 */
+                iio_add_event_to_list(&iio_event_adt7310,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+        }
+
+        /* INT bound temperature alarm event. line 1 */
+        if (adt7310_platform_data[0]) {
+                ret = iio_register_interrupt_line(adt7310_platform_data[0],
+                                chip->indio_dev,
+                                1,
+                                adt7310_platform_data[1],
+                                chip->name);
+                if (ret)
+                        goto error_unreg_ct_irq;
+
+                /*
+                 * The event handler list element refer to iio_event_adt7310.
+                 * All event attributes bind to the same event handler.
+                 * One event handler can only be added to one event list.
+                 */
+                iio_add_event_to_list(&iio_event_adt7310_ct,
+                                &chip->indio_dev->interrupts[1]->ev_list);
+        }
+
+        if (spi_dev->irq && adt7310_platform_data[0]) {
+                INIT_WORK(&chip->thresh_work, adt7310_interrupt_bh);
+
+                ret = adt7310_spi_read_byte(chip, ADT7310_CONFIG, &chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_int_irq;
+                }
+
+                /* set irq polarity low level */
+                chip->config &= ~ADT7310_CT_POLARITY;
+
+                if (adt7310_platform_data[1] & IRQF_TRIGGER_HIGH)
+                        chip->config |= ADT7310_INT_POLARITY;
+                else
+                        chip->config &= ~ADT7310_INT_POLARITY;
+
+                ret = adt7310_spi_write_byte(chip, ADT7310_CONFIG, chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_int_irq;
+                }
+        }
+
+        dev_info(&spi_dev->dev, "%s temperature sensor registered.\n",
+                        chip->name);
+
+        return 0;
+
+error_unreg_int_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 1);
+error_unreg_ct_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 0);
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit adt7310_remove(struct spi_device *spi_dev)
+{
+        struct adt7310_chip_info *chip = dev_get_drvdata(&spi_dev->dev);
+        struct iio_dev *indio_dev = chip->indio_dev;
+        unsigned long *adt7310_platform_data = spi_dev->dev.platform_data;
+
+        dev_set_drvdata(&spi_dev->dev, NULL);
+        if (adt7310_platform_data[0])
+                iio_unregister_interrupt_line(indio_dev, 1);
+        if (spi_dev->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct spi_device_id adt7310_id[] = {
+        { "adt7310", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(spi, adt7310_id);
+
+static struct spi_driver adt7310_driver = {
+        .driver = {
+                .name = "adt7310",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe = adt7310_probe,
+        .remove = __devexit_p(adt7310_remove),
+        .id_table = adt7310_id,
+};
+
+static __init int adt7310_init(void)
+{
+        return spi_register_driver(&adt7310_driver);
+}
+
+static __exit void adt7310_exit(void)
+{
+        spi_unregister_driver(&adt7310_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices ADT7310 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(adt7310_init);
+module_exit(adt7310_exit);
diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c
new file mode 100644
index 000000000000..c345f27ec7fc
--- /dev/null
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -0,0 +1,915 @@
+/*
+ * ADT7410 digital temperature sensor driver supporting ADT7410
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * ADT7410 registers definition
+ */
+
+#define ADT7410_TEMPERATURE             0
+#define ADT7410_STATUS                  2
+#define ADT7410_CONFIG                  3
+#define ADT7410_T_ALARM_HIGH            4
+#define ADT7410_T_ALARM_LOW             6
+#define ADT7410_T_CRIT                  8
+#define ADT7410_T_HYST                  0xA
+#define ADT7410_ID                      0xB
+#define ADT7410_RESET                   0x2F
+
+/*
+ * ADT7410 status
+ */
+#define ADT7410_STAT_T_LOW              0x10
+#define ADT7410_STAT_T_HIGH             0x20
+#define ADT7410_STAT_T_CRIT             0x40
+#define ADT7410_STAT_NOT_RDY            0x80
+
+/*
+ * ADT7410 config
+ */
+#define ADT7410_FAULT_QUEUE_MASK        0x3
+#define ADT7410_CT_POLARITY             0x4
+#define ADT7410_INT_POLARITY            0x8
+#define ADT7410_EVENT_MODE              0x10
+#define ADT7410_MODE_MASK               0x60
+#define ADT7410_ONESHOT                 0x20
+#define ADT7410_SPS                     0x40
+#define ADT7410_PD                      0x60
+#define ADT7410_RESOLUTION              0x80
+
+/*
+ * ADT7410 masks
+ */
+#define ADT7410_T16_VALUE_SIGN                  0x8000
+#define ADT7410_T16_VALUE_FLOAT_OFFSET          7
+#define ADT7410_T16_VALUE_FLOAT_MASK            0x7F
+#define ADT7410_T13_VALUE_SIGN                  0x1000
+#define ADT7410_T13_VALUE_OFFSET                3
+#define ADT7410_T13_VALUE_FLOAT_OFFSET          4
+#define ADT7410_T13_VALUE_FLOAT_MASK            0xF
+#define ADT7410_T_HYST_MASK                     0xF
+#define ADT7410_DEVICE_ID_MASK                  0xF
+#define ADT7410_MANUFACTORY_ID_MASK             0xF0
+#define ADT7410_MANUFACTORY_ID_OFFSET           4
+
+#define ADT7410_IRQS                            2
+
+/*
+ * struct adt7410_chip_info - chip specifc information
+ */
+
+struct adt7410_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        s64 last_timestamp;
+        u8  config;
+};
+
+/*
+ * adt7410 register access by I2C
+ */
+
+static int adt7410_i2c_read_word(struct adt7410_chip_info *chip, u8 reg, u16 *data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_read_word_data(client, reg);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        *data = swab16((u16)ret);
+
+        return 0;
+}
+
+static int adt7410_i2c_write_word(struct adt7410_chip_info *chip, u8 reg, u16 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_write_word_data(client, reg, swab16(data));
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+static int adt7410_i2c_read_byte(struct adt7410_chip_info *chip, u8 reg, u8 *data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_read_byte_data(client, reg);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        *data = (u8)ret;
+
+        return 0;
+}
+
+static int adt7410_i2c_write_byte(struct adt7410_chip_info *chip, u8 reg, u8 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        ret = i2c_smbus_write_byte_data(client, reg, data);
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+static ssize_t adt7410_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u8 config;
+
+        config = chip->config & ADT7410_MODE_MASK;
+
+        switch (config) {
+        case ADT7410_PD:
+                return sprintf(buf, "power-down\n");
+        case ADT7410_ONESHOT:
+                return sprintf(buf, "one-shot\n");
+        case ADT7410_SPS:
+                return sprintf(buf, "sps\n");
+        default:
+                return sprintf(buf, "full\n");
+        }
+}
+
+static ssize_t adt7410_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u16 config;
+        int ret;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & (~ADT7410_MODE_MASK);
+        if (strcmp(buf, "power-down"))
+                config |= ADT7410_PD;
+        else if (strcmp(buf, "one-shot"))
+                config |= ADT7410_ONESHOT;
+        else if (strcmp(buf, "sps"))
+                config |= ADT7410_SPS;
+
+        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                adt7410_show_mode,
+                adt7410_store_mode,
+                0);
+
+static ssize_t adt7410_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "full\none-shot\nsps\npower-down\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, adt7410_show_available_modes, NULL, 0);
+
+static ssize_t adt7410_show_resolution(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        int ret;
+        int bits;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        if (chip->config & ADT7410_RESOLUTION)
+                bits = 16;
+        else
+                bits = 13;
+
+        return sprintf(buf, "%d bits\n", bits);
+}
+
+static ssize_t adt7410_store_resolution(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        u16 config;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & (~ADT7410_RESOLUTION);
+        if (data)
+                config |= ADT7410_RESOLUTION;
+
+        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(resolution, S_IRUGO | S_IWUSR,
+                adt7410_show_resolution,
+                adt7410_store_resolution,
+                0);
+
+static ssize_t adt7410_show_id(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u8 id;
+        int ret;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_ID, &id);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "device id: 0x%x\nmanufactory id: 0x%x\n",
+                        id & ADT7410_DEVICE_ID_MASK,
+                        (id & ADT7410_MANUFACTORY_ID_MASK) >> ADT7410_MANUFACTORY_ID_OFFSET);
+}
+
+static IIO_DEVICE_ATTR(id, S_IRUGO | S_IWUSR,
+                adt7410_show_id,
+                NULL,
+                0);
+
+static ssize_t adt7410_convert_temperature(struct adt7410_chip_info *chip,
+                u16 data, char *buf)
+{
+        char sign = ' ';
+
+        if (chip->config & ADT7410_RESOLUTION) {
+                if (data & ADT7410_T16_VALUE_SIGN) {
+                        /* convert supplement to positive value */
+                        data = (u16)((ADT7410_T16_VALUE_SIGN << 1) - (u32)data);
+                        sign = '-';
+                }
+                return sprintf(buf, "%c%d.%.7d\n", sign,
+                                (data >> ADT7410_T16_VALUE_FLOAT_OFFSET),
+                                (data & ADT7410_T16_VALUE_FLOAT_MASK) * 78125);
+        } else {
+                if (data & ADT7410_T13_VALUE_SIGN) {
+                        /* convert supplement to positive value */
+                        data >>= ADT7410_T13_VALUE_OFFSET;
+                        data = (ADT7410_T13_VALUE_SIGN << 1) - data;
+                        sign = '-';
+                }
+                return sprintf(buf, "%c%d.%.4d\n", sign,
+                                (data >> ADT7410_T13_VALUE_FLOAT_OFFSET),
+                                (data & ADT7410_T13_VALUE_FLOAT_MASK) * 625);
+        }
+}
+
+static ssize_t adt7410_show_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u8 status;
+        u16 data;
+        int ret, i = 0;
+
+        do {
+                ret = adt7410_i2c_read_byte(chip, ADT7410_STATUS, &status);
+                if (ret)
+                        return -EIO;
+                i++;
+                if (i == 10000)
+                        return -EIO;
+        } while (status & ADT7410_STAT_NOT_RDY);
+
+        ret = adt7410_i2c_read_word(chip, ADT7410_TEMPERATURE, &data);
+        if (ret)
+                return -EIO;
+
+        return adt7410_convert_temperature(chip, data, buf);
+}
+
+static IIO_DEVICE_ATTR(value, S_IRUGO, adt7410_show_value, NULL, 0);
+
+static ssize_t adt7410_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, adt7410_show_name, NULL, 0);
+
+static struct attribute *adt7410_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_resolution.dev_attr.attr,
+        &iio_dev_attr_id.dev_attr.attr,
+        &iio_dev_attr_value.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group adt7410_attribute_group = {
+        .attrs = adt7410_attributes,
+};
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_ADT7410_ABOVE_ALARM    IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_ADT7410_BELLOW_ALARM   IIO_BUFFER_EVENT_CODE(1)
+#define IIO_EVENT_CODE_ADT7410_ABOVE_CRIT     IIO_BUFFER_EVENT_CODE(2)
+
+static void adt7410_interrupt_bh(struct work_struct *work_s)
+{
+        struct adt7410_chip_info *chip =
+                container_of(work_s, struct adt7410_chip_info, thresh_work);
+        u8 status;
+
+        if (adt7410_i2c_read_byte(chip, ADT7410_STATUS, &status))
+                return;
+
+        enable_irq(chip->client->irq);
+
+        if (status & ADT7410_STAT_T_HIGH)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7410_ABOVE_ALARM,
+                        chip->last_timestamp);
+        if (status & ADT7410_STAT_T_LOW)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7410_BELLOW_ALARM,
+                        chip->last_timestamp);
+        if (status & ADT7410_STAT_T_CRIT)
+                iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT7410_ABOVE_CRIT,
+                        chip->last_timestamp);
+}
+
+static int adt7410_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(adt7410, &adt7410_interrupt);
+IIO_EVENT_SH(adt7410_ct, &adt7410_interrupt);
+
+static ssize_t adt7410_show_event_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        if (chip->config & ADT7410_EVENT_MODE)
+                return sprintf(buf, "interrupt\n");
+        else
+                return sprintf(buf, "comparator\n");
+}
+
+static ssize_t adt7410_set_event_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u16 config;
+        int ret;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config &= ~ADT7410_EVENT_MODE;
+        if (strcmp(buf, "comparator") != 0)
+                config |= ADT7410_EVENT_MODE;
+
+        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static ssize_t adt7410_show_available_event_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "comparator\ninterrupt\n");
+}
+
+static ssize_t adt7410_show_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", chip->config & ADT7410_FAULT_QUEUE_MASK);
+}
+
+static ssize_t adt7410_set_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+        u8 config;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret || data > 3)
+                return -EINVAL;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT7410_FAULT_QUEUE_MASK;
+        config |= data;
+        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static inline ssize_t adt7410_show_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        int ret;
+
+        ret = adt7410_i2c_read_word(chip, bound_reg, &data);
+        if (ret)
+                return -EIO;
+
+        return adt7410_convert_temperature(chip, data, buf);
+}
+
+static inline ssize_t adt7410_set_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        long tmp1, tmp2;
+        u16 data;
+        char *pos;
+        int ret;
+
+        pos = strchr(buf, '.');
+
+        ret = strict_strtol(buf, 10, &tmp1);
+
+        if (ret || tmp1 > 127 || tmp1 < -128)
+                return -EINVAL;
+
+        if (pos) {
+                len = strlen(pos);
+
+                if (chip->config & ADT7410_RESOLUTION) {
+                        if (len > ADT7410_T16_VALUE_FLOAT_OFFSET)
+                                len = ADT7410_T16_VALUE_FLOAT_OFFSET;
+                        pos[len] = 0;
+                        ret = strict_strtol(pos, 10, &tmp2);
+
+                        if (!ret)
+                                tmp2 = (tmp2 / 78125) * 78125;
+                } else {
+                        if (len > ADT7410_T13_VALUE_FLOAT_OFFSET)
+                                len = ADT7410_T13_VALUE_FLOAT_OFFSET;
+                        pos[len] = 0;
+                        ret = strict_strtol(pos, 10, &tmp2);
+
+                        if (!ret)
+                                tmp2 = (tmp2 / 625) * 625;
+                }
+        }
+
+        if (tmp1 < 0)
+                data = (u16)(-tmp1);
+        else
+                data = (u16)tmp1;
+
+        if (chip->config & ADT7410_RESOLUTION) {
+                data = (data << ADT7410_T16_VALUE_FLOAT_OFFSET) |
+                        (tmp2 & ADT7410_T16_VALUE_FLOAT_MASK);
+
+                if (tmp1 < 0)
+                        /* convert positive value to supplyment */
+                        data = (u16)((ADT7410_T16_VALUE_SIGN << 1) - (u32)data);
+        } else {
+                data = (data << ADT7410_T13_VALUE_FLOAT_OFFSET) |
+                        (tmp2 & ADT7410_T13_VALUE_FLOAT_MASK);
+
+                if (tmp1 < 0)
+                        /* convert positive value to supplyment */
+                        data = (ADT7410_T13_VALUE_SIGN << 1) - data;
+                data <<= ADT7410_T13_VALUE_OFFSET;
+        }
+
+        ret = adt7410_i2c_write_word(chip, bound_reg, data);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+static ssize_t adt7410_show_t_alarm_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7410_show_t_bound(dev, attr,
+                        ADT7410_T_ALARM_HIGH, buf);
+}
+
+static inline ssize_t adt7410_set_t_alarm_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7410_set_t_bound(dev, attr,
+                        ADT7410_T_ALARM_HIGH, buf, len);
+}
+
+static ssize_t adt7410_show_t_alarm_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7410_show_t_bound(dev, attr,
+                        ADT7410_T_ALARM_LOW, buf);
+}
+
+static inline ssize_t adt7410_set_t_alarm_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7410_set_t_bound(dev, attr,
+                        ADT7410_T_ALARM_LOW, buf, len);
+}
+
+static ssize_t adt7410_show_t_crit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7410_show_t_bound(dev, attr,
+                        ADT7410_T_CRIT, buf);
+}
+
+static inline ssize_t adt7410_set_t_crit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7410_set_t_bound(dev, attr,
+                        ADT7410_T_CRIT, buf, len);
+}
+
+static ssize_t adt7410_show_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        int ret;
+        u8 t_hyst;
+
+        ret = adt7410_i2c_read_byte(chip, ADT7410_T_HYST, &t_hyst);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", t_hyst & ADT7410_T_HYST_MASK);
+}
+
+static inline ssize_t adt7410_set_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7410_chip_info *chip = dev_info->dev_data;
+        int ret;
+        unsigned long data;
+        u8 t_hyst;
+
+        ret = strict_strtol(buf, 10, &data);
+
+        if (ret || data > ADT7410_T_HYST_MASK)
+                return -EINVAL;
+
+        t_hyst = (u8)data;
+
+        ret = adt7410_i2c_write_byte(chip, ADT7410_T_HYST, t_hyst);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+IIO_EVENT_ATTR_SH(event_mode, iio_event_adt7410,
+                adt7410_show_event_mode, adt7410_set_event_mode, 0);
+IIO_EVENT_ATTR_SH(available_event_modes, iio_event_adt7410,
+                adt7410_show_available_event_modes, NULL, 0);
+IIO_EVENT_ATTR_SH(fault_queue, iio_event_adt7410,
+                adt7410_show_fault_queue, adt7410_set_fault_queue, 0);
+IIO_EVENT_ATTR_SH(t_alarm_high, iio_event_adt7410,
+                adt7410_show_t_alarm_high, adt7410_set_t_alarm_high, 0);
+IIO_EVENT_ATTR_SH(t_alarm_low, iio_event_adt7410,
+                adt7410_show_t_alarm_low, adt7410_set_t_alarm_low, 0);
+IIO_EVENT_ATTR_SH(t_crit, iio_event_adt7410_ct,
+                adt7410_show_t_crit, adt7410_set_t_crit, 0);
+IIO_EVENT_ATTR_SH(t_hyst, iio_event_adt7410,
+                adt7410_show_t_hyst, adt7410_set_t_hyst, 0);
+
+static struct attribute *adt7410_event_int_attributes[] = {
+        &iio_event_attr_event_mode.dev_attr.attr,
+        &iio_event_attr_available_event_modes.dev_attr.attr,
+        &iio_event_attr_fault_queue.dev_attr.attr,
+        &iio_event_attr_t_alarm_high.dev_attr.attr,
+        &iio_event_attr_t_alarm_low.dev_attr.attr,
+        &iio_event_attr_t_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute *adt7410_event_ct_attributes[] = {
+        &iio_event_attr_event_mode.dev_attr.attr,
+        &iio_event_attr_available_event_modes.dev_attr.attr,
+        &iio_event_attr_fault_queue.dev_attr.attr,
+        &iio_event_attr_t_crit.dev_attr.attr,
+        &iio_event_attr_t_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adt7410_event_attribute_group[ADT7410_IRQS] = {
+        {
+                .attrs = adt7410_event_int_attributes,
+        },
+        {
+                .attrs = adt7410_event_ct_attributes,
+        }
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit adt7410_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct adt7410_chip_info *chip;
+        int ret = 0;
+        unsigned long *adt7410_platform_data = client->dev.platform_data;
+
+        chip = kzalloc(sizeof(struct adt7410_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &adt7410_attribute_group;
+        chip->indio_dev->event_attrs = adt7410_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = ADT7410_IRQS;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        /* CT critcal temperature event. line 0 */
+        if (client->irq) {
+                ret = iio_register_interrupt_line(client->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_LOW,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_adt7410.
+                 * All event attributes bind to the same event handler.
+                 * One event handler can only be added to one event list.
+                 */
+                iio_add_event_to_list(&iio_event_adt7410,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+        }
+
+        /* INT bound temperature alarm event. line 1 */
+        if (adt7410_platform_data[0]) {
+                ret = iio_register_interrupt_line(adt7410_platform_data[0],
+                                chip->indio_dev,
+                                1,
+                                adt7410_platform_data[1],
+                                chip->name);
+                if (ret)
+                        goto error_unreg_ct_irq;
+
+                /*
+                 * The event handler list element refer to iio_event_adt7410.
+                 * All event attributes bind to the same event handler.
+                 * One event handler can only be added to one event list.
+                 */
+                iio_add_event_to_list(&iio_event_adt7410_ct,
+                                &chip->indio_dev->interrupts[1]->ev_list);
+        }
+
+        if (client->irq && adt7410_platform_data[0]) {
+                INIT_WORK(&chip->thresh_work, adt7410_interrupt_bh);
+
+                ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_int_irq;
+                }
+
+                /* set irq polarity low level */
+                chip->config &= ~ADT7410_CT_POLARITY;
+
+                if (adt7410_platform_data[1] & IRQF_TRIGGER_HIGH)
+                        chip->config |= ADT7410_INT_POLARITY;
+                else
+                        chip->config &= ~ADT7410_INT_POLARITY;
+
+                ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_int_irq;
+                }
+        }
+
+        dev_info(&client->dev, "%s temperature sensor registered.\n",
+                         id->name);
+
+        return 0;
+
+error_unreg_int_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 1);
+error_unreg_ct_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 0);
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit adt7410_remove(struct i2c_client *client)
+{
+        struct adt7410_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+        unsigned long *adt7410_platform_data = client->dev.platform_data;
+
+        if (adt7410_platform_data[0])
+                iio_unregister_interrupt_line(indio_dev, 1);
+        if (client->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id adt7410_id[] = {
+        { "adt7410", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, adt7410_id);
+
+static struct i2c_driver adt7410_driver = {
+        .driver = {
+                .name = "adt7410",
+        },
+        .probe = adt7410_probe,
+        .remove = __devexit_p(adt7410_remove),
+        .id_table = adt7410_id,
+};
+
+static __init int adt7410_init(void)
+{
+        return i2c_add_driver(&adt7410_driver);
+}
+
+static __exit void adt7410_exit(void)
+{
+        i2c_del_driver(&adt7410_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices ADT7410 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(adt7410_init);
+module_exit(adt7410_exit);
diff --git a/drivers/staging/iio/adc/adt75.c b/drivers/staging/iio/adc/adt75.c
new file mode 100644
index 000000000000..aff4d31eb89c
--- /dev/null
+++ b/drivers/staging/iio/adc/adt75.c
@@ -0,0 +1,732 @@
+/*
+ * ADT75 digital temperature sensor driver supporting ADT75
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+/*
+ * ADT75 registers definition
+ */
+
+#define ADT75_TEMPERATURE               0
+#define ADT75_CONFIG                    1
+#define ADT75_T_HYST                    2
+#define ADT75_T_OS                      3
+#define ADT75_ONESHOT                   4
+
+/*
+ * ADT75 config
+ */
+#define ADT75_PD                        0x1
+#define ADT75_OS_INT                    0x2
+#define ADT75_OS_POLARITY               0x4
+#define ADT75_FAULT_QUEUE_MASK          0x18
+#define ADT75_FAULT_QUEUE_OFFSET        3
+#define ADT75_SMBUS_ALART               0x8
+
+/*
+ * ADT75 masks
+ */
+#define ADT75_VALUE_SIGN                0x800
+#define ADT75_VALUE_OFFSET              4
+#define ADT75_VALUE_FLOAT_OFFSET        4
+#define ADT75_VALUE_FLOAT_MASK          0xF
+
+
+/*
+ * struct adt75_chip_info - chip specifc information
+ */
+
+struct adt75_chip_info {
+        const char *name;
+        struct i2c_client *client;
+        struct iio_dev *indio_dev;
+        struct work_struct thresh_work;
+        s64 last_timestamp;
+        u8  config;
+};
+
+/*
+ * adt75 register access by I2C
+ */
+
+static int adt75_i2c_read(struct adt75_chip_info *chip, u8 reg, u8 *data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0, len;
+
+        ret = i2c_smbus_write_byte(client, reg);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read register address error\n");
+                return ret;
+        }
+
+        if (reg == ADT75_CONFIG || reg == ADT75_ONESHOT)
+                len = 1;
+        else
+                len = 2;
+
+        ret = i2c_master_recv(client, data, len);
+        if (ret < 0) {
+                dev_err(&client->dev, "I2C read error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int adt75_i2c_write(struct adt75_chip_info *chip, u8 reg, u8 data)
+{
+        struct i2c_client *client = chip->client;
+        int ret = 0;
+
+        if (reg == ADT75_CONFIG || reg == ADT75_ONESHOT)
+                ret = i2c_smbus_write_byte_data(client, reg, data);
+        else
+                ret = i2c_smbus_write_word_data(client, reg, data);
+
+        if (ret < 0)
+                dev_err(&client->dev, "I2C write error\n");
+
+        return ret;
+}
+
+static ssize_t adt75_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+
+        if (chip->config & ADT75_PD)
+                return sprintf(buf, "power-save\n");
+        else
+                return sprintf(buf, "full\n");
+}
+
+static ssize_t adt75_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        int ret;
+        u8 config;
+
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT75_PD;
+        if (!strcmp(buf, "full"))
+                config |= ADT75_PD;
+
+        ret = adt75_i2c_write(chip, ADT75_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                adt75_show_mode,
+                adt75_store_mode,
+                0);
+
+static ssize_t adt75_show_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "full\npower-down\n");
+}
+
+static IIO_DEVICE_ATTR(available_modes, S_IRUGO, adt75_show_available_modes, NULL, 0);
+
+static ssize_t adt75_show_oneshot(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->config & ADT75_ONESHOT));
+}
+
+static ssize_t adt75_store_oneshot(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        unsigned long data = 0;
+        int ret;
+        u8 config;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT75_ONESHOT;
+        if (data)
+                config |= ADT75_ONESHOT;
+
+        ret = adt75_i2c_write(chip, ADT75_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static IIO_DEVICE_ATTR(oneshot, S_IRUGO | S_IWUSR,
+                adt75_show_oneshot,
+                adt75_store_oneshot,
+                0);
+
+static ssize_t adt75_show_value(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        if (chip->config & ADT75_PD) {
+                dev_err(dev, "Can't read value in power-down mode.\n");
+                return -EIO;
+        }
+
+        if (chip->config & ADT75_ONESHOT) {
+                /* write to active converter */
+                ret = i2c_smbus_write_byte(chip->client, ADT75_ONESHOT);
+                if (ret)
+                        return -EIO;
+        }
+
+        ret = adt75_i2c_read(chip, ADT75_TEMPERATURE, (u8 *)&data);
+        if (ret)
+                return -EIO;
+
+        data = swab16(data) >> ADT75_VALUE_OFFSET;
+        if (data & ADT75_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (ADT75_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.4d\n", sign,
+                (data >> ADT75_VALUE_FLOAT_OFFSET),
+                (data & ADT75_VALUE_FLOAT_MASK) * 625);
+}
+
+static IIO_DEVICE_ATTR(value, S_IRUGO, adt75_show_value, NULL, 0);
+
+static ssize_t adt75_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, adt75_show_name, NULL, 0);
+
+static struct attribute *adt75_attributes[] = {
+        &iio_dev_attr_available_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_oneshot.dev_attr.attr,
+        &iio_dev_attr_value.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group adt75_attribute_group = {
+        .attrs = adt75_attributes,
+};
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_ADT75_OTI    IIO_BUFFER_EVENT_CODE(0)
+
+static void adt75_interrupt_bh(struct work_struct *work_s)
+{
+        struct adt75_chip_info *chip =
+                container_of(work_s, struct adt75_chip_info, thresh_work);
+
+        enable_irq(chip->client->irq);
+
+        iio_push_event(chip->indio_dev, 0,
+                        IIO_EVENT_CODE_ADT75_OTI,
+                        chip->last_timestamp);
+}
+
+static int adt75_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct adt75_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(adt75, &adt75_interrupt);
+
+static ssize_t adt75_show_oti_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        if (chip->config & ADT75_OS_INT)
+                return sprintf(buf, "interrupt\n");
+        else
+                return sprintf(buf, "comparator\n");
+}
+
+static ssize_t adt75_set_oti_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        int ret;
+        u8 config;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT75_OS_INT;
+        if (strcmp(buf, "comparator") != 0)
+                config |= ADT75_OS_INT;
+
+        ret = adt75_i2c_write(chip, ADT75_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static ssize_t adt75_show_available_oti_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "comparator\ninterrupt\n");
+}
+
+static ssize_t adt75_show_smbus_alart(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", !!(chip->config & ADT75_SMBUS_ALART));
+}
+
+static ssize_t adt75_set_smbus_alart(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        unsigned long data = 0;
+        int ret;
+        u8 config;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT75_SMBUS_ALART;
+        if (data)
+                config |= ADT75_SMBUS_ALART;
+
+        ret = adt75_i2c_write(chip, ADT75_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+
+static ssize_t adt75_show_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        int ret;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", (chip->config & ADT75_FAULT_QUEUE_MASK) >>
+                                ADT75_FAULT_QUEUE_OFFSET);
+}
+
+static ssize_t adt75_set_fault_queue(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+        u8 config;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret || data > 3)
+                return -EINVAL;
+
+        /* retrive ALART status */
+        ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+        if (ret)
+                return -EIO;
+
+        config = chip->config & ~ADT75_FAULT_QUEUE_MASK;
+        config |= (data << ADT75_FAULT_QUEUE_OFFSET);
+        ret = adt75_i2c_write(chip, ADT75_CONFIG, config);
+        if (ret)
+                return -EIO;
+
+        chip->config = config;
+
+        return ret;
+}
+static inline ssize_t adt75_show_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        u16 data;
+        char sign = ' ';
+        int ret;
+
+        ret = adt75_i2c_read(chip, bound_reg, (u8 *)&data);
+        if (ret)
+                return -EIO;
+
+        data = swab16(data) >> ADT75_VALUE_OFFSET;
+        if (data & ADT75_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (ADT75_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.4d\n", sign,
+                (data >> ADT75_VALUE_FLOAT_OFFSET),
+                (data & ADT75_VALUE_FLOAT_MASK) * 625);
+}
+
+static inline ssize_t adt75_set_t_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt75_chip_info *chip = dev_info->dev_data;
+        long tmp1, tmp2;
+        u16 data;
+        char *pos;
+        int ret;
+
+        pos = strchr(buf, '.');
+
+        ret = strict_strtol(buf, 10, &tmp1);
+
+        if (ret || tmp1 > 127 || tmp1 < -128)
+                return -EINVAL;
+
+        if (pos) {
+                len = strlen(pos);
+                if (len > ADT75_VALUE_FLOAT_OFFSET)
+                        len = ADT75_VALUE_FLOAT_OFFSET;
+                pos[len] = 0;
+                ret = strict_strtol(pos, 10, &tmp2);
+
+                if (!ret)
+                        tmp2 = (tmp2 / 625) * 625;
+        }
+
+        if (tmp1 < 0)
+                data = (u16)(-tmp1);
+        else
+                data = (u16)tmp1;
+        data = (data << ADT75_VALUE_FLOAT_OFFSET) | (tmp2 & ADT75_VALUE_FLOAT_MASK);
+        if (tmp1 < 0)
+                /* convert positive value to supplyment */
+                data = (ADT75_VALUE_SIGN << 1) - data;
+        data <<= ADT75_VALUE_OFFSET;
+        data = swab16(data);
+
+        ret = adt75_i2c_write(chip, bound_reg, (u8)data);
+        if (ret)
+                return -EIO;
+
+        return ret;
+}
+
+static ssize_t adt75_show_t_os(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt75_show_t_bound(dev, attr,
+                        ADT75_T_OS, buf);
+}
+
+static inline ssize_t adt75_set_t_os(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt75_set_t_bound(dev, attr,
+                        ADT75_T_OS, buf, len);
+}
+
+static ssize_t adt75_show_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt75_show_t_bound(dev, attr,
+                        ADT75_T_HYST, buf);
+}
+
+static inline ssize_t adt75_set_t_hyst(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt75_set_t_bound(dev, attr,
+                        ADT75_T_HYST, buf, len);
+}
+
+IIO_EVENT_ATTR_SH(oti_mode, iio_event_adt75,
+                adt75_show_oti_mode, adt75_set_oti_mode, 0);
+IIO_EVENT_ATTR_SH(available_oti_modes, iio_event_adt75,
+                adt75_show_available_oti_modes, NULL, 0);
+IIO_EVENT_ATTR_SH(smbus_alart, iio_event_adt75,
+                adt75_show_smbus_alart, adt75_set_smbus_alart, 0);
+IIO_EVENT_ATTR_SH(fault_queue, iio_event_adt75,
+                adt75_show_fault_queue, adt75_set_fault_queue, 0);
+IIO_EVENT_ATTR_SH(t_os, iio_event_adt75,
+                adt75_show_t_os, adt75_set_t_os, 0);
+IIO_EVENT_ATTR_SH(t_hyst, iio_event_adt75,
+                adt75_show_t_hyst, adt75_set_t_hyst, 0);
+
+static struct attribute *adt75_event_attributes[] = {
+        &iio_event_attr_oti_mode.dev_attr.attr,
+        &iio_event_attr_available_oti_modes.dev_attr.attr,
+        &iio_event_attr_smbus_alart.dev_attr.attr,
+        &iio_event_attr_fault_queue.dev_attr.attr,
+        &iio_event_attr_t_os.dev_attr.attr,
+        &iio_event_attr_t_hyst.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adt75_event_attribute_group = {
+        .attrs = adt75_event_attributes,
+};
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit adt75_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct adt75_chip_info *chip;
+        int ret = 0;
+
+        chip = kzalloc(sizeof(struct adt75_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        i2c_set_clientdata(client, chip);
+
+        chip->client = client;
+        chip->name = id->name;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = &client->dev;
+        chip->indio_dev->attrs = &adt75_attribute_group;
+        chip->indio_dev->event_attrs = &adt75_event_attribute_group;
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        if (client->irq > 0) {
+                ret = iio_register_interrupt_line(client->irq,
+                                chip->indio_dev,
+                                0,
+                                IRQF_TRIGGER_LOW,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_adt75.
+                 * All event attributes bind to the same event handler.
+                 * So, only register event handler once.
+                 */
+                iio_add_event_to_list(&iio_event_adt75,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, adt75_interrupt_bh);
+
+                ret = adt75_i2c_read(chip, ADT75_CONFIG, &chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_irq;
+                }
+
+                /* set irq polarity low level */
+                chip->config &= ~ADT75_OS_POLARITY;
+
+                ret = adt75_i2c_write(chip, ADT75_CONFIG, chip->config);
+                if (ret) {
+                        ret = -EIO;
+                        goto error_unreg_irq;
+                }
+        }
+
+        dev_info(&client->dev, "%s temperature sensor registered.\n",
+                         id->name);
+
+        return 0;
+error_unreg_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 0);
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+
+static int __devexit adt75_remove(struct i2c_client *client)
+{
+        struct adt75_chip_info *chip = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        if (client->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+
+static const struct i2c_device_id adt75_id[] = {
+        { "adt75", 0 },
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, adt75_id);
+
+static struct i2c_driver adt75_driver = {
+        .driver = {
+                .name = "adt75",
+        },
+        .probe = adt75_probe,
+        .remove = __devexit_p(adt75_remove),
+        .id_table = adt75_id,
+};
+
+static __init int adt75_init(void)
+{
+        return i2c_add_driver(&adt75_driver);
+}
+
+static __exit void adt75_exit(void)
+{
+        i2c_del_driver(&adt75_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices ADT75 digital"
+                        " temperature sensor driver");
+MODULE_LICENSE("GPL v2");
+
+module_init(adt75_init);
+module_exit(adt75_exit);
diff --git a/drivers/staging/iio/addac/Kconfig b/drivers/staging/iio/addac/Kconfig
new file mode 100644
index 000000000000..9847baf02700
--- /dev/null
+++ b/drivers/staging/iio/addac/Kconfig
@@ -0,0 +1,25 @@
+#
+# ADDAC drivers
+#
+comment "Analog digital bi-direction convertors"
+
+config ADT7316
+        tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
+        help
+          Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
+          and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
+
+config ADT7316_SPI
+        tristate "support SPI bus connection"
+        depends on SPI && ADT7316
+        default y
+        help
+          Say yes here to build SPI bus support for Analog Devices ADT7316/7/8
+          and ADT7516/7/9.
+
+config ADT7316_I2C
+        tristate "support I2C bus connection"
+        depends on I2C && ADT7316
+        help
+          Say yes here to build I2C bus support for Analog Devices ADT7316/7/8
+          and ADT7516/7/9.
diff --git a/drivers/staging/iio/addac/Makefile b/drivers/staging/iio/addac/Makefile
new file mode 100644
index 000000000000..4c7686133692
--- /dev/null
+++ b/drivers/staging/iio/addac/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for industrial I/O ADDAC drivers
+#
+
+obj-$(CONFIG_ADT7316) += adt7316.o
+obj-$(CONFIG_ADT7316_SPI) += adt7316-spi.o
+obj-$(CONFIG_ADT7316_I2C) += adt7316-i2c.o
diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
new file mode 100644
index 000000000000..52d1ea349635
--- /dev/null
+++ b/drivers/staging/iio/addac/adt7316-i2c.c
@@ -0,0 +1,170 @@
+/*
+ * I2C bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature
+ * sensor, ADC and DAC
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+
+#include "adt7316.h"
+
+/*
+ * adt7316 register access by I2C
+ */
+static int adt7316_i2c_read(void *client, u8 reg, u8 *data)
+{
+        struct i2c_client *cl = client;
+        int ret = 0;
+
+        ret = i2c_smbus_write_byte(cl, reg);
+        if (ret < 0) {
+                dev_err(&cl->dev, "I2C fail to select reg\n");
+                return ret;
+        }
+
+        ret = i2c_smbus_read_byte(client);
+        if (ret < 0) {
+                dev_err(&cl->dev, "I2C read error\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int adt7316_i2c_write(void *client, u8 reg, u8 data)
+{
+        struct i2c_client *cl = client;
+        int ret = 0;
+
+        ret = i2c_smbus_write_byte_data(cl, reg, data);
+        if (ret < 0)
+                dev_err(&cl->dev, "I2C write error\n");
+
+        return ret;
+}
+
+static int adt7316_i2c_multi_read(void *client, u8 reg, u8 count, u8 *data)
+{
+        struct i2c_client *cl = client;
+        int i, ret = 0;
+
+        if (count > ADT7316_REG_MAX_ADDR)
+                count = ADT7316_REG_MAX_ADDR;
+
+        for (i = 0; i < count; i++) {
+                ret = adt7316_i2c_read(cl, reg, &data[i]);
+                if (ret < 0) {
+                        dev_err(&cl->dev, "I2C multi read error\n");
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+static int adt7316_i2c_multi_write(void *client, u8 reg, u8 count, u8 *data)
+{
+        struct i2c_client *cl = client;
+        int i, ret = 0;
+
+        if (count > ADT7316_REG_MAX_ADDR)
+                count = ADT7316_REG_MAX_ADDR;
+
+        for (i = 0; i < count; i++) {
+                ret = adt7316_i2c_write(cl, reg, data[i]);
+                if (ret < 0) {
+                        dev_err(&cl->dev, "I2C multi write error\n");
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit adt7316_i2c_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct adt7316_bus bus = {
+                .client = client,
+                .irq = client->irq,
+                .irq_flags = IRQF_TRIGGER_LOW,
+                .read = adt7316_i2c_read,
+                .write = adt7316_i2c_write,
+                .multi_read = adt7316_i2c_multi_read,
+                .multi_write = adt7316_i2c_multi_write,
+        };
+
+        return adt7316_probe(&client->dev, &bus, id->name);
+}
+
+static int __devexit adt7316_i2c_remove(struct i2c_client *client)
+{
+        return adt7316_remove(&client->dev);;
+}
+
+static const struct i2c_device_id adt7316_i2c_id[] = {
+        { "adt7316", 0 },
+        { "adt7317", 0 },
+        { "adt7318", 0 },
+        { "adt7516", 0 },
+        { "adt7517", 0 },
+        { "adt7519", 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, adt7316_i2c_id);
+
+#ifdef CONFIG_PM
+static int adt7316_i2c_suspend(struct i2c_client *client, pm_message_t message)
+{
+        return adt7316_disable(&client->dev);
+}
+
+static int adt7316_i2c_resume(struct i2c_client *client)
+{
+        return adt7316_enable(&client->dev);
+}
+#else
+# define adt7316_i2c_suspend NULL
+# define adt7316_i2c_resume  NULL
+#endif
+
+static struct i2c_driver adt7316_driver = {
+        .driver = {
+                .name = "adt7316",
+                .owner  = THIS_MODULE,
+        },
+        .probe = adt7316_i2c_probe,
+        .remove = __devexit_p(adt7316_i2c_remove),
+        .suspend = adt7316_i2c_suspend,
+        .resume = adt7316_i2c_resume,
+        .id_table = adt7316_i2c_id,
+};
+
+static __init int adt7316_i2c_init(void)
+{
+        return i2c_add_driver(&adt7316_driver);
+}
+
+static __exit void adt7316_i2c_exit(void)
+{
+        i2c_del_driver(&adt7316_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("I2C bus driver for Analog Devices ADT7316/7/9 and"
+                        "ADT7516/7/8 digital temperature sensor, ADC and DAC");
+MODULE_LICENSE("GPL v2");
+
+module_init(adt7316_i2c_init);
+module_exit(adt7316_i2c_exit);
diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c
new file mode 100644
index 000000000000..369d4d01ed97
--- /dev/null
+++ b/drivers/staging/iio/addac/adt7316-spi.c
@@ -0,0 +1,180 @@
+/*
+ * API bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature
+ * sensor, ADC and DAC
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/spi/spi.h>
+
+#include "adt7316.h"
+
+#define ADT7316_SPI_MAX_FREQ_HZ         5000000
+#define ADT7316_SPI_CMD_READ            0x91
+#define ADT7316_SPI_CMD_WRITE           0x90
+
+/*
+ * adt7316 register access by SPI
+ */
+
+static int adt7316_spi_multi_read(void *client, u8 reg, u8 count, u8 *data)
+{
+        struct spi_device *spi_dev = client;
+        u8 cmd[2];
+        int ret = 0;
+
+        if (count > ADT7316_REG_MAX_ADDR)
+                count = ADT7316_REG_MAX_ADDR;
+
+        cmd[0] = ADT7316_SPI_CMD_WRITE;
+        cmd[1] = reg;
+
+        ret = spi_write(spi_dev, cmd, 2);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI fail to select reg\n");
+                return ret;
+        }
+
+        cmd[0] = ADT7316_SPI_CMD_READ;
+
+        ret = spi_write_then_read(spi_dev, cmd, 1, data, count);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI read data error\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int adt7316_spi_multi_write(void *client, u8 reg, u8 count, u8 *data)
+{
+        struct spi_device *spi_dev = client;
+        u8 buf[ADT7316_REG_MAX_ADDR + 2];
+        int i, ret = 0;
+
+        if (count > ADT7316_REG_MAX_ADDR)
+                count = ADT7316_REG_MAX_ADDR;
+
+        buf[0] = ADT7316_SPI_CMD_WRITE;
+        buf[1] = reg;
+        for (i = 0; i < count; i++)
+                buf[i + 2] = data[i];
+
+        ret = spi_write(spi_dev, buf, count + 2);
+        if (ret < 0) {
+                dev_err(&spi_dev->dev, "SPI write error\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static int adt7316_spi_read(void *client, u8 reg, u8 *data)
+{
+        return adt7316_spi_multi_read(client, reg, 1, data);
+}
+
+static int adt7316_spi_write(void *client, u8 reg, u8 val)
+{
+        return adt7316_spi_multi_write(client, reg, 1, &val);
+}
+
+/*
+ * device probe and remove
+ */
+
+static int __devinit adt7316_spi_probe(struct spi_device *spi_dev)
+{
+        struct adt7316_bus bus = {
+                .client = spi_dev,
+                .irq = spi_dev->irq,
+                .irq_flags = IRQF_TRIGGER_LOW,
+                .read = adt7316_spi_read,
+                .write = adt7316_spi_write,
+                .multi_read = adt7316_spi_multi_read,
+                .multi_write = adt7316_spi_multi_write,
+        };
+
+        /* don't exceed max specified SPI CLK frequency */
+        if (spi_dev->max_speed_hz > ADT7316_SPI_MAX_FREQ_HZ) {
+                dev_err(&spi_dev->dev, "SPI CLK %d Hz?\n",
+                        spi_dev->max_speed_hz);
+                return -EINVAL;
+        }
+
+        /* switch from default I2C protocol to SPI protocol */
+        adt7316_spi_write(spi_dev, 0, 0);
+        adt7316_spi_write(spi_dev, 0, 0);
+        adt7316_spi_write(spi_dev, 0, 0);
+
+        return adt7316_probe(&spi_dev->dev, &bus, spi_dev->modalias);
+}
+
+static int __devexit adt7316_spi_remove(struct spi_device *spi_dev)
+{
+        return adt7316_remove(&spi_dev->dev);
+}
+
+static const struct spi_device_id adt7316_spi_id[] = {
+        { "adt7316", 0 },
+        { "adt7317", 0 },
+        { "adt7318", 0 },
+        { "adt7516", 0 },
+        { "adt7517", 0 },
+        { "adt7519", 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(spi, adt7316_spi_id);
+
+#ifdef CONFIG_PM
+static int adt7316_spi_suspend(struct spi_device *spi_dev, pm_message_t message)
+{
+        return adt7316_disable(&spi_dev->dev);
+}
+
+static int adt7316_spi_resume(struct spi_device *spi_dev)
+{
+        return adt7316_enable(&spi_dev->dev);
+}
+#else
+# define adt7316_spi_suspend NULL
+# define adt7316_spi_resume  NULL
+#endif
+
+static struct spi_driver adt7316_driver = {
+        .driver = {
+                .name = "adt7316",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe = adt7316_spi_probe,
+        .remove = __devexit_p(adt7316_spi_remove),
+        .suspend = adt7316_spi_suspend,
+        .resume = adt7316_spi_resume,
+        .id_table = adt7316_spi_id,
+};
+
+static __init int adt7316_spi_init(void)
+{
+        return spi_register_driver(&adt7316_driver);
+}
+
+static __exit void adt7316_spi_exit(void)
+{
+        spi_unregister_driver(&adt7316_driver);
+}
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("SPI bus driver for Analog Devices ADT7316/7/8 and"
+                        "ADT7516/7/9 digital temperature sensor, ADC and DAC");
+MODULE_LICENSE("GPL v2");
+
+module_init(adt7316_spi_init);
+module_exit(adt7316_spi_exit);
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
new file mode 100644
index 000000000000..d1b5b13629d9
--- /dev/null
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -0,0 +1,2402 @@
+/*
+ * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9
+ *
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "adt7316.h"
+
+/*
+ * ADT7316 registers definition
+ */
+#define ADT7316_INT_STAT1               0x0
+#define ADT7316_INT_STAT2               0x1
+#define ADT7316_LSB_IN_TEMP_VDD         0x3
+#define ADT7316_LSB_IN_TEMP_MASK        0x3
+#define ADT7316_LSB_VDD_MASK            0xC
+#define ADT7316_LSB_VDD_OFFSET          2
+#define ADT7316_LSB_EX_TEMP_AIN         0x4
+#define ADT7316_LSB_EX_TEMP_MASK        0x3
+#define ADT7516_LSB_AIN_SHIFT           2
+#define ADT7316_AD_MSB_DATA_BASE        0x6
+#define ADT7316_AD_MSB_DATA_REGS        3
+#define ADT7516_AD_MSB_DATA_REGS        6
+#define ADT7316_MSB_VDD                 0x6
+#define ADT7316_MSB_IN_TEMP             0x7
+#define ADT7316_MSB_EX_TEMP             0x8
+#define ADT7516_MSB_AIN1                0x8
+#define ADT7516_MSB_AIN2                0x9
+#define ADT7516_MSB_AIN3                0xA
+#define ADT7516_MSB_AIN4                0xB
+#define ADT7316_DA_DATA_BASE            0x10
+#define ADT7316_DA_MSB_DATA_REGS        4
+#define ADT7316_LSB_DAC_A               0x10
+#define ADT7316_MSB_DAC_A               0x11
+#define ADT7316_LSB_DAC_B               0x12
+#define ADT7316_MSB_DAC_B               0x13
+#define ADT7316_LSB_DAC_C               0x14
+#define ADT7316_MSB_DAC_C               0x15
+#define ADT7316_LSB_DAC_D               0x16
+#define ADT7316_MSB_DAC_D               0x17
+#define ADT7316_CONFIG1                 0x18
+#define ADT7316_CONFIG2                 0x19
+#define ADT7316_CONFIG3                 0x1A
+#define ADT7316_LDAC_CONFIG             0x1B
+#define ADT7316_DAC_CONFIG              0x1C
+#define ADT7316_INT_MASK1               0x1D
+#define ADT7316_INT_MASK2               0x1E
+#define ADT7316_IN_TEMP_OFFSET          0x1F
+#define ADT7316_EX_TEMP_OFFSET          0x20
+#define ADT7316_IN_ANALOG_TEMP_OFFSET   0x21
+#define ADT7316_EX_ANALOG_TEMP_OFFSET   0x22
+#define ADT7316_VDD_HIGH                0x23
+#define ADT7316_VDD_LOW                 0x24
+#define ADT7316_IN_TEMP_HIGH            0x25
+#define ADT7316_IN_TEMP_LOW             0x26
+#define ADT7316_EX_TEMP_HIGH            0x27
+#define ADT7316_EX_TEMP_LOW             0x28
+#define ADT7516_AIN2_HIGH               0x2B
+#define ADT7516_AIN2_LOW                0x2C
+#define ADT7516_AIN3_HIGH               0x2D
+#define ADT7516_AIN3_LOW                0x2E
+#define ADT7516_AIN4_HIGH               0x2F
+#define ADT7516_AIN4_LOW                0x30
+#define ADT7316_DEVICE_ID               0x4D
+#define ADT7316_MANUFACTURE_ID          0x4E
+#define ADT7316_DEVICE_REV              0x4F
+#define ADT7316_SPI_LOCK_STAT           0x7F
+
+/*
+ * ADT7316 config1
+ */
+#define ADT7316_EN                      0x1
+#define ADT7516_SEL_EX_TEMP             0x4
+#define ADT7516_SEL_AIN1_2_EX_TEMP_MASK 0x6
+#define ADT7516_SEL_AIN3                0x8
+#define ADT7316_INT_EN                  0x20
+#define ADT7316_INT_POLARITY            0x40
+#define ADT7316_PD                      0x80
+
+/*
+ * ADT7316 config2
+ */
+#define ADT7316_AD_SINGLE_CH_MASK       0x3
+#define ADT7516_AD_SINGLE_CH_MASK       0x7
+#define ADT7316_AD_SINGLE_CH_VDD        0
+#define ADT7316_AD_SINGLE_CH_IN         1
+#define ADT7316_AD_SINGLE_CH_EX         2
+#define ADT7516_AD_SINGLE_CH_AIN1       2
+#define ADT7516_AD_SINGLE_CH_AIN2       3
+#define ADT7516_AD_SINGLE_CH_AIN3       4
+#define ADT7516_AD_SINGLE_CH_AIN4       5
+#define ADT7316_AD_SINGLE_CH_MODE       0x10
+#define ADT7316_DISABLE_AVERAGING       0x20
+#define ADT7316_EN_SMBUS_TIMEOUT        0x40
+#define ADT7316_RESET                   0x80
+
+/*
+ * ADT7316 config3
+ */
+#define ADT7316_ADCLK_22_5              0x1
+#define ADT7316_DA_HIGH_RESOLUTION      0x2
+#define ADT7316_DA_EN_VIA_DAC_LDCA      0x4
+#define ADT7516_AIN_IN_VREF             0x10
+#define ADT7316_EN_IN_TEMP_PROP_DACA    0x20
+#define ADT7316_EN_EX_TEMP_PROP_DACB    0x40
+
+/*
+ * ADT7316 DAC config
+ */
+#define ADT7316_DA_2VREF_CH_MASK        0xF
+#define ADT7316_DA_EN_MODE_MASK         0x30
+#define ADT7316_DA_EN_MODE_SINGLE       0x00
+#define ADT7316_DA_EN_MODE_AB_CD        0x10
+#define ADT7316_DA_EN_MODE_ABCD         0x20
+#define ADT7316_DA_EN_MODE_LDAC         0x30
+#define ADT7316_VREF_BYPASS_DAC_AB      0x40
+#define ADT7316_VREF_BYPASS_DAC_CD      0x80
+
+/*
+ * ADT7316 LDAC config
+ */
+#define ADT7316_LDAC_EN_DA_MASK         0xF
+#define ADT7316_DAC_IN_VREF             0x10
+#define ADT7516_DAC_AB_IN_VREF          0x10
+#define ADT7516_DAC_CD_IN_VREF          0x20
+#define ADT7516_DAC_IN_VREF_OFFSET      4
+#define ADT7516_DAC_IN_VREF_MASK        0x30
+
+/*
+ * ADT7316 INT_MASK2
+ */
+#define ADT7316_INT_MASK2_VDD           0x10
+
+/*
+ * ADT7316 value masks
+ */
+#define ADT7316_VALUE_MASK              0xfff
+#define ADT7316_T_VALUE_SIGN            0x400
+#define ADT7316_T_VALUE_FLOAT_OFFSET    2
+#define ADT7316_T_VALUE_FLOAT_MASK      0x2
+
+/*
+ * Chip ID
+ */
+#define ID_ADT7316              0x1
+#define ID_ADT7317              0x2
+#define ID_ADT7318              0x3
+#define ID_ADT7516              0x11
+#define ID_ADT7517              0x12
+#define ID_ADT7519              0x14
+
+#define ID_FAMILY_MASK          0xF0
+#define ID_ADT73XX              0x0
+#define ID_ADT75XX              0x10
+
+/*
+ * struct adt7316_chip_info - chip specifc information
+ */
+
+struct adt7316_chip_info {
+        const char              *name;
+        struct iio_dev          *indio_dev;
+        struct work_struct      thresh_work;
+        s64                     last_timestamp;
+        struct adt7316_bus      bus;
+        u16                     ldac_pin;
+        u16                     int_mask;       /* 0x2f */
+        u8                      config1;
+        u8                      config2;
+        u8                      config3;
+        u8                      dac_config;     /* DAC config */
+        u8                      ldac_config;    /* LDAC config */
+        u8                      dac_bits;       /* 8, 10, 12 */
+        u8                      id;             /* chip id */
+};
+
+/*
+ * Logic interrupt mask for user application to enable
+ * interrupts.
+ */
+#define ADT7316_IN_TEMP_HIGH_INT_MASK   0x1
+#define ADT7316_IN_TEMP_LOW_INT_MASK    0x2
+#define ADT7316_EX_TEMP_HIGH_INT_MASK   0x4
+#define ADT7316_EX_TEMP_LOW_INT_MASK    0x8
+#define ADT7316_EX_TEMP_FAULT_INT_MASK  0x10
+#define ADT7516_AIN1_INT_MASK           0x4
+#define ADT7516_AIN2_INT_MASK           0x20
+#define ADT7516_AIN3_INT_MASK           0x40
+#define ADT7516_AIN4_INT_MASK           0x80
+#define ADT7316_VDD_INT_MASK            0x100
+#define ADT7316_TEMP_INT_MASK           0x1F
+#define ADT7516_AIN_INT_MASK            0xE0
+#define ADT7316_TEMP_AIN_INT_MASK       \
+        (ADT7316_TEMP_INT_MASK | ADT7316_TEMP_INT_MASK)
+
+/*
+ * struct adt7316_chip_info - chip specifc information
+ */
+
+struct adt7316_limit_regs {
+        u16     data_high;
+        u16     data_low;
+};
+
+static ssize_t adt7316_show_enabled(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_EN));
+}
+
+static ssize_t _adt7316_store_enabled(struct adt7316_chip_info *chip,
+                int enable)
+{
+        u8 config1;
+        int ret;
+
+        if (enable)
+                config1 = chip->config1 | ADT7316_EN;
+        else
+                config1 = chip->config1 & ~ADT7316_EN;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1);
+        if (ret)
+                return -EIO;
+
+        chip->config1 = config1;
+
+        return ret;
+
+}
+
+static ssize_t adt7316_store_enabled(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        int enable;
+
+        if (!memcmp(buf, "1", 1))
+                enable = 1;
+        else
+                enable = 0;
+
+        if (_adt7316_store_enabled(chip, enable) < 0)
+                return -EIO;
+        else
+                return len;
+}
+
+static IIO_DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR,
+                adt7316_show_enabled,
+                adt7316_store_enabled,
+                0);
+
+static ssize_t adt7316_show_select_ex_temp(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX)
+                return -EPERM;
+
+        return sprintf(buf, "%d\n", !!(chip->config1 & ADT7516_SEL_EX_TEMP));
+}
+
+static ssize_t adt7316_store_select_ex_temp(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config1;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX)
+                return -EPERM;
+
+        config1 = chip->config1 & (~ADT7516_SEL_EX_TEMP);
+        if (!memcmp(buf, "1", 1))
+                config1 |= ADT7516_SEL_EX_TEMP;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1);
+        if (ret)
+                return -EIO;
+
+        chip->config1 = config1;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(select_ex_temp, S_IRUGO | S_IWUSR,
+                adt7316_show_select_ex_temp,
+                adt7316_store_select_ex_temp,
+                0);
+
+static ssize_t adt7316_show_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (chip->config2 & ADT7316_AD_SINGLE_CH_MODE)
+                return sprintf(buf, "single_channel\n");
+        else
+                return sprintf(buf, "round_robin\n");
+}
+
+static ssize_t adt7316_store_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config2;
+        int ret;
+
+        config2 = chip->config2 & (~ADT7316_AD_SINGLE_CH_MODE);
+        if (!memcmp(buf, "single_channel", 14))
+                config2 |= ADT7316_AD_SINGLE_CH_MODE;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2);
+        if (ret)
+                return -EIO;
+
+        chip->config2 = config2;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                adt7316_show_mode,
+                adt7316_store_mode,
+                0);
+
+static ssize_t adt7316_show_all_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return sprintf(buf, "single_channel\nround_robin\n");
+}
+
+static IIO_DEVICE_ATTR(all_modes, S_IRUGO, adt7316_show_all_modes, NULL, 0);
+
+static ssize_t adt7316_show_ad_channel(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (!(chip->config2 & ADT7316_AD_SINGLE_CH_MODE))
+                return -EPERM;
+
+        switch (chip->config2 & ADT7516_AD_SINGLE_CH_MASK) {
+        case ADT7316_AD_SINGLE_CH_VDD:
+                return sprintf(buf, "0 - VDD\n");
+        case ADT7316_AD_SINGLE_CH_IN:
+                return sprintf(buf, "1 - Internal Temperature\n");
+        case ADT7316_AD_SINGLE_CH_EX:
+                if (((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) &&
+                        (chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0)
+                        return sprintf(buf, "2 - AIN1\n");
+                else
+                        return sprintf(buf, "2 - External Temperature\n");
+        case ADT7516_AD_SINGLE_CH_AIN2:
+                if ((chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0)
+                        return sprintf(buf, "3 - AIN2\n");
+                else
+                        return sprintf(buf, "N/A\n");
+        case ADT7516_AD_SINGLE_CH_AIN3:
+                if (chip->config1 & ADT7516_SEL_AIN3)
+                        return sprintf(buf, "4 - AIN3\n");
+                else
+                        return sprintf(buf, "N/A\n");
+        case ADT7516_AD_SINGLE_CH_AIN4:
+                return sprintf(buf, "5 - AIN4\n");
+        default:
+                return sprintf(buf, "N/A\n");
+        };
+}
+
+static ssize_t adt7316_store_ad_channel(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config2;
+        unsigned long data = 0;
+        int ret;
+
+        if (!(chip->config2 & ADT7316_AD_SINGLE_CH_MODE))
+                return -EPERM;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) {
+                if (data > 5)
+                        return -EINVAL;
+
+                config2 = chip->config2 & (~ADT7516_AD_SINGLE_CH_MASK);
+        } else {
+                if (data > 2)
+                        return -EINVAL;
+
+                config2 = chip->config2 & (~ADT7316_AD_SINGLE_CH_MASK);
+        }
+
+
+        config2 |= data;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2);
+        if (ret)
+                return -EIO;
+
+        chip->config2 = config2;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(ad_channel, S_IRUGO | S_IWUSR,
+                adt7316_show_ad_channel,
+                adt7316_store_ad_channel,
+                0);
+
+static ssize_t adt7316_show_all_ad_channels(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (!(chip->config2 & ADT7316_AD_SINGLE_CH_MODE))
+                return -EPERM;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return sprintf(buf, "0 - VDD\n1 - Internal Temperature\n"
+                                "2 - External Temperature or AIN2\n"
+                                "3 - AIN2\n4 - AIN3\n5 - AIN4\n");
+        else
+                return sprintf(buf, "0 - VDD\n1 - Internal Temperature\n"
+                                "2 - External Temperature\n");
+}
+
+static IIO_DEVICE_ATTR(all_ad_channels, S_IRUGO,
+                adt7316_show_all_ad_channels, NULL, 0);
+
+static ssize_t adt7316_show_disable_averaging(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->config2 & ADT7316_DISABLE_AVERAGING));
+}
+
+static ssize_t adt7316_store_disable_averaging(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config2;
+        int ret;
+
+        config2 = chip->config2 & (~ADT7316_DISABLE_AVERAGING);
+        if (!memcmp(buf, "1", 1))
+                config2 |= ADT7316_DISABLE_AVERAGING;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2);
+        if (ret)
+                return -EIO;
+
+        chip->config2 = config2;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(disable_averaging, S_IRUGO | S_IWUSR,
+                adt7316_show_disable_averaging,
+                adt7316_store_disable_averaging,
+                0);
+
+static ssize_t adt7316_show_enable_smbus_timeout(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->config2 & ADT7316_EN_SMBUS_TIMEOUT));
+}
+
+static ssize_t adt7316_store_enable_smbus_timeout(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config2;
+        int ret;
+
+        config2 = chip->config2 & (~ADT7316_EN_SMBUS_TIMEOUT);
+        if (!memcmp(buf, "1", 1))
+                config2 |= ADT7316_EN_SMBUS_TIMEOUT;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2);
+        if (ret)
+                return -EIO;
+
+        chip->config2 = config2;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(enable_smbus_timeout, S_IRUGO | S_IWUSR,
+                adt7316_show_enable_smbus_timeout,
+                adt7316_store_enable_smbus_timeout,
+                0);
+
+
+static ssize_t adt7316_store_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config2;
+        int ret;
+
+        config2 = chip->config2 | ADT7316_RESET;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG2, config2);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(reset, S_IWUSR,
+                NULL,
+                adt7316_store_reset,
+                0);
+
+static ssize_t adt7316_show_powerdown(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_PD));
+}
+
+static ssize_t adt7316_store_powerdown(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config1;
+        int ret;
+
+        config1 = chip->config1 & (~ADT7316_PD);
+        if (!memcmp(buf, "1", 1))
+                config1 |= ADT7316_PD;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1);
+        if (ret)
+                return -EIO;
+
+        chip->config1 = config1;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(powerdown, S_IRUGO | S_IWUSR,
+                adt7316_show_powerdown,
+                adt7316_store_powerdown,
+                0);
+
+static ssize_t adt7316_show_fast_ad_clock(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->config3 & ADT7316_ADCLK_22_5));
+}
+
+static ssize_t adt7316_store_fast_ad_clock(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config3;
+        int ret;
+
+        config3 = chip->config3 & (~ADT7316_ADCLK_22_5);
+        if (!memcmp(buf, "1", 1))
+                config3 |= ADT7316_ADCLK_22_5;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3);
+        if (ret)
+                return -EIO;
+
+        chip->config3 = config3;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(fast_ad_clock, S_IRUGO | S_IWUSR,
+                adt7316_show_fast_ad_clock,
+                adt7316_store_fast_ad_clock,
+                0);
+
+static ssize_t adt7316_show_da_high_resolution(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (chip->config3 & ADT7316_DA_HIGH_RESOLUTION) {
+                if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516)
+                        return sprintf(buf, "1 (12 bits)\n");
+                else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517)
+                        return sprintf(buf, "1 (10 bits)\n");
+        }
+
+        return sprintf(buf, "0 (8 bits)\n");
+}
+
+static ssize_t adt7316_store_da_high_resolution(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config3;
+        int ret;
+
+        chip->dac_bits = 8;
+
+        if (!memcmp(buf, "1", 1)) {
+                config3 = chip->config3 | ADT7316_DA_HIGH_RESOLUTION;
+                if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516)
+                        chip->dac_bits = 12;
+                else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517)
+                        chip->dac_bits = 10;
+        } else
+                config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION);
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3);
+        if (ret)
+                return -EIO;
+
+        chip->config3 = config3;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(da_high_resolution, S_IRUGO | S_IWUSR,
+                adt7316_show_da_high_resolution,
+                adt7316_store_da_high_resolution,
+                0);
+
+static ssize_t adt7316_show_AIN_internal_Vref(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX)
+                return -EPERM;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->config3 & ADT7516_AIN_IN_VREF));
+}
+
+static ssize_t adt7316_store_AIN_internal_Vref(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config3;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) != ID_ADT75XX)
+                return -EPERM;
+
+        if (memcmp(buf, "1", 1))
+                config3 = chip->config3 & (~ADT7516_AIN_IN_VREF);
+        else
+                config3 = chip->config3 | ADT7516_AIN_IN_VREF;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3);
+        if (ret)
+                return -EIO;
+
+        chip->config3 = config3;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(AIN_internal_Vref, S_IRUGO | S_IWUSR,
+                adt7316_show_AIN_internal_Vref,
+                adt7316_store_AIN_internal_Vref,
+                0);
+
+
+static ssize_t adt7316_show_enable_prop_DACA(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->config3 & ADT7316_EN_IN_TEMP_PROP_DACA));
+}
+
+static ssize_t adt7316_store_enable_prop_DACA(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config3;
+        int ret;
+
+        config3 = chip->config3 & (~ADT7316_EN_IN_TEMP_PROP_DACA);
+        if (!memcmp(buf, "1", 1))
+                config3 |= ADT7316_EN_IN_TEMP_PROP_DACA;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3);
+        if (ret)
+                return -EIO;
+
+        chip->config3 = config3;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(enable_proportion_DACA, S_IRUGO | S_IWUSR,
+                adt7316_show_enable_prop_DACA,
+                adt7316_store_enable_prop_DACA,
+                0);
+
+static ssize_t adt7316_show_enable_prop_DACB(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->config3 & ADT7316_EN_EX_TEMP_PROP_DACB));
+}
+
+static ssize_t adt7316_store_enable_prop_DACB(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config3;
+        int ret;
+
+        config3 = chip->config3 & (~ADT7316_EN_EX_TEMP_PROP_DACB);
+        if (!memcmp(buf, "1", 1))
+                config3 |= ADT7316_EN_EX_TEMP_PROP_DACB;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3);
+        if (ret)
+                return -EIO;
+
+        chip->config3 = config3;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(enable_proportion_DACB, S_IRUGO | S_IWUSR,
+                adt7316_show_enable_prop_DACB,
+                adt7316_store_enable_prop_DACB,
+                0);
+
+static ssize_t adt7316_show_DAC_2Vref_ch_mask(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%x\n",
+                chip->dac_config & ADT7316_DA_2VREF_CH_MASK);
+}
+
+static ssize_t adt7316_store_DAC_2Vref_ch_mask(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 dac_config;
+        unsigned long data = 0;
+        int ret;
+
+        ret = strict_strtoul(buf, 16, &data);
+        if (ret || data > ADT7316_DA_2VREF_CH_MASK)
+                return -EINVAL;
+
+        dac_config = chip->dac_config & (~ADT7316_DA_2VREF_CH_MASK);
+        dac_config |= data;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config);
+        if (ret)
+                return -EIO;
+
+        chip->dac_config = dac_config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(DAC_2Vref_channels_mask, S_IRUGO | S_IWUSR,
+                adt7316_show_DAC_2Vref_ch_mask,
+                adt7316_store_DAC_2Vref_ch_mask,
+                0);
+
+static ssize_t adt7316_show_DAC_update_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (!(chip->config3 & ADT7316_DA_EN_VIA_DAC_LDCA))
+                return sprintf(buf, "manual\n");
+        else {
+                switch (chip->dac_config & ADT7316_DA_EN_MODE_MASK) {
+                case ADT7316_DA_EN_MODE_SINGLE:
+                        return sprintf(buf, "0 - auto at any MSB DAC writing\n");
+                case ADT7316_DA_EN_MODE_AB_CD:
+                        return sprintf(buf, "1 - auto at MSB DAC AB and CD writing\n");
+                case ADT7316_DA_EN_MODE_ABCD:
+                        return sprintf(buf, "2 - auto at MSB DAC ABCD writing\n");
+                default: /* ADT7316_DA_EN_MODE_LDAC */
+                        return sprintf(buf, "3 - manual\n");
+                };
+        }
+}
+
+static ssize_t adt7316_store_DAC_update_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 dac_config;
+        unsigned long data;
+        int ret;
+
+        if (!(chip->config3 & ADT7316_DA_EN_VIA_DAC_LDCA))
+                return -EPERM;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret || data > ADT7316_DA_EN_MODE_MASK)
+                return -EINVAL;
+
+        dac_config = chip->dac_config & (~ADT7316_DA_EN_MODE_MASK);
+        dac_config |= data;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config);
+        if (ret)
+                return -EIO;
+
+        chip->dac_config = dac_config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(DAC_update_mode, S_IRUGO | S_IWUSR,
+                adt7316_show_DAC_update_mode,
+                adt7316_store_DAC_update_mode,
+                0);
+
+static ssize_t adt7316_show_all_DAC_update_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if (chip->config3 & ADT7316_DA_EN_VIA_DAC_LDCA)
+                return sprintf(buf, "0 - auto at any MSB DAC writing\n"
+                                "1 - auto at MSB DAC AB and CD writing\n"
+                                "2 - auto at MSB DAC ABCD writing\n"
+                                "3 - manual\n");
+        else
+                return sprintf(buf, "manual\n");
+}
+
+static IIO_DEVICE_ATTR(all_DAC_update_modes, S_IRUGO,
+                adt7316_show_all_DAC_update_modes, NULL, 0);
+
+
+static ssize_t adt7316_store_update_DAC(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 ldac_config;
+        unsigned long data;
+        int ret;
+
+        if (chip->config3 & ADT7316_DA_EN_VIA_DAC_LDCA) {
+                if ((chip->dac_config & ADT7316_DA_EN_MODE_MASK) !=
+                        ADT7316_DA_EN_MODE_LDAC)
+                        return -EPERM;
+
+                ret = strict_strtoul(buf, 16, &data);
+                if (ret || data > ADT7316_LDAC_EN_DA_MASK)
+                        return -EINVAL;
+
+                ldac_config = chip->ldac_config & (~ADT7316_LDAC_EN_DA_MASK);
+                ldac_config |= data;
+
+                ret = chip->bus.write(chip->bus.client, ADT7316_LDAC_CONFIG,
+                        ldac_config);
+                if (ret)
+                        return -EIO;
+        } else {
+                gpio_set_value(chip->ldac_pin, 0);
+                gpio_set_value(chip->ldac_pin, 1);
+        }
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(update_DAC, S_IRUGO | S_IWUSR,
+                NULL,
+                adt7316_store_update_DAC,
+                0);
+
+static ssize_t adt7316_show_DA_AB_Vref_bypass(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return -EPERM;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->dac_config & ADT7316_VREF_BYPASS_DAC_AB));
+}
+
+static ssize_t adt7316_store_DA_AB_Vref_bypass(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 dac_config;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return -EPERM;
+
+        dac_config = chip->dac_config & (~ADT7316_VREF_BYPASS_DAC_AB);
+        if (!memcmp(buf, "1", 1))
+                dac_config |= ADT7316_VREF_BYPASS_DAC_AB;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config);
+        if (ret)
+                return -EIO;
+
+        chip->dac_config = dac_config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(DA_AB_Vref_bypass, S_IRUGO | S_IWUSR,
+                adt7316_show_DA_AB_Vref_bypass,
+                adt7316_store_DA_AB_Vref_bypass,
+                0);
+
+static ssize_t adt7316_show_DA_CD_Vref_bypass(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return -EPERM;
+
+        return sprintf(buf, "%d\n",
+                !!(chip->dac_config & ADT7316_VREF_BYPASS_DAC_CD));
+}
+
+static ssize_t adt7316_store_DA_CD_Vref_bypass(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 dac_config;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return -EPERM;
+
+        dac_config = chip->dac_config & (~ADT7316_VREF_BYPASS_DAC_CD);
+        if (!memcmp(buf, "1", 1))
+                dac_config |= ADT7316_VREF_BYPASS_DAC_CD;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_DAC_CONFIG, dac_config);
+        if (ret)
+                return -EIO;
+
+        chip->dac_config = dac_config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(DA_CD_Vref_bypass, S_IRUGO | S_IWUSR,
+                adt7316_show_DA_CD_Vref_bypass,
+                adt7316_store_DA_CD_Vref_bypass,
+                0);
+
+static ssize_t adt7316_show_DAC_internal_Vref(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                return sprintf(buf, "0x%x\n",
+                        (chip->dac_config & ADT7516_DAC_IN_VREF_MASK) >>
+                        ADT7516_DAC_IN_VREF_OFFSET);
+        else
+                return sprintf(buf, "%d\n",
+                        !!(chip->dac_config & ADT7316_DAC_IN_VREF));
+}
+
+static ssize_t adt7316_store_DAC_internal_Vref(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 ldac_config;
+        unsigned long data;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) {
+                ret = strict_strtoul(buf, 16, &data);
+                if (ret || data > 3)
+                        return -EINVAL;
+
+                ldac_config = chip->ldac_config & (~ADT7516_DAC_IN_VREF_MASK);
+                if (data & 0x1)
+                        ldac_config |= ADT7516_DAC_AB_IN_VREF;
+                else if (data & 0x2)
+                        ldac_config |= ADT7516_DAC_CD_IN_VREF;
+        } else {
+                ret = strict_strtoul(buf, 16, &data);
+                if (ret)
+                        return -EINVAL;
+
+                ldac_config = chip->ldac_config & (~ADT7316_DAC_IN_VREF);
+                if (data)
+                        ldac_config = chip->ldac_config | ADT7316_DAC_IN_VREF;
+        }
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_LDAC_CONFIG, ldac_config);
+        if (ret)
+                return -EIO;
+
+        chip->ldac_config = ldac_config;
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(DAC_internal_Vref, S_IRUGO | S_IWUSR,
+                adt7316_show_DAC_internal_Vref,
+                adt7316_store_DAC_internal_Vref,
+                0);
+
+static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip,
+                int channel, char *buf)
+{
+        u16 data;
+        u8 msb, lsb;
+        char sign = ' ';
+        int ret;
+
+        if ((chip->config2 & ADT7316_AD_SINGLE_CH_MODE) &&
+                channel != (chip->config2 & ADT7516_AD_SINGLE_CH_MASK))
+                return -EPERM;
+
+        switch (channel) {
+        case ADT7316_AD_SINGLE_CH_IN:
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_LSB_IN_TEMP_VDD, &lsb);
+                if (ret)
+                        return -EIO;
+
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_AD_MSB_DATA_BASE + channel, &msb);
+                if (ret)
+                        return -EIO;
+
+                data = msb << ADT7316_T_VALUE_FLOAT_OFFSET;
+                data |= lsb & ADT7316_LSB_IN_TEMP_MASK;
+                break;
+        case ADT7316_AD_SINGLE_CH_VDD:
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_LSB_IN_TEMP_VDD, &lsb);
+                if (ret)
+                        return -EIO;
+
+                ret = chip->bus.read(chip->bus.client,
+
+                        ADT7316_AD_MSB_DATA_BASE + channel, &msb);
+                if (ret)
+                        return -EIO;
+
+                data = msb << ADT7316_T_VALUE_FLOAT_OFFSET;
+                data |= (lsb & ADT7316_LSB_VDD_MASK) >> ADT7316_LSB_VDD_OFFSET;
+                return sprintf(buf, "%d\n", data);
+        default: /* ex_temp and ain */
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_LSB_EX_TEMP_AIN, &lsb);
+                if (ret)
+                        return -EIO;
+
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_AD_MSB_DATA_BASE + channel, &msb);
+                if (ret)
+                        return -EIO;
+
+                data = msb << ADT7316_T_VALUE_FLOAT_OFFSET;
+                data |= lsb & (ADT7316_LSB_EX_TEMP_MASK <<
+                        (ADT7516_LSB_AIN_SHIFT * (channel -
+                        (ADT7316_MSB_EX_TEMP - ADT7316_AD_MSB_DATA_BASE))));
+
+                if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                        return sprintf(buf, "%d\n", data);
+                else
+                        break;
+        };
+
+        if (data & ADT7316_T_VALUE_SIGN) {
+                /* convert supplement to positive value */
+                data = (ADT7316_T_VALUE_SIGN << 1) - data;
+                sign = '-';
+        }
+
+        return sprintf(buf, "%c%d.%.2d\n", sign,
+                (data >> ADT7316_T_VALUE_FLOAT_OFFSET),
+                (data & ADT7316_T_VALUE_FLOAT_MASK) * 25);
+}
+
+static ssize_t adt7316_show_VDD(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7316_AD_SINGLE_CH_VDD, buf);
+}
+static IIO_DEVICE_ATTR(VDD, S_IRUGO, adt7316_show_VDD, NULL, 0);
+
+static ssize_t adt7316_show_in_temp(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7316_AD_SINGLE_CH_IN, buf);
+}
+
+static IIO_DEVICE_ATTR(in_temp, S_IRUGO, adt7316_show_in_temp, NULL, 0);
+
+static ssize_t adt7316_show_ex_temp_AIN1(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7316_AD_SINGLE_CH_EX, buf);
+}
+
+static IIO_DEVICE_ATTR(ex_temp_AIN1, S_IRUGO, adt7316_show_ex_temp_AIN1, NULL, 0);
+static IIO_DEVICE_ATTR(ex_temp, S_IRUGO, adt7316_show_ex_temp_AIN1, NULL, 0);
+
+static ssize_t adt7316_show_AIN2(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7516_AD_SINGLE_CH_AIN2, buf);
+}
+static IIO_DEVICE_ATTR(AIN2, S_IRUGO, adt7316_show_AIN2, NULL, 0);
+
+static ssize_t adt7316_show_AIN3(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7516_AD_SINGLE_CH_AIN3, buf);
+}
+static IIO_DEVICE_ATTR(AIN3, S_IRUGO, adt7316_show_AIN3, NULL, 0);
+
+static ssize_t adt7316_show_AIN4(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_ad(chip, ADT7516_AD_SINGLE_CH_AIN4, buf);
+}
+static IIO_DEVICE_ATTR(AIN4, S_IRUGO, adt7316_show_AIN4, NULL, 0);
+
+static ssize_t adt7316_show_temp_offset(struct adt7316_chip_info *chip,
+                int offset_addr, char *buf)
+{
+        int data;
+        u8 val;
+        int ret;
+
+        ret = chip->bus.read(chip->bus.client, offset_addr, &val);
+        if (ret)
+                return -EIO;
+
+        data = (int)val;
+        if (val & 0x80)
+                data -= 256;
+
+        return sprintf(buf, "%d\n", data);
+}
+
+static ssize_t adt7316_store_temp_offset(struct adt7316_chip_info *chip,
+                int offset_addr, const char *buf, size_t len)
+{
+        long data;
+        u8 val;
+        int ret;
+
+        ret = strict_strtol(buf, 10, &data);
+        if (ret || data > 127 || data < -128)
+                return -EINVAL;
+
+        if (data < 0)
+                data += 256;
+
+        val = (u8)data;
+
+        ret = chip->bus.write(chip->bus.client, offset_addr, val);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static ssize_t adt7316_show_in_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_temp_offset(chip, ADT7316_IN_TEMP_OFFSET, buf);
+}
+
+static ssize_t adt7316_store_in_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_temp_offset(chip, ADT7316_IN_TEMP_OFFSET, buf, len);
+}
+
+static IIO_DEVICE_ATTR(in_temp_offset, S_IRUGO | S_IWUSR,
+                adt7316_show_in_temp_offset,
+                adt7316_store_in_temp_offset, 0);
+
+static ssize_t adt7316_show_ex_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_temp_offset(chip, ADT7316_EX_TEMP_OFFSET, buf);
+}
+
+static ssize_t adt7316_store_ex_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_temp_offset(chip, ADT7316_EX_TEMP_OFFSET, buf, len);
+}
+
+static IIO_DEVICE_ATTR(ex_temp_offset, S_IRUGO | S_IWUSR,
+                adt7316_show_ex_temp_offset,
+                adt7316_store_ex_temp_offset, 0);
+
+static ssize_t adt7316_show_in_analog_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_temp_offset(chip,
+                        ADT7316_IN_ANALOG_TEMP_OFFSET, buf);
+}
+
+static ssize_t adt7316_store_in_analog_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_temp_offset(chip,
+                        ADT7316_IN_ANALOG_TEMP_OFFSET, buf, len);
+}
+
+static IIO_DEVICE_ATTR(in_analog_temp_offset, S_IRUGO | S_IWUSR,
+                adt7316_show_in_analog_temp_offset,
+                adt7316_store_in_analog_temp_offset, 0);
+
+static ssize_t adt7316_show_ex_analog_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_temp_offset(chip,
+                        ADT7316_EX_ANALOG_TEMP_OFFSET, buf);
+}
+
+static ssize_t adt7316_store_ex_analog_temp_offset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_temp_offset(chip,
+                        ADT7316_EX_ANALOG_TEMP_OFFSET, buf, len);
+}
+
+static IIO_DEVICE_ATTR(ex_analog_temp_offset, S_IRUGO | S_IWUSR,
+                adt7316_show_ex_analog_temp_offset,
+                adt7316_store_ex_analog_temp_offset, 0);
+
+static ssize_t adt7316_show_DAC(struct adt7316_chip_info *chip,
+                int channel, char *buf)
+{
+        u16 data;
+        u8 msb, lsb, offset;
+        int ret;
+
+        if (channel >= ADT7316_DA_MSB_DATA_REGS ||
+                (channel == 0 &&
+                (chip->config3 & ADT7316_EN_IN_TEMP_PROP_DACA)) ||
+                (channel == 1 &&
+                (chip->config3 & ADT7316_EN_EX_TEMP_PROP_DACB)))
+                return -EPERM;
+
+        offset = chip->dac_bits - 8;
+
+        if (chip->dac_bits > 8) {
+                ret = chip->bus.read(chip->bus.client,
+                        ADT7316_DA_DATA_BASE + channel * 2, &lsb);
+                if (ret)
+                        return -EIO;
+        }
+
+        ret = chip->bus.read(chip->bus.client,
+                ADT7316_DA_DATA_BASE + 1 + channel * 2, &msb);
+        if (ret)
+                return -EIO;
+
+        data = (msb << offset) + (lsb & ((1 << offset) - 1));
+
+        return sprintf(buf, "%d\n", data);
+}
+
+static ssize_t adt7316_store_DAC(struct adt7316_chip_info *chip,
+                int channel, const char *buf, size_t len)
+{
+        u8 msb, lsb, offset;
+        unsigned long data;
+        int ret;
+
+        if (channel >= ADT7316_DA_MSB_DATA_REGS ||
+                (channel == 0 &&
+                (chip->config3 & ADT7316_EN_IN_TEMP_PROP_DACA)) ||
+                (channel == 1 &&
+                (chip->config3 & ADT7316_EN_EX_TEMP_PROP_DACB)))
+                return -EPERM;
+
+        offset = chip->dac_bits - 8;
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret || data >= (1 << chip->dac_bits))
+                return -EINVAL;
+
+        if (chip->dac_bits > 8) {
+                lsb = data & (1 << offset);
+                ret = chip->bus.write(chip->bus.client,
+                        ADT7316_DA_DATA_BASE + channel * 2, lsb);
+                if (ret)
+                        return -EIO;
+        }
+
+        msb = data >> offset;
+        ret = chip->bus.write(chip->bus.client,
+                ADT7316_DA_DATA_BASE + 1 + channel * 2, msb);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static ssize_t adt7316_show_DAC_A(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_DAC(chip, 0, buf);
+}
+
+static ssize_t adt7316_store_DAC_A(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_DAC(chip, 0, buf, len);
+}
+
+static IIO_DEVICE_ATTR(DAC_A, S_IRUGO | S_IWUSR, adt7316_show_DAC_A,
+                adt7316_store_DAC_A, 0);
+
+static ssize_t adt7316_show_DAC_B(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_DAC(chip, 1, buf);
+}
+
+static ssize_t adt7316_store_DAC_B(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_DAC(chip, 1, buf, len);
+}
+
+static IIO_DEVICE_ATTR(DAC_B, S_IRUGO | S_IWUSR, adt7316_show_DAC_B,
+                adt7316_store_DAC_B, 0);
+
+static ssize_t adt7316_show_DAC_C(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_DAC(chip, 2, buf);
+}
+
+static ssize_t adt7316_store_DAC_C(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_DAC(chip, 2, buf, len);
+}
+
+static IIO_DEVICE_ATTR(DAC_C, S_IRUGO | S_IWUSR, adt7316_show_DAC_C,
+                adt7316_store_DAC_C, 0);
+
+static ssize_t adt7316_show_DAC_D(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_show_DAC(chip, 3, buf);
+}
+
+static ssize_t adt7316_store_DAC_D(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return adt7316_store_DAC(chip, 3, buf, len);
+}
+
+static IIO_DEVICE_ATTR(DAC_D, S_IRUGO | S_IWUSR, adt7316_show_DAC_D,
+                adt7316_store_DAC_D, 0);
+
+static ssize_t adt7316_show_device_id(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 id;
+        int ret;
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_DEVICE_ID, &id);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", id);
+}
+
+static IIO_DEVICE_ATTR(device_id, S_IRUGO, adt7316_show_device_id, NULL, 0);
+
+static ssize_t adt7316_show_manufactorer_id(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 id;
+        int ret;
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_MANUFACTURE_ID, &id);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", id);
+}
+
+static IIO_DEVICE_ATTR(manufactorer_id, S_IRUGO,
+                adt7316_show_manufactorer_id, NULL, 0);
+
+static ssize_t adt7316_show_device_rev(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 rev;
+        int ret;
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_DEVICE_REV, &rev);
+        if (ret)
+                return -EIO;
+
+        return sprintf(buf, "%d\n", rev);
+}
+
+static IIO_DEVICE_ATTR(device_rev, S_IRUGO, adt7316_show_device_rev, NULL, 0);
+
+static ssize_t adt7316_show_bus_type(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 stat;
+        int ret;
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_SPI_LOCK_STAT, &stat);
+        if (ret)
+                return -EIO;
+
+        if (stat)
+                return sprintf(buf, "spi\n");
+        else
+                return sprintf(buf, "i2c\n");
+}
+
+static IIO_DEVICE_ATTR(bus_type, S_IRUGO, adt7316_show_bus_type, NULL, 0);
+
+static ssize_t adt7316_show_name(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%s\n", chip->name);
+}
+
+static IIO_DEVICE_ATTR(name, S_IRUGO, adt7316_show_name, NULL, 0);
+
+static struct attribute *adt7316_attributes[] = {
+        &iio_dev_attr_all_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_dev_attr_enabled.dev_attr.attr,
+        &iio_dev_attr_ad_channel.dev_attr.attr,
+        &iio_dev_attr_all_ad_channels.dev_attr.attr,
+        &iio_dev_attr_disable_averaging.dev_attr.attr,
+        &iio_dev_attr_enable_smbus_timeout.dev_attr.attr,
+        &iio_dev_attr_powerdown.dev_attr.attr,
+        &iio_dev_attr_fast_ad_clock.dev_attr.attr,
+        &iio_dev_attr_da_high_resolution.dev_attr.attr,
+        &iio_dev_attr_enable_proportion_DACA.dev_attr.attr,
+        &iio_dev_attr_enable_proportion_DACB.dev_attr.attr,
+        &iio_dev_attr_DAC_2Vref_channels_mask.dev_attr.attr,
+        &iio_dev_attr_DAC_update_mode.dev_attr.attr,
+        &iio_dev_attr_all_DAC_update_modes.dev_attr.attr,
+        &iio_dev_attr_update_DAC.dev_attr.attr,
+        &iio_dev_attr_DA_AB_Vref_bypass.dev_attr.attr,
+        &iio_dev_attr_DA_CD_Vref_bypass.dev_attr.attr,
+        &iio_dev_attr_DAC_internal_Vref.dev_attr.attr,
+        &iio_dev_attr_VDD.dev_attr.attr,
+        &iio_dev_attr_in_temp.dev_attr.attr,
+        &iio_dev_attr_ex_temp.dev_attr.attr,
+        &iio_dev_attr_in_temp_offset.dev_attr.attr,
+        &iio_dev_attr_ex_temp_offset.dev_attr.attr,
+        &iio_dev_attr_in_analog_temp_offset.dev_attr.attr,
+        &iio_dev_attr_ex_analog_temp_offset.dev_attr.attr,
+        &iio_dev_attr_DAC_A.dev_attr.attr,
+        &iio_dev_attr_DAC_B.dev_attr.attr,
+        &iio_dev_attr_DAC_C.dev_attr.attr,
+        &iio_dev_attr_DAC_D.dev_attr.attr,
+        &iio_dev_attr_device_id.dev_attr.attr,
+        &iio_dev_attr_manufactorer_id.dev_attr.attr,
+        &iio_dev_attr_device_rev.dev_attr.attr,
+        &iio_dev_attr_bus_type.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group adt7316_attribute_group = {
+        .attrs = adt7316_attributes,
+};
+
+static struct attribute *adt7516_attributes[] = {
+        &iio_dev_attr_all_modes.dev_attr.attr,
+        &iio_dev_attr_mode.dev_attr.attr,
+        &iio_dev_attr_select_ex_temp.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_dev_attr_enabled.dev_attr.attr,
+        &iio_dev_attr_ad_channel.dev_attr.attr,
+        &iio_dev_attr_all_ad_channels.dev_attr.attr,
+        &iio_dev_attr_disable_averaging.dev_attr.attr,
+        &iio_dev_attr_enable_smbus_timeout.dev_attr.attr,
+        &iio_dev_attr_powerdown.dev_attr.attr,
+        &iio_dev_attr_fast_ad_clock.dev_attr.attr,
+        &iio_dev_attr_AIN_internal_Vref.dev_attr.attr,
+        &iio_dev_attr_da_high_resolution.dev_attr.attr,
+        &iio_dev_attr_enable_proportion_DACA.dev_attr.attr,
+        &iio_dev_attr_enable_proportion_DACB.dev_attr.attr,
+        &iio_dev_attr_DAC_2Vref_channels_mask.dev_attr.attr,
+        &iio_dev_attr_DAC_update_mode.dev_attr.attr,
+        &iio_dev_attr_all_DAC_update_modes.dev_attr.attr,
+        &iio_dev_attr_update_DAC.dev_attr.attr,
+        &iio_dev_attr_DA_AB_Vref_bypass.dev_attr.attr,
+        &iio_dev_attr_DA_CD_Vref_bypass.dev_attr.attr,
+        &iio_dev_attr_DAC_internal_Vref.dev_attr.attr,
+        &iio_dev_attr_VDD.dev_attr.attr,
+        &iio_dev_attr_in_temp.dev_attr.attr,
+        &iio_dev_attr_ex_temp_AIN1.dev_attr.attr,
+        &iio_dev_attr_AIN2.dev_attr.attr,
+        &iio_dev_attr_AIN3.dev_attr.attr,
+        &iio_dev_attr_AIN4.dev_attr.attr,
+        &iio_dev_attr_in_temp_offset.dev_attr.attr,
+        &iio_dev_attr_ex_temp_offset.dev_attr.attr,
+        &iio_dev_attr_in_analog_temp_offset.dev_attr.attr,
+        &iio_dev_attr_ex_analog_temp_offset.dev_attr.attr,
+        &iio_dev_attr_DAC_A.dev_attr.attr,
+        &iio_dev_attr_DAC_B.dev_attr.attr,
+        &iio_dev_attr_DAC_C.dev_attr.attr,
+        &iio_dev_attr_DAC_D.dev_attr.attr,
+        &iio_dev_attr_device_id.dev_attr.attr,
+        &iio_dev_attr_manufactorer_id.dev_attr.attr,
+        &iio_dev_attr_device_rev.dev_attr.attr,
+        &iio_dev_attr_bus_type.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group adt7516_attribute_group = {
+        .attrs = adt7516_attributes,
+};
+
+
+/*
+ * temperature bound events
+ */
+
+#define IIO_EVENT_CODE_ADT7316_IN_TEMP_HIGH   IIO_BUFFER_EVENT_CODE(0)
+#define IIO_EVENT_CODE_ADT7316_IN_TEMP_LOW    IIO_BUFFER_EVENT_CODE(1)
+#define IIO_EVENT_CODE_ADT7316_EX_TEMP_HIGH   IIO_BUFFER_EVENT_CODE(2)
+#define IIO_EVENT_CODE_ADT7316_EX_TEMP_LOW    IIO_BUFFER_EVENT_CODE(3)
+#define IIO_EVENT_CODE_ADT7316_EX_TEMP_FAULT  IIO_BUFFER_EVENT_CODE(4)
+#define IIO_EVENT_CODE_ADT7516_AIN1           IIO_BUFFER_EVENT_CODE(5)
+#define IIO_EVENT_CODE_ADT7516_AIN2           IIO_BUFFER_EVENT_CODE(6)
+#define IIO_EVENT_CODE_ADT7516_AIN3           IIO_BUFFER_EVENT_CODE(7)
+#define IIO_EVENT_CODE_ADT7516_AIN4           IIO_BUFFER_EVENT_CODE(8)
+#define IIO_EVENT_CODE_ADT7316_VDD            IIO_BUFFER_EVENT_CODE(9)
+
+static void adt7316_interrupt_bh(struct work_struct *work_s)
+{
+        struct adt7316_chip_info *chip =
+                container_of(work_s, struct adt7316_chip_info, thresh_work);
+        u8 stat1, stat2;
+        int i, ret, count;
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_INT_STAT1, &stat1);
+        if (!ret) {
+                if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                        count = 8;
+                else
+                        count = 5;
+
+                for (i = 0; i < count; i++) {
+                        if (stat1 & (1 << i))
+                                iio_push_event(chip->indio_dev, 0,
+                                        IIO_EVENT_CODE_ADT7316_IN_TEMP_HIGH + i,
+                                        chip->last_timestamp);
+                }
+        }
+
+        ret = chip->bus.read(chip->bus.client, ADT7316_INT_STAT2, &stat2);
+        if (!ret) {
+                if (stat2 & ADT7316_INT_MASK2_VDD)
+                        iio_push_event(chip->indio_dev, 0,
+                                IIO_EVENT_CODE_ADT7316_VDD,
+                                chip->last_timestamp);
+        }
+
+        enable_irq(chip->bus.irq);
+}
+
+static int adt7316_interrupt(struct iio_dev *dev_info,
+                int index,
+                s64 timestamp,
+                int no_test)
+{
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        chip->last_timestamp = timestamp;
+        schedule_work(&chip->thresh_work);
+
+        return 0;
+}
+
+IIO_EVENT_SH(adt7316, &adt7316_interrupt);
+
+/*
+ * Show mask of enabled interrupts in Hex.
+ */
+static ssize_t adt7316_show_int_mask(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "0x%x\n", chip->int_mask);
+}
+
+/*
+ * Set 1 to the mask in Hex to enabled interrupts.
+ */
+static ssize_t adt7316_set_int_mask(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        unsigned long data;
+        int ret;
+        u8 mask;
+
+        ret = strict_strtoul(buf, 16, &data);
+        if (ret || data >= ADT7316_VDD_INT_MASK + 1)
+                return -EINVAL;
+
+        if (data & ADT7316_VDD_INT_MASK)
+                mask = 0;                       /* enable vdd int */
+        else
+                mask = ADT7316_INT_MASK2_VDD;   /* disable vdd int */
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_INT_MASK2, mask);
+        if (!ret) {
+                chip->int_mask &= ~ADT7316_VDD_INT_MASK;
+                chip->int_mask |= data & ADT7316_VDD_INT_MASK;
+        }
+
+        if (data & ADT7316_TEMP_AIN_INT_MASK) {
+                if ((chip->id & ID_FAMILY_MASK) == ID_ADT73XX)
+                        /* mask in reg is opposite, set 1 to disable */
+                        mask = (~data) & ADT7316_TEMP_INT_MASK;
+                else
+                        /* mask in reg is opposite, set 1 to disable */
+                        mask = (~data) & ADT7316_TEMP_AIN_INT_MASK;
+        }
+        ret = chip->bus.write(chip->bus.client, ADT7316_INT_MASK1, mask);
+
+        chip->int_mask = mask;
+
+        return len;
+}
+static inline ssize_t adt7316_show_ad_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 val;
+        int data;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT73XX &&
+                bound_reg > ADT7316_EX_TEMP_LOW)
+                return -EPERM;
+
+        ret = chip->bus.read(chip->bus.client, bound_reg, &val);
+        if (ret)
+                return -EIO;
+
+        data = (int)val;
+
+        if (!((chip->id & ID_FAMILY_MASK) == ID_ADT75XX &&
+                (chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0)) {
+                if (data & 0x80)
+                        data -= 256;
+        }
+
+        return sprintf(buf, "%d\n", data);
+}
+
+static inline ssize_t adt7316_set_ad_bound(struct device *dev,
+                struct device_attribute *attr,
+                u8 bound_reg,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        long data;
+        u8 val;
+        int ret;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT73XX &&
+                bound_reg > ADT7316_EX_TEMP_LOW)
+                return -EPERM;
+
+        ret = strict_strtol(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX &&
+                (chip->config1 & ADT7516_SEL_AIN1_2_EX_TEMP_MASK) == 0) {
+                if (data > 255 || data < 0)
+                        return -EINVAL;
+        } else {
+                if (data > 127 || data < -128)
+                        return -EINVAL;
+
+                if (data < 0)
+                        data += 256;
+        }
+
+        val = (u8)data;
+
+        ret = chip->bus.write(chip->bus.client, bound_reg, val);
+        if (ret)
+                return -EIO;
+
+        return len;
+}
+
+static ssize_t adt7316_show_in_temp_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7316_IN_TEMP_HIGH, buf);
+}
+
+static inline ssize_t adt7316_set_in_temp_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7316_IN_TEMP_HIGH, buf, len);
+}
+
+static ssize_t adt7316_show_in_temp_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7316_IN_TEMP_LOW, buf);
+}
+
+static inline ssize_t adt7316_set_in_temp_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7316_IN_TEMP_LOW, buf, len);
+}
+
+static ssize_t adt7316_show_ex_temp_ain1_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7316_EX_TEMP_HIGH, buf);
+}
+
+static inline ssize_t adt7316_set_ex_temp_ain1_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7316_EX_TEMP_HIGH, buf, len);
+}
+
+static ssize_t adt7316_show_ex_temp_ain1_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7316_EX_TEMP_LOW, buf);
+}
+
+static inline ssize_t adt7316_set_ex_temp_ain1_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7316_EX_TEMP_LOW, buf, len);
+}
+
+static ssize_t adt7316_show_ain2_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN2_HIGH, buf);
+}
+
+static inline ssize_t adt7316_set_ain2_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN2_HIGH, buf, len);
+}
+
+static ssize_t adt7316_show_ain2_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN2_LOW, buf);
+}
+
+static inline ssize_t adt7316_set_ain2_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN2_LOW, buf, len);
+}
+
+static ssize_t adt7316_show_ain3_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN3_HIGH, buf);
+}
+
+static inline ssize_t adt7316_set_ain3_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN3_HIGH, buf, len);
+}
+
+static ssize_t adt7316_show_ain3_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN3_LOW, buf);
+}
+
+static inline ssize_t adt7316_set_ain3_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN3_LOW, buf, len);
+}
+
+static ssize_t adt7316_show_ain4_high(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN4_HIGH, buf);
+}
+
+static inline ssize_t adt7316_set_ain4_high(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN4_HIGH, buf, len);
+}
+
+static ssize_t adt7316_show_ain4_low(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return adt7316_show_ad_bound(dev, attr,
+                        ADT7516_AIN4_LOW, buf);
+}
+
+static inline ssize_t adt7316_set_ain4_low(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        return adt7316_set_ad_bound(dev, attr,
+                        ADT7516_AIN4_LOW, buf, len);
+}
+
+static ssize_t adt7316_show_int_enabled(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return sprintf(buf, "%d\n", !!(chip->config1 & ADT7316_INT_EN));
+}
+
+static ssize_t adt7316_set_int_enabled(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        u8 config1;
+        int ret;
+
+        config1 = chip->config1 & (~ADT7316_INT_EN);
+        if (!memcmp(buf, "1", 1))
+                config1 |= ADT7316_INT_EN;
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, config1);
+        if (ret)
+                return -EIO;
+
+        chip->config1 = config1;
+
+        return len;
+}
+
+
+IIO_EVENT_ATTR_SH(int_mask, iio_event_adt7316,
+                adt7316_show_int_mask, adt7316_set_int_mask, 0);
+IIO_EVENT_ATTR_SH(in_temp_high, iio_event_adt7316,
+                adt7316_show_in_temp_high, adt7316_set_in_temp_high, 0);
+IIO_EVENT_ATTR_SH(in_temp_low, iio_event_adt7316,
+                adt7316_show_in_temp_low, adt7316_set_in_temp_low, 0);
+IIO_EVENT_ATTR_SH(ex_temp_high, iio_event_adt7316,
+                adt7316_show_ex_temp_ain1_high,
+                adt7316_set_ex_temp_ain1_high, 0);
+IIO_EVENT_ATTR_SH(ex_temp_low, iio_event_adt7316,
+                adt7316_show_ex_temp_ain1_low,
+                adt7316_set_ex_temp_ain1_low, 0);
+IIO_EVENT_ATTR_SH(ex_temp_ain1_high, iio_event_adt7316,
+                adt7316_show_ex_temp_ain1_high,
+                adt7316_set_ex_temp_ain1_high, 0);
+IIO_EVENT_ATTR_SH(ex_temp_ain1_low, iio_event_adt7316,
+                adt7316_show_ex_temp_ain1_low,
+                adt7316_set_ex_temp_ain1_low, 0);
+IIO_EVENT_ATTR_SH(ain2_high, iio_event_adt7316,
+                adt7316_show_ain2_high, adt7316_set_ain2_high, 0);
+IIO_EVENT_ATTR_SH(ain2_low, iio_event_adt7316,
+                adt7316_show_ain2_low, adt7316_set_ain2_low, 0);
+IIO_EVENT_ATTR_SH(ain3_high, iio_event_adt7316,
+                adt7316_show_ain3_high, adt7316_set_ain3_high, 0);
+IIO_EVENT_ATTR_SH(ain3_low, iio_event_adt7316,
+                adt7316_show_ain3_low, adt7316_set_ain3_low, 0);
+IIO_EVENT_ATTR_SH(ain4_high, iio_event_adt7316,
+                adt7316_show_ain4_high, adt7316_set_ain4_high, 0);
+IIO_EVENT_ATTR_SH(ain4_low, iio_event_adt7316,
+                adt7316_show_ain4_low, adt7316_set_ain4_low, 0);
+IIO_EVENT_ATTR_SH(int_enabled, iio_event_adt7316,
+                adt7316_show_int_enabled, adt7316_set_int_enabled, 0);
+
+static struct attribute *adt7316_event_attributes[] = {
+        &iio_event_attr_int_mask.dev_attr.attr,
+        &iio_event_attr_in_temp_high.dev_attr.attr,
+        &iio_event_attr_in_temp_low.dev_attr.attr,
+        &iio_event_attr_ex_temp_high.dev_attr.attr,
+        &iio_event_attr_ex_temp_low.dev_attr.attr,
+        &iio_event_attr_int_enabled.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adt7316_event_attribute_group = {
+        .attrs = adt7316_event_attributes,
+};
+
+static struct attribute *adt7516_event_attributes[] = {
+        &iio_event_attr_int_mask.dev_attr.attr,
+        &iio_event_attr_in_temp_high.dev_attr.attr,
+        &iio_event_attr_in_temp_low.dev_attr.attr,
+        &iio_event_attr_ex_temp_ain1_high.dev_attr.attr,
+        &iio_event_attr_ex_temp_ain1_low.dev_attr.attr,
+        &iio_event_attr_ain2_high.dev_attr.attr,
+        &iio_event_attr_ain2_low.dev_attr.attr,
+        &iio_event_attr_ain3_high.dev_attr.attr,
+        &iio_event_attr_ain3_low.dev_attr.attr,
+        &iio_event_attr_ain4_high.dev_attr.attr,
+        &iio_event_attr_ain4_low.dev_attr.attr,
+        &iio_event_attr_int_enabled.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group adt7516_event_attribute_group = {
+        .attrs = adt7516_event_attributes,
+};
+
+#ifdef CONFIG_PM
+int adt7316_disable(struct device *dev)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return _adt7316_store_enabled(chip, 0);
+}
+EXPORT_SYMBOL(adt7316_disable);
+
+int adt7316_enable(struct device *dev)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+
+        return _adt7316_store_enabled(chip, 1);
+}
+EXPORT_SYMBOL(adt7316_enable);
+#endif
+
+/*
+ * device probe and remove
+ */
+int __devinit adt7316_probe(struct device *dev, struct adt7316_bus *bus,
+                const char *name)
+{
+        struct adt7316_chip_info *chip;
+        unsigned short *adt7316_platform_data = dev->platform_data;
+        int ret = 0;
+
+        chip = kzalloc(sizeof(struct adt7316_chip_info), GFP_KERNEL);
+
+        if (chip == NULL)
+                return -ENOMEM;
+
+        /* this is only used for device removal purposes */
+        dev_set_drvdata(dev, chip);
+
+        chip->bus = *bus;
+        chip->name = name;
+
+        if (name[4] == '3')
+                chip->id = ID_ADT7316 + (name[6] - '6');
+        else if (name[4] == '5')
+                chip->id = ID_ADT7516 + (name[6] - '6');
+        else
+                return -ENODEV;
+
+        chip->ldac_pin = adt7316_platform_data[1];
+        if (chip->ldac_pin) {
+                chip->config3 |= ADT7316_DA_EN_VIA_DAC_LDCA;
+                if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                        chip->config1 |= ADT7516_SEL_AIN3;
+        }
+        chip->int_mask = ADT7316_TEMP_INT_MASK | ADT7316_VDD_INT_MASK;
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
+                chip->int_mask |= ADT7516_AIN_INT_MASK;
+
+        chip->indio_dev = iio_allocate_device();
+        if (chip->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_chip;
+        }
+
+        chip->indio_dev->dev.parent = dev;
+        if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) {
+                chip->indio_dev->attrs = &adt7516_attribute_group;
+                chip->indio_dev->event_attrs = &adt7516_event_attribute_group;
+        } else {
+                chip->indio_dev->attrs = &adt7316_attribute_group;
+                chip->indio_dev->event_attrs = &adt7316_event_attribute_group;
+        }
+        chip->indio_dev->dev_data = (void *)chip;
+        chip->indio_dev->driver_module = THIS_MODULE;
+        chip->indio_dev->num_interrupt_lines = 1;
+        chip->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(chip->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        if (chip->bus.irq > 0) {
+                if (adt7316_platform_data[0])
+                        chip->bus.irq_flags = adt7316_platform_data[0];
+
+                ret = iio_register_interrupt_line(chip->bus.irq,
+                                chip->indio_dev,
+                                0,
+                                chip->bus.irq_flags,
+                                chip->name);
+                if (ret)
+                        goto error_unreg_dev;
+
+                /*
+                 * The event handler list element refer to iio_event_adt7316.
+                 * All event attributes bind to the same event handler.
+                 * So, only register event handler once.
+                 */
+                iio_add_event_to_list(&iio_event_adt7316,
+                                &chip->indio_dev->interrupts[0]->ev_list);
+
+                INIT_WORK(&chip->thresh_work, adt7316_interrupt_bh);
+
+                if (chip->bus.irq_flags & IRQF_TRIGGER_HIGH)
+                        chip->config1 |= ADT7316_INT_POLARITY;
+        }
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG1, chip->config1);
+        if (ret) {
+                ret = -EIO;
+                goto error_unreg_irq;
+        }
+
+        ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, chip->config3);
+        if (ret) {
+                ret = -EIO;
+                goto error_unreg_irq;
+        }
+
+        dev_info(dev, "%s temperature sensor, ADC and DAC registered.\n",
+                        chip->name);
+
+        return 0;
+
+error_unreg_irq:
+        iio_unregister_interrupt_line(chip->indio_dev, 0);
+error_unreg_dev:
+        iio_device_unregister(chip->indio_dev);
+error_free_dev:
+        iio_free_device(chip->indio_dev);
+error_free_chip:
+        kfree(chip);
+
+        return ret;
+}
+EXPORT_SYMBOL(adt7316_probe);
+
+int __devexit adt7316_remove(struct device *dev)
+{
+
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct adt7316_chip_info *chip = dev_info->dev_data;
+        struct iio_dev *indio_dev = chip->indio_dev;
+
+        dev_set_drvdata(dev, NULL);
+        if (chip->bus.irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+        iio_device_unregister(indio_dev);
+        iio_free_device(chip->indio_dev);
+        kfree(chip);
+
+        return 0;
+}
+EXPORT_SYMBOL(adt7316_remove);
+
+MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
+MODULE_DESCRIPTION("Analog Devices ADT7316/7/8 and ADT7516/7/9 digital"
+                        " temperature sensor, ADC and DAC driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/addac/adt7316.h b/drivers/staging/iio/addac/adt7316.h
new file mode 100644
index 000000000000..d34bd679bb4e
--- /dev/null
+++ b/drivers/staging/iio/addac/adt7316.h
@@ -0,0 +1,33 @@
+/*
+ * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef _ADT7316_H_
+#define _ADT7316_H_
+
+#include <linux/types.h>
+
+#define ADT7316_REG_MAX_ADDR            0x3F
+
+struct adt7316_bus {
+        void *client;
+        int irq;
+        int irq_flags;
+        int (*read) (void *client, u8 reg, u8 *data);
+        int (*write) (void *client, u8 reg, u8 val);
+        int (*multi_read) (void *client, u8 first_reg, u8 count, u8 *data);
+        int (*multi_write) (void *client, u8 first_reg, u8 count, u8 *data);
+};
+
+#ifdef CONFIG_PM
+int adt7316_disable(struct device *dev);
+int adt7316_enable(struct device *dev);
+#endif
+int adt7316_probe(struct device *dev, struct adt7316_bus *bus, const char *name);
+int adt7316_remove(struct device *dev);
+
+#endif
diff --git a/drivers/staging/iio/dac/Kconfig b/drivers/staging/iio/dac/Kconfig
new file mode 100644
index 000000000000..9191bd23cc08
--- /dev/null
+++ b/drivers/staging/iio/dac/Kconfig
@@ -0,0 +1,21 @@
+#
+# DAC drivers
+#
+comment "Digital to analog convertors"
+
+config AD5624R_SPI
+        tristate "Analog Devices AD5624/44/64R DAC spi driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD5624R, AD5644R and
+          AD5664R convertors (DAC). This driver uses the common SPI interface.
+
+config AD5446
+        tristate "Analog Devices AD5444/6, AD5620/40/60 and AD5541A/12A DAC SPI driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD5444, AD5446,
+          AD5620, AD5640, AD5660 and AD5541A, AD5512A DACs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad5446.
diff --git a/drivers/staging/iio/dac/Makefile b/drivers/staging/iio/dac/Makefile
new file mode 100644
index 000000000000..7cf331b4e001
--- /dev/null
+++ b/drivers/staging/iio/dac/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for industrial I/O DAC drivers
+#
+
+obj-$(CONFIG_AD5624R_SPI) += ad5624r_spi.o
+obj-$(CONFIG_AD5446) += ad5446.o
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c
new file mode 100644
index 000000000000..e3387cd31145
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5446.c
@@ -0,0 +1,323 @@
+/*
+ * AD5446 SPI DAC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "dac.h"
+
+#include "ad5446.h"
+
+static void ad5446_store_sample(struct ad5446_state *st, unsigned val)
+{
+        st->data.d16 = cpu_to_be16(AD5446_LOAD |
+                                        (val << st->chip_info->left_shift));
+}
+
+static void ad5542_store_sample(struct ad5446_state *st, unsigned val)
+{
+        st->data.d16 = cpu_to_be16(val << st->chip_info->left_shift);
+}
+
+static void ad5620_store_sample(struct ad5446_state *st, unsigned val)
+{
+        st->data.d16 = cpu_to_be16(AD5620_LOAD |
+                                        (val << st->chip_info->left_shift));
+}
+
+static void ad5660_store_sample(struct ad5446_state *st, unsigned val)
+{
+        val |= AD5660_LOAD;
+        st->data.d24[0] = (val >> 16) & 0xFF;
+        st->data.d24[1] = (val >> 8) & 0xFF;
+        st->data.d24[2] = val & 0xFF;
+}
+
+static ssize_t ad5446_write(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad5446_state *st = dev_info->dev_data;
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+
+        if (val > RES_MASK(st->chip_info->bits)) {
+                ret = -EINVAL;
+                goto error_ret;
+        }
+
+        mutex_lock(&dev_info->mlock);
+        st->chip_info->store_sample(st, val);
+        ret = spi_sync(st->spi, &st->msg);
+        mutex_unlock(&dev_info->mlock);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static IIO_DEV_ATTR_OUT_RAW(0, ad5446_write, 0);
+
+static ssize_t ad5446_show_scale(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad5446_state *st = iio_dev_get_devdata(dev_info);
+        /* Corresponds to Vref / 2^(bits) */
+        unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits;
+
+        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+}
+static IIO_DEVICE_ATTR(out_scale, S_IRUGO, ad5446_show_scale, NULL, 0);
+
+static ssize_t ad5446_show_name(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad5446_state *st = iio_dev_get_devdata(dev_info);
+
+        return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name);
+}
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad5446_show_name, NULL, 0);
+
+static struct attribute *ad5446_attributes[] = {
+        &iio_dev_attr_out0_raw.dev_attr.attr,
+        &iio_dev_attr_out_scale.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad5446_attribute_group = {
+        .attrs = ad5446_attributes,
+};
+
+static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
+        [ID_AD5444] = {
+                .bits = 12,
+                .storagebits = 16,
+                .left_shift = 2,
+                .store_sample = ad5446_store_sample,
+        },
+        [ID_AD5446] = {
+                .bits = 14,
+                .storagebits = 16,
+                .left_shift = 0,
+                .store_sample = ad5446_store_sample,
+        },
+        [ID_AD5542A] = {
+                .bits = 16,
+                .storagebits = 16,
+                .left_shift = 0,
+                .store_sample = ad5542_store_sample,
+        },
+        [ID_AD5512A] = {
+                .bits = 12,
+                .storagebits = 16,
+                .left_shift = 4,
+                .store_sample = ad5542_store_sample,
+        },
+        [ID_AD5620_2500] = {
+                .bits = 12,
+                .storagebits = 16,
+                .left_shift = 2,
+                .int_vref_mv = 2500,
+                .store_sample = ad5620_store_sample,
+        },
+        [ID_AD5620_1250] = {
+                .bits = 12,
+                .storagebits = 16,
+                .left_shift = 2,
+                .int_vref_mv = 1250,
+                .store_sample = ad5620_store_sample,
+        },
+        [ID_AD5640_2500] = {
+                .bits = 14,
+                .storagebits = 16,
+                .left_shift = 0,
+                .int_vref_mv = 2500,
+                .store_sample = ad5620_store_sample,
+        },
+        [ID_AD5640_1250] = {
+                .bits = 14,
+                .storagebits = 16,
+                .left_shift = 0,
+                .int_vref_mv = 1250,
+                .store_sample = ad5620_store_sample,
+        },
+        [ID_AD5660_2500] = {
+                .bits = 16,
+                .storagebits = 24,
+                .left_shift = 0,
+                .int_vref_mv = 2500,
+                .store_sample = ad5660_store_sample,
+        },
+        [ID_AD5660_1250] = {
+                .bits = 16,
+                .storagebits = 24,
+                .left_shift = 0,
+                .int_vref_mv = 1250,
+                .store_sample = ad5660_store_sample,
+        },
+};
+
+static int __devinit ad5446_probe(struct spi_device *spi)
+{
+        struct ad5446_state *st;
+        int ret, voltage_uv = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        st->reg = regulator_get(&spi->dev, "vcc");
+        if (!IS_ERR(st->reg)) {
+                ret = regulator_enable(st->reg);
+                if (ret)
+                        goto error_put_reg;
+
+                voltage_uv = regulator_get_voltage(st->reg);
+        }
+
+        st->chip_info =
+                &ad5446_chip_info_tbl[spi_get_device_id(spi)->driver_data];
+
+        spi_set_drvdata(spi, st);
+
+        st->spi = spi;
+
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_disable_reg;
+        }
+
+        /* Estabilish that the iio_dev is a child of the spi device */
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->attrs = &ad5446_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        /* Setup default message */
+
+        st->xfer.tx_buf = &st->data;
+        st->xfer.len = st->chip_info->storagebits / 8;
+
+        spi_message_init(&st->msg);
+        spi_message_add_tail(&st->xfer, &st->msg);
+
+        switch (spi_get_device_id(spi)->driver_data) {
+                case ID_AD5620_2500:
+                case ID_AD5620_1250:
+                case ID_AD5640_2500:
+                case ID_AD5640_1250:
+                case ID_AD5660_2500:
+                case ID_AD5660_1250:
+                        st->vref_mv = st->chip_info->int_vref_mv;
+                        break;
+                default:
+                        if (voltage_uv)
+                                st->vref_mv = voltage_uv / 1000;
+                        else
+                                dev_warn(&spi->dev,
+                                         "reference voltage unspecified\n");
+        }
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_free_device;
+
+        return 0;
+
+error_free_device:
+        iio_free_device(st->indio_dev);
+error_disable_reg:
+        if (!IS_ERR(st->reg))
+                regulator_disable(st->reg);
+error_put_reg:
+        if (!IS_ERR(st->reg))
+                regulator_put(st->reg);
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int ad5446_remove(struct spi_device *spi)
+{
+        struct ad5446_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        iio_device_unregister(indio_dev);
+        if (!IS_ERR(st->reg)) {
+                regulator_disable(st->reg);
+                regulator_put(st->reg);
+        }
+        kfree(st);
+        return 0;
+}
+
+static const struct spi_device_id ad5446_id[] = {
+        {"ad5444", ID_AD5444},
+        {"ad5446", ID_AD5446},
+        {"ad5542a", ID_AD5542A},
+        {"ad5512a", ID_AD5512A},
+        {"ad5620-2500", ID_AD5620_2500}, /* AD5620/40/60: */
+        {"ad5620-1250", ID_AD5620_1250}, /* part numbers may look differently */
+        {"ad5640-2500", ID_AD5640_2500},
+        {"ad5640-1250", ID_AD5640_1250},
+        {"ad5660-2500", ID_AD5660_2500},
+        {"ad5660-1250", ID_AD5660_1250},
+        {}
+};
+
+static struct spi_driver ad5446_driver = {
+        .driver = {
+                .name   = "ad5446",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ad5446_probe,
+        .remove         = __devexit_p(ad5446_remove),
+        .id_table       = ad5446_id,
+};
+
+static int __init ad5446_init(void)
+{
+        return spi_register_driver(&ad5446_driver);
+}
+module_init(ad5446_init);
+
+static void __exit ad5446_exit(void)
+{
+        spi_unregister_driver(&ad5446_driver);
+}
+module_exit(ad5446_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("Analog Devices AD5444/AD5446 DAC");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad5446");
diff --git a/drivers/staging/iio/dac/ad5446.h b/drivers/staging/iio/dac/ad5446.h
new file mode 100644
index 000000000000..902542e22c4a
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5446.h
@@ -0,0 +1,96 @@
+/*
+ * AD5446 SPI DAC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef IIO_DAC_AD5446_H_
+#define IIO_DAC_AD5446_H_
+
+/* DAC Control Bits */
+
+#define AD5446_LOAD             (0x0 << 14) /* Load and update */
+#define AD5446_SDO_DIS          (0x1 << 14) /* Disable SDO */
+#define AD5446_NOP              (0x2 << 14) /* No operation */
+#define AD5446_CLK_RISING       (0x3 << 14) /* Clock data on rising edge */
+
+#define AD5620_LOAD             (0x0 << 14) /* Load and update Norm Operation*/
+#define AD5620_PWRDWN_1k        (0x1 << 14) /* Power-down: 1kOhm to GND */
+#define AD5620_PWRDWN_100k      (0x2 << 14) /* Power-down: 100kOhm to GND */
+#define AD5620_PWRDWN_TRISTATE  (0x3 << 14) /* Power-down: Three-state */
+
+#define AD5660_LOAD             (0x0 << 16) /* Load and update Norm Operation*/
+#define AD5660_PWRDWN_1k        (0x1 << 16) /* Power-down: 1kOhm to GND */
+#define AD5660_PWRDWN_100k      (0x2 << 16) /* Power-down: 100kOhm to GND */
+#define AD5660_PWRDWN_TRISTATE  (0x3 << 16) /* Power-down: Three-state */
+
+#define RES_MASK(bits)  ((1 << (bits)) - 1)
+
+/**
+ * struct ad5446_state - driver instance specific data
+ * @indio_dev:          the industrial I/O device
+ * @spi:                spi_device
+ * @chip_info:          chip model specific constants, available modes etc
+ * @reg:                supply regulator
+ * @poll_work:          bottom half of polling interrupt handler
+ * @vref_mv:            actual reference voltage used
+ * @xfer:               default spi transfer
+ * @msg:                default spi message
+ * @data:               spi transmit buffer
+ */
+
+struct ad5446_state {
+        struct iio_dev                  *indio_dev;
+        struct spi_device               *spi;
+        const struct ad5446_chip_info   *chip_info;
+        struct regulator                *reg;
+        struct work_struct              poll_work;
+        unsigned short                  vref_mv;
+        struct spi_transfer             xfer;
+        struct spi_message              msg;
+        union {
+                unsigned short          d16;
+                unsigned char           d24[3];
+        } data;
+};
+
+/**
+ * struct ad5446_chip_info - chip specific information
+ * @bits:               accuracy of the DAC in bits
+ * @storagebits:        number of bits written to the DAC
+ * @left_shift:         number of bits the datum must be shifted
+ * @int_vref_mv:        AD5620/40/60: the internal reference voltage
+ * @store_sample:       chip specific helper function to store the datum
+ */
+
+struct ad5446_chip_info {
+        u8                              bits;
+        u8                              storagebits;
+        u8                              left_shift;
+        u16                             int_vref_mv;
+        void (*store_sample)            (struct ad5446_state *st, unsigned val);
+};
+
+/**
+ * ad5446_supported_device_ids:
+ * The AD5620/40/60 parts are available in different fixed internal reference
+ * voltage options. The actual part numbers may look differently
+ * (and a bit cryptic), however this style is used to make clear which
+ * parts are supported here.
+ */
+
+enum ad5446_supported_device_ids {
+        ID_AD5444,
+        ID_AD5446,
+        ID_AD5542A,
+        ID_AD5512A,
+        ID_AD5620_2500,
+        ID_AD5620_1250,
+        ID_AD5640_2500,
+        ID_AD5640_1250,
+        ID_AD5660_2500,
+        ID_AD5660_1250,
+};
+
+#endif /* IIO_DAC_AD5446_H_ */
diff --git a/drivers/staging/iio/dac/ad5624r.h b/drivers/staging/iio/dac/ad5624r.h
new file mode 100644
index 000000000000..ce518be652b7
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5624r.h
@@ -0,0 +1,21 @@
+#ifndef SPI_AD5624R_H_
+#define SPI_AD5624R_H_
+
+#define AD5624R_DAC_CHANNELS    4
+
+#define AD5624R_ADDR_DAC0       0x0
+#define AD5624R_ADDR_DAC1       0x1
+#define AD5624R_ADDR_DAC2       0x2
+#define AD5624R_ADDR_DAC3       0x3
+#define AD5624R_ADDR_ALL_DAC    0x7
+
+#define AD5624R_CMD_WRITE_INPUT_N             0x0
+#define AD5624R_CMD_UPDATE_DAC_N              0x1
+#define AD5624R_CMD_WRITE_INPUT_N_UPDATE_ALL  0x2
+#define AD5624R_CMD_WRITE_INPUT_N_UPDATE_N    0x3
+#define AD5624R_CMD_POWERDOWN_DAC             0x4
+#define AD5624R_CMD_RESET                     0x5
+#define AD5624R_CMD_LDAC_SETUP                0x6
+#define AD5624R_CMD_INTERNAL_REFER_SETUP      0x7
+
+#endif
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
new file mode 100644
index 000000000000..2b1c6dde4fdd
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -0,0 +1,300 @@
+/*
+ * AD5624R, AD5644R, AD5664R Digital to analog convertors spi driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/delay.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "dac.h"
+#include "ad5624r.h"
+
+/**
+ * struct ad5624r_state - device related storage
+ * @indio_dev:  associated industrial IO device
+ * @us:         spi device
+ **/
+struct ad5624r_state {
+        struct iio_dev *indio_dev;
+        struct spi_device *us;
+        int data_len;
+        int ldac_mode;
+        int dac_power_mode[AD5624R_DAC_CHANNELS];
+        int internal_ref;
+};
+
+static int ad5624r_spi_write(struct spi_device *spi,
+                             u8 cmd, u8 addr, u16 val, u8 len)
+{
+        u32 data;
+        u8 msg[3];
+
+        /*
+         * The input shift register is 24 bits wide. The first two bits are don't care bits.
+         * The next three are the command bits, C2 to C0, followed by the 3-bit DAC address,
+         * A2 to A0, and then the 16-, 14-, 12-bit data-word. The data-word comprises the 16-,
+         * 14-, 12-bit input code followed by 0, 2, or 4 don't care bits, for the AD5664R,
+         * AD5644R, and AD5624R, respectively.
+         */
+        data = (0 << 22) | (cmd << 19) | (addr << 16) | (val << (16 - len));
+        msg[0] = data >> 16;
+        msg[1] = data >> 8;
+        msg[2] = data;
+
+        return spi_write(spi, msg, 3);
+}
+
+static ssize_t ad5624r_write_dac(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t len)
+{
+        long readin;
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = strict_strtol(buf, 10, &readin);
+        if (ret)
+                return ret;
+
+        ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
+                                this_attr->address, readin, st->data_len);
+        return ret ? ret : len;
+}
+
+static ssize_t ad5624r_read_ldac_mode(struct device *dev,
+                                      struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+
+        return sprintf(buf, "%x\n", st->ldac_mode);
+}
+
+static ssize_t ad5624r_write_ldac_mode(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t len)
+{
+        long readin;
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+
+        ret = strict_strtol(buf, 16, &readin);
+        if (ret)
+                return ret;
+
+        ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0,
+                                readin & 0xF, 16);
+        st->ldac_mode = readin & 0xF;
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        return sprintf(buf, "%d\n", st->dac_power_mode[this_attr->address]);
+}
+
+static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
+                                            struct device_attribute *attr,
+                                            const char *buf, size_t len)
+{
+        long readin;
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = strict_strtol(buf, 10, &readin);
+        if (ret)
+                return ret;
+
+        ret = ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,
+                                ((readin & 0x3) << 4) |
+                                (1 << this_attr->address), 16);
+
+        st->dac_power_mode[this_attr->address] = readin & 0x3;
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
+                                              struct device_attribute *attr,
+                                              char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+
+        return sprintf(buf, "%d\n", st->internal_ref);
+}
+
+static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
+                                               struct device_attribute *attr,
+                                               const char *buf, size_t len)
+{
+        long readin;
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5624r_state *st = indio_dev->dev_data;
+
+        ret = strict_strtol(buf, 10, &readin);
+        if (ret)
+                return ret;
+
+        ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0,
+                                !!readin, 16);
+
+        st->internal_ref = !!readin;
+
+        return ret ? ret : len;
+}
+
+static IIO_DEV_ATTR_OUT_RAW(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
+static IIO_DEV_ATTR_OUT_RAW(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
+static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
+static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
+
+static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
+                       ad5624r_write_ldac_mode, 0);
+static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR,
+                       ad5624r_read_internal_ref_mode,
+                       ad5624r_write_internal_ref_mode, 0);
+
+#define IIO_DEV_ATTR_DAC_POWER_MODE(_num, _show, _store, _addr)                 \
+        IIO_DEVICE_ATTR(dac_power_mode_##_num, S_IRUGO | S_IWUSR, _show, _store, _addr)
+
+static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode,
+                                   ad5624r_write_dac_power_mode, 0);
+static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode,
+                                   ad5624r_write_dac_power_mode, 1);
+static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode,
+                                   ad5624r_write_dac_power_mode, 2);
+static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode,
+                                   ad5624r_write_dac_power_mode, 3);
+
+static struct attribute *ad5624r_attributes[] = {
+        &iio_dev_attr_out0_raw.dev_attr.attr,
+        &iio_dev_attr_out1_raw.dev_attr.attr,
+        &iio_dev_attr_out2_raw.dev_attr.attr,
+        &iio_dev_attr_out3_raw.dev_attr.attr,
+        &iio_dev_attr_dac_power_mode_0.dev_attr.attr,
+        &iio_dev_attr_dac_power_mode_1.dev_attr.attr,
+        &iio_dev_attr_dac_power_mode_2.dev_attr.attr,
+        &iio_dev_attr_dac_power_mode_3.dev_attr.attr,
+        &iio_dev_attr_ldac_mode.dev_attr.attr,
+        &iio_dev_attr_internal_ref.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad5624r_attribute_group = {
+        .attrs = ad5624r_attributes,
+};
+
+static int __devinit ad5624r_probe(struct spi_device *spi)
+{
+        struct ad5624r_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        st->data_len = spi_get_device_id(spi)->driver_data;
+
+        st->us = spi;
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 0;
+        st->indio_dev->event_attrs = NULL;
+
+        st->indio_dev->attrs = &ad5624r_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        spi->mode = SPI_MODE_0;
+        spi_setup(spi);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->indio_dev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad5624r_remove(struct spi_device *spi)
+{
+        struct ad5624r_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->indio_dev);
+        kfree(st);
+
+        return 0;
+}
+
+static const struct spi_device_id ad5624r_id[] = {
+        {"ad5624r", 12},
+        {"ad5644r", 14},
+        {"ad5664r", 16},
+        {}
+};
+
+static struct spi_driver ad5624r_driver = {
+        .driver = {
+                   .name = "ad5624r",
+                   .owner = THIS_MODULE,
+                   },
+        .probe = ad5624r_probe,
+        .remove = __devexit_p(ad5624r_remove),
+        .id_table = ad5624r_id,
+};
+
+static __init int ad5624r_spi_init(void)
+{
+        return spi_register_driver(&ad5624r_driver);
+}
+module_init(ad5624r_spi_init);
+
+static __exit void ad5624r_spi_exit(void)
+{
+        spi_unregister_driver(&ad5624r_driver);
+}
+module_exit(ad5624r_spi_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices AD5624/44/64R DAC spi driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dac/dac.h b/drivers/staging/iio/dac/dac.h
new file mode 100644
index 000000000000..1d82f353241c
--- /dev/null
+++ b/drivers/staging/iio/dac/dac.h
@@ -0,0 +1,6 @@
+/*
+ * dac.h - sysfs attributes associated with DACs
+ */
+
+#define IIO_DEV_ATTR_OUT_RAW(_num, _store, _addr)                               \
+        IIO_DEVICE_ATTR(out##_num##_raw, S_IWUSR, NULL, _store, _addr)
diff --git a/drivers/staging/iio/dds/Kconfig b/drivers/staging/iio/dds/Kconfig
new file mode 100644
index 000000000000..a047da62daf0
--- /dev/null
+++ b/drivers/staging/iio/dds/Kconfig
@@ -0,0 +1,56 @@
+#
+# Direct Digital Synthesis drivers
+#
+comment "Direct Digital Synthesis"
+
+config AD5930
+        tristate "Analog Devices ad5930/5932 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad5930/ad5932, provides direct access via sysfs.
+
+config AD9832
+        tristate "Analog Devices ad9832/5 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad9832 and ad9835, provides direct access via sysfs.
+
+config AD9834
+        tristate "Analog Devices ad9833/4/ driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          AD9833 and AD9834, provides direct access via sysfs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad9834.
+
+config AD9850
+        tristate "Analog Devices ad9850/1 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad9850/1, provides direct access via sysfs.
+
+config AD9852
+        tristate "Analog Devices ad9852/4 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad9852/4, provides direct access via sysfs.
+
+config AD9910
+        tristate "Analog Devices ad9910 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad9910, provides direct access via sysfs.
+
+config AD9951
+        tristate "Analog Devices ad9951 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices DDS chip
+          ad9951, provides direct access via sysfs.
diff --git a/drivers/staging/iio/dds/Makefile b/drivers/staging/iio/dds/Makefile
new file mode 100644
index 000000000000..147746176b9b
--- /dev/null
+++ b/drivers/staging/iio/dds/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for Direct Digital Synthesis drivers
+#
+
+obj-$(CONFIG_AD5930) += ad5930.o
+obj-$(CONFIG_AD9832) += ad9832.o
+obj-$(CONFIG_AD9834) += ad9834.o
+obj-$(CONFIG_AD9850) += ad9850.o
+obj-$(CONFIG_AD9852) += ad9852.o
+obj-$(CONFIG_AD9910) += ad9910.o
+obj-$(CONFIG_AD9951) += ad9951.o
diff --git a/drivers/staging/iio/dds/ad5930.c b/drivers/staging/iio/dds/ad5930.c
new file mode 100644
index 000000000000..f80039c5d539
--- /dev/null
+++ b/drivers/staging/iio/dds/ad5930.c
@@ -0,0 +1,170 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad5930
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad5930"
+
+#define value_mask (u16)0xf000
+#define addr_shift 12
+
+/* Register format: 4 bits addr + 12 bits value */
+struct ad5903_config {
+        u16 control;
+        u16 incnum;
+        u16 frqdelt[2];
+        u16 incitvl;
+        u16 buritvl;
+        u16 strtfrq[2];
+};
+
+struct ad5930_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad5930_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad5903_config *config = (struct ad5903_config *)buf;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad5930_state *st = idev->dev_data;
+
+        config->control = (config->control & ~value_mask);
+        config->incnum = (config->control & ~value_mask) | (1 << addr_shift);
+        config->frqdelt[0] = (config->control & ~value_mask) | (2 << addr_shift);
+        config->frqdelt[1] = (config->control & ~value_mask) | 3 << addr_shift;
+        config->incitvl = (config->control & ~value_mask) | 4 << addr_shift;
+        config->buritvl = (config->control & ~value_mask) | 8 << addr_shift;
+        config->strtfrq[0] = (config->control & ~value_mask) | 0xc << addr_shift;
+        config->strtfrq[1] = (config->control & ~value_mask) | 0xd << addr_shift;
+
+        xfer.len = len;
+        xfer.tx_buf = config;
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad5930_set_parameter, 0);
+
+static struct attribute *ad5930_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad5930_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad5930_attributes,
+};
+
+static int __devinit ad5930_probe(struct spi_device *spi)
+{
+        struct ad5930_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad5930_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 16;
+        spi_setup(spi);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad5930_remove(struct spi_device *spi)
+{
+        struct ad5930_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad5930_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad5930_probe,
+        .remove = __devexit_p(ad5930_remove),
+};
+
+static __init int ad5930_spi_init(void)
+{
+        return spi_register_driver(&ad5930_driver);
+}
+module_init(ad5930_spi_init);
+
+static __exit void ad5930_spi_exit(void)
+{
+        spi_unregister_driver(&ad5930_driver);
+}
+module_exit(ad5930_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad5930 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad9832.c b/drivers/staging/iio/dds/ad9832.c
new file mode 100644
index 000000000000..e911893b3db0
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9832.c
@@ -0,0 +1,264 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad9832
+ *
+ * Copyright (c) 2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad9832"
+
+#define value_mask (u16)0xf000
+#define cmd_shift 12
+#define add_shift 8
+#define AD9832_SYNC (1 << 13)
+#define AD9832_SELSRC (1 << 12)
+#define AD9832_SLEEP (1 << 13)
+#define AD9832_RESET (1 << 12)
+#define AD9832_CLR (1 << 11)
+
+#define ADD_FREQ0LL 0x0
+#define ADD_FREQ0HL 0x1
+#define ADD_FREQ0LM 0x2
+#define ADD_FREQ0HM 0x3
+#define ADD_FREQ1LL 0x4
+#define ADD_FREQ1HL 0x5
+#define ADD_FREQ1LM 0x6
+#define ADD_FREQ1HM 0x7
+#define ADD_PHASE0L 0x8
+#define ADD_PHASE0H 0x9
+#define ADD_PHASE1L 0xa
+#define ADD_PHASE1H 0xb
+#define ADD_PHASE2L 0xc
+#define ADD_PHASE2H 0xd
+#define ADD_PHASE3L 0xe
+#define ADD_PHASE3H 0xf
+
+#define CMD_PHA8BITSW 0x1
+#define CMD_PHA16BITSW 0x0
+#define CMD_FRE8BITSW 0x3
+#define CMD_FRE16BITSW 0x2
+#define CMD_SELBITSCTL 0x6
+
+struct ad9832_setting {
+        u16 freq0[4];
+        u16 freq1[4];
+        u16 phase0[2];
+        u16 phase1[2];
+        u16 phase2[2];
+        u16 phase3[2];
+};
+
+struct ad9832_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad9832_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad9832_setting config;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad9832_state *st = idev->dev_data;
+
+        config.freq0[0] = (CMD_FRE8BITSW << add_shift | ADD_FREQ0LL << add_shift | buf[0]);
+        config.freq0[1] = (CMD_FRE16BITSW << add_shift | ADD_FREQ0HL << add_shift | buf[1]);
+        config.freq0[2] = (CMD_FRE8BITSW << add_shift | ADD_FREQ0LM << add_shift | buf[2]);
+        config.freq0[3] = (CMD_FRE16BITSW << add_shift | ADD_FREQ0HM << add_shift | buf[3]);
+        config.freq1[0] = (CMD_FRE8BITSW << add_shift | ADD_FREQ1LL << add_shift | buf[4]);
+        config.freq1[1] = (CMD_FRE16BITSW << add_shift | ADD_FREQ1HL << add_shift | buf[5]);
+        config.freq1[2] = (CMD_FRE8BITSW << add_shift | ADD_FREQ1LM << add_shift | buf[6]);
+        config.freq1[3] = (CMD_FRE16BITSW << add_shift | ADD_FREQ1HM << add_shift | buf[7]);
+
+        config.phase0[0] = (CMD_PHA8BITSW << add_shift | ADD_PHASE0L << add_shift | buf[9]);
+        config.phase0[1] = (CMD_PHA16BITSW << add_shift | ADD_PHASE0H << add_shift | buf[10]);
+        config.phase1[0] = (CMD_PHA8BITSW << add_shift | ADD_PHASE1L << add_shift | buf[11]);
+        config.phase1[1] = (CMD_PHA16BITSW << add_shift | ADD_PHASE1H << add_shift | buf[12]);
+        config.phase2[0] = (CMD_PHA8BITSW << add_shift | ADD_PHASE2L << add_shift | buf[13]);
+        config.phase2[1] = (CMD_PHA16BITSW << add_shift | ADD_PHASE2H << add_shift | buf[14]);
+        config.phase3[0] = (CMD_PHA8BITSW << add_shift | ADD_PHASE3L << add_shift | buf[15]);
+        config.phase3[1] = (CMD_PHA16BITSW << add_shift | ADD_PHASE3H << add_shift | buf[16]);
+
+        xfer.len = 2 * len;
+        xfer.tx_buf = &config;
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9832_set_parameter, 0);
+
+static struct attribute *ad9832_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad9832_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad9832_attributes,
+};
+
+static void ad9832_init(struct ad9832_state *st)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        u16 config = 0;
+
+        config = 0x3 << 14 | AD9832_SLEEP | AD9832_RESET | AD9832_CLR;
+
+        mutex_lock(&st->lock);
+
+        xfer.len = 2;
+        xfer.tx_buf = &config;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        config = 0x2 << 14 | AD9832_SYNC | AD9832_SELSRC;
+        xfer.len = 2;
+        xfer.tx_buf = &config;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        config = CMD_SELBITSCTL << cmd_shift;
+        xfer.len = 2;
+        xfer.tx_buf = &config;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        config = 0x3 << 14;
+
+        xfer.len = 2;
+        xfer.tx_buf = &config;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+
+
+}
+
+static int __devinit ad9832_probe(struct spi_device *spi)
+{
+        struct ad9832_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad9832_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 16;
+        spi_setup(spi);
+        ad9832_init(st);
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9832_remove(struct spi_device *spi)
+{
+        struct ad9832_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad9832_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad9832_probe,
+        .remove = __devexit_p(ad9832_remove),
+};
+
+static __init int ad9832_spi_init(void)
+{
+        return spi_register_driver(&ad9832_driver);
+}
+module_init(ad9832_spi_init);
+
+static __exit void ad9832_spi_exit(void)
+{
+        spi_unregister_driver(&ad9832_driver);
+}
+module_exit(ad9832_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad9832 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad9834.c b/drivers/staging/iio/dds/ad9834.c
new file mode 100644
index 000000000000..eb1a681874f9
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9834.c
@@ -0,0 +1,477 @@
+/*
+ * AD9834 SPI DAC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
+#include <asm/div64.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "dds.h"
+
+#include "ad9834.h"
+
+static unsigned int ad9834_calc_freqreg(unsigned long mclk, unsigned long fout)
+{
+        unsigned long long freqreg = (u64) fout * (u64) (1 << AD9834_FREQ_BITS);
+        do_div(freqreg, mclk);
+        return freqreg;
+}
+
+static int ad9834_write_frequency(struct ad9834_state *st,
+                                  unsigned long addr, unsigned long fout)
+{
+        unsigned long regval;
+
+        if (fout > (st->mclk / 2))
+                return -EINVAL;
+
+        regval = ad9834_calc_freqreg(st->mclk, fout);
+
+        st->freq_data[0] = cpu_to_be16(addr | (regval &
+                                       RES_MASK(AD9834_FREQ_BITS / 2)));
+        st->freq_data[1] = cpu_to_be16(addr | ((regval >>
+                                       (AD9834_FREQ_BITS / 2)) &
+                                       RES_MASK(AD9834_FREQ_BITS / 2)));
+
+        return spi_sync(st->spi, &st->freq_msg);;
+}
+
+static int ad9834_write_phase(struct ad9834_state *st,
+                                  unsigned long addr, unsigned long phase)
+{
+        if (phase > (1 << AD9834_PHASE_BITS))
+                return -EINVAL;
+        st->data = cpu_to_be16(addr | phase);
+
+        return spi_sync(st->spi, &st->msg);
+}
+
+static ssize_t ad9834_write(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = dev_info->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtoul(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+
+        mutex_lock(&dev_info->mlock);
+        switch (this_attr->address) {
+        case AD9834_REG_FREQ0:
+        case AD9834_REG_FREQ1:
+                ret = ad9834_write_frequency(st, this_attr->address, val);
+                break;
+        case AD9834_REG_PHASE0:
+        case AD9834_REG_PHASE1:
+                ret = ad9834_write_phase(st, this_attr->address, val);
+                break;
+        case AD9834_OPBITEN:
+                if (st->control & AD9834_MODE) {
+                        ret = -EINVAL;  /* AD9843 reserved mode */
+                        break;
+                }
+
+                if (val)
+                        st->control |= AD9834_OPBITEN;
+                else
+                        st->control &= ~AD9834_OPBITEN;
+
+                st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+                ret = spi_sync(st->spi, &st->msg);
+                break;
+        case AD9834_PIN_SW:
+                if (val)
+                        st->control |= AD9834_PIN_SW;
+                else
+                        st->control &= ~AD9834_PIN_SW;
+                st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+                ret = spi_sync(st->spi, &st->msg);
+                break;
+        case AD9834_FSEL:
+        case AD9834_PSEL:
+                if (val == 0)
+                        st->control &= ~(this_attr->address | AD9834_PIN_SW);
+                else if (val == 1) {
+                        st->control |= this_attr->address;
+                        st->control &= ~AD9834_PIN_SW;
+                } else {
+                        ret = -EINVAL;
+                        break;
+                }
+                st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+                ret = spi_sync(st->spi, &st->msg);
+                break;
+        case AD9834_RESET:
+                if (val)
+                        st->control &= ~AD9834_RESET;
+                else
+                        st->control |= AD9834_RESET;
+
+                st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+                ret = spi_sync(st->spi, &st->msg);
+                break;
+        default:
+                ret = -ENODEV;
+        }
+        mutex_unlock(&dev_info->mlock);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ad9834_store_wavetype(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf,
+                                 size_t len)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = dev_info->dev_data;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret = 0;
+        bool is_ad9833 = st->devid == ID_AD9833;
+
+        mutex_lock(&dev_info->mlock);
+
+        switch (this_attr->address) {
+        case 0:
+                if (sysfs_streq(buf, "sine")) {
+                        st->control &= ~AD9834_MODE;
+                        if (is_ad9833)
+                                st->control &= ~AD9834_OPBITEN;
+                } else if (sysfs_streq(buf, "triangle")) {
+                        if (is_ad9833) {
+                                st->control &= ~AD9834_OPBITEN;
+                                st->control |= AD9834_MODE;
+                        } else if (st->control & AD9834_OPBITEN) {
+                                ret = -EINVAL;  /* AD9843 reserved mode */
+                        } else {
+                                st->control |= AD9834_MODE;
+                        }
+                } else if (is_ad9833 && sysfs_streq(buf, "square")) {
+                        st->control &= ~AD9834_MODE;
+                        st->control |= AD9834_OPBITEN;
+                } else {
+                        ret = -EINVAL;
+                }
+
+                break;
+        case 1:
+                if (sysfs_streq(buf, "square") &&
+                        !(st->control & AD9834_MODE)) {
+                        st->control &= ~AD9834_MODE;
+                        st->control |= AD9834_OPBITEN;
+                } else {
+                        ret = -EINVAL;
+                }
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        if (!ret) {
+                st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+                ret = spi_sync(st->spi, &st->msg);
+        }
+        mutex_unlock(&dev_info->mlock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad9834_show_name(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = iio_dev_get_devdata(dev_info);
+
+        return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name);
+}
+static IIO_DEVICE_ATTR(name, S_IRUGO, ad9834_show_name, NULL, 0);
+
+static ssize_t ad9834_show_out0_wavetype_available(struct device *dev,
+                                                struct device_attribute *attr,
+                                                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = iio_dev_get_devdata(dev_info);
+        char *str;
+
+        if (st->devid == ID_AD9833)
+                str = "sine triangle square";
+        else if (st->control & AD9834_OPBITEN)
+                str = "sine";
+        else
+                str = "sine triangle";
+
+        return sprintf(buf, "%s\n", str);
+}
+
+
+static IIO_DEVICE_ATTR(dds0_out0_wavetype_available, S_IRUGO,
+                       ad9834_show_out0_wavetype_available, NULL, 0);
+
+static ssize_t ad9834_show_out1_wavetype_available(struct device *dev,
+                                                struct device_attribute *attr,
+                                                char *buf)
+{
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = iio_dev_get_devdata(dev_info);
+        char *str;
+
+        if (st->control & AD9834_MODE)
+                str = "";
+        else
+                str = "square";
+
+        return sprintf(buf, "%s\n", str);
+}
+
+static IIO_DEVICE_ATTR(dds0_out1_wavetype_available, S_IRUGO,
+                       ad9834_show_out1_wavetype_available, NULL, 0);
+
+/**
+ * see dds.h for further information
+ */
+
+static IIO_DEV_ATTR_FREQ(0, 0, S_IWUSR, NULL, ad9834_write, AD9834_REG_FREQ0);
+static IIO_DEV_ATTR_FREQ(0, 1, S_IWUSR, NULL, ad9834_write, AD9834_REG_FREQ1);
+static IIO_DEV_ATTR_FREQSYMBOL(0, S_IWUSR, NULL, ad9834_write, AD9834_FSEL);
+static IIO_CONST_ATTR_FREQ_SCALE(0, "1"); /* 1Hz */
+
+static IIO_DEV_ATTR_PHASE(0, 0, S_IWUSR, NULL, ad9834_write, AD9834_REG_PHASE0);
+static IIO_DEV_ATTR_PHASE(0, 1, S_IWUSR, NULL, ad9834_write, AD9834_REG_PHASE1);
+static IIO_DEV_ATTR_PHASESYMBOL(0, S_IWUSR, NULL, ad9834_write, AD9834_PSEL);
+static IIO_CONST_ATTR_PHASE_SCALE(0, "0.0015339808"); /* 2PI/2^12 rad*/
+
+static IIO_DEV_ATTR_PINCONTROL_EN(0, S_IWUSR, NULL,
+        ad9834_write, AD9834_PIN_SW);
+static IIO_DEV_ATTR_OUT_ENABLE(0, S_IWUSR, NULL, ad9834_write, AD9834_RESET);
+static IIO_DEV_ATTR_OUTY_ENABLE(0, 1, S_IWUSR, NULL,
+        ad9834_write, AD9834_OPBITEN);
+static IIO_DEV_ATTR_OUT_WAVETYPE(0, 0, ad9834_store_wavetype, 0);
+static IIO_DEV_ATTR_OUT_WAVETYPE(0, 1, ad9834_store_wavetype, 1);
+
+static struct attribute *ad9834_attributes[] = {
+        &iio_dev_attr_dds0_freq0.dev_attr.attr,
+        &iio_dev_attr_dds0_freq1.dev_attr.attr,
+        &iio_const_attr_dds0_freq_scale.dev_attr.attr,
+        &iio_dev_attr_dds0_phase0.dev_attr.attr,
+        &iio_dev_attr_dds0_phase1.dev_attr.attr,
+        &iio_const_attr_dds0_phase_scale.dev_attr.attr,
+        &iio_dev_attr_dds0_pincontrol_en.dev_attr.attr,
+        &iio_dev_attr_dds0_freqsymbol.dev_attr.attr,
+        &iio_dev_attr_dds0_phasesymbol.dev_attr.attr,
+        &iio_dev_attr_dds0_out_enable.dev_attr.attr,
+        &iio_dev_attr_dds0_out1_enable.dev_attr.attr,
+        &iio_dev_attr_dds0_out0_wavetype.dev_attr.attr,
+        &iio_dev_attr_dds0_out1_wavetype.dev_attr.attr,
+        &iio_dev_attr_dds0_out0_wavetype_available.dev_attr.attr,
+        &iio_dev_attr_dds0_out1_wavetype_available.dev_attr.attr,
+        &iio_dev_attr_name.dev_attr.attr,
+        NULL,
+};
+
+static mode_t ad9834_attr_is_visible(struct kobject *kobj,
+                                     struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct iio_dev *dev_info = dev_get_drvdata(dev);
+        struct ad9834_state *st = iio_dev_get_devdata(dev_info);
+
+        mode_t mode = attr->mode;
+
+        if (st->devid == ID_AD9834)
+                return mode;
+
+        if ((attr == &iio_dev_attr_dds0_out1_enable.dev_attr.attr) ||
+                (attr == &iio_dev_attr_dds0_out1_wavetype.dev_attr.attr) ||
+                (attr ==
+                &iio_dev_attr_dds0_out1_wavetype_available.dev_attr.attr))
+                mode = 0;
+
+        return mode;
+}
+
+static const struct attribute_group ad9834_attribute_group = {
+        .attrs = ad9834_attributes,
+        .is_visible = ad9834_attr_is_visible,
+};
+
+static int __devinit ad9834_probe(struct spi_device *spi)
+{
+        struct ad9834_platform_data *pdata = spi->dev.platform_data;
+        struct ad9834_state *st;
+        int ret;
+
+        if (!pdata) {
+                dev_dbg(&spi->dev, "no platform data?\n");
+                return -ENODEV;
+        }
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        st->reg = regulator_get(&spi->dev, "vcc");
+        if (!IS_ERR(st->reg)) {
+                ret = regulator_enable(st->reg);
+                if (ret)
+                        goto error_put_reg;
+        }
+
+        st->mclk = pdata->mclk;
+
+        spi_set_drvdata(spi, st);
+
+        st->spi = spi;
+        st->devid = spi_get_device_id(spi)->driver_data;
+
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_disable_reg;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->attrs = &ad9834_attribute_group;
+        st->indio_dev->dev_data = (void *) st;
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        /* Setup default messages */
+
+        st->xfer.tx_buf = &st->data;
+        st->xfer.len = 2;
+
+        spi_message_init(&st->msg);
+        spi_message_add_tail(&st->xfer, &st->msg);
+
+        st->freq_xfer[0].tx_buf = &st->freq_data[0];
+        st->freq_xfer[0].len = 2;
+        st->freq_xfer[0].cs_change = 1;
+        st->freq_xfer[1].tx_buf = &st->freq_data[1];
+        st->freq_xfer[1].len = 2;
+
+        spi_message_init(&st->freq_msg);
+        spi_message_add_tail(&st->freq_xfer[0], &st->freq_msg);
+        spi_message_add_tail(&st->freq_xfer[1], &st->freq_msg);
+
+        st->control = AD9834_B28 | AD9834_RESET;
+
+        if (!pdata->en_div2)
+                st->control |= AD9834_DIV2;
+
+        if (!pdata->en_signbit_msb_out && (st->devid == ID_AD9834))
+                st->control |= AD9834_SIGN_PIB;
+
+        st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
+        ret = spi_sync(st->spi, &st->msg);
+        if (ret) {
+                dev_err(&spi->dev, "device init failed\n");
+                goto error_free_device;
+        }
+
+        ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, pdata->freq0);
+        if (ret)
+                goto error_free_device;
+
+        ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, pdata->freq1);
+        if (ret)
+                goto error_free_device;
+
+        ret = ad9834_write_phase(st, AD9834_REG_PHASE0, pdata->phase0);
+        if (ret)
+                goto error_free_device;
+
+        ret = ad9834_write_phase(st, AD9834_REG_PHASE1, pdata->phase1);
+        if (ret)
+                goto error_free_device;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_free_device;
+
+        return 0;
+
+error_free_device:
+        iio_free_device(st->indio_dev);
+error_disable_reg:
+        if (!IS_ERR(st->reg))
+                regulator_disable(st->reg);
+error_put_reg:
+        if (!IS_ERR(st->reg))
+                regulator_put(st->reg);
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9834_remove(struct spi_device *spi)
+{
+        struct ad9834_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->indio_dev);
+        if (!IS_ERR(st->reg)) {
+                regulator_disable(st->reg);
+                regulator_put(st->reg);
+        }
+        kfree(st);
+        return 0;
+}
+
+static const struct spi_device_id ad9834_id[] = {
+        {"ad9833", ID_AD9833},
+        {"ad9834", ID_AD9834},
+        {}
+};
+
+static struct spi_driver ad9834_driver = {
+        .driver = {
+                .name   = "ad9834",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ad9834_probe,
+        .remove         = __devexit_p(ad9834_remove),
+        .id_table       = ad9834_id,
+};
+
+static int __init ad9834_init(void)
+{
+        return spi_register_driver(&ad9834_driver);
+}
+module_init(ad9834_init);
+
+static void __exit ad9834_exit(void)
+{
+        spi_unregister_driver(&ad9834_driver);
+}
+module_exit(ad9834_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("Analog Devices AD9833/AD9834 DDS");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad9834");
diff --git a/drivers/staging/iio/dds/ad9834.h b/drivers/staging/iio/dds/ad9834.h
new file mode 100644
index 000000000000..0fc3b8859e9e
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9834.h
@@ -0,0 +1,112 @@
+/*
+ * AD9834 SPI DDS driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef IIO_DDS_AD9834_H_
+#define IIO_DDS_AD9834_H_
+
+/* Registers */
+
+#define AD9834_REG_CMD          (0 << 14)
+#define AD9834_REG_FREQ0        (1 << 14)
+#define AD9834_REG_FREQ1        (2 << 14)
+#define AD9834_REG_PHASE0       (6 << 13)
+#define AD9834_REG_PHASE1       (7 << 13)
+
+/* Command Control Bits */
+
+#define AD9834_B28              (1 << 13)
+#define AD9834_HLB              (1 << 12)
+#define AD9834_FSEL             (1 << 11)
+#define AD9834_PSEL             (1 << 10)
+#define AD9834_PIN_SW           (1 << 9)
+#define AD9834_RESET            (1 << 8)
+#define AD9834_SLEEP1           (1 << 7)
+#define AD9834_SLEEP12          (1 << 6)
+#define AD9834_OPBITEN          (1 << 5)
+#define AD9834_SIGN_PIB         (1 << 4)
+#define AD9834_DIV2             (1 << 3)
+#define AD9834_MODE             (1 << 1)
+
+#define AD9834_FREQ_BITS        28
+#define AD9834_PHASE_BITS       12
+
+#define RES_MASK(bits)  ((1 << (bits)) - 1)
+
+/**
+ * struct ad9834_state - driver instance specific data
+ * @indio_dev:          the industrial I/O device
+ * @spi:                spi_device
+ * @reg:                supply regulator
+ * @mclk:               external master clock
+ * @control:            cached control word
+ * @xfer:               default spi transfer
+ * @msg:                default spi message
+ * @freq_xfer:          tuning word spi transfer
+ * @freq_msg:           tuning word spi message
+ * @data:               spi transmit buffer
+ * @freq_data:          tuning word spi transmit buffer
+ */
+
+struct ad9834_state {
+        struct iio_dev                  *indio_dev;
+        struct spi_device               *spi;
+        struct regulator                *reg;
+        unsigned int                    mclk;
+        unsigned short                  control;
+        unsigned short                  devid;
+        struct spi_transfer             xfer;
+        struct spi_message              msg;
+        struct spi_transfer             freq_xfer[2];
+        struct spi_message              freq_msg;
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        unsigned short                  data ____cacheline_aligned;
+        unsigned short                  freq_data[2] ;
+};
+
+
+/*
+ * TODO: struct ad7887_platform_data needs to go into include/linux/iio
+ */
+
+/**
+ * struct ad9834_platform_data - platform specific information
+ * @mclk:               master clock in Hz
+ * @freq0:              power up freq0 tuning word in Hz
+ * @freq1:              power up freq1 tuning word in Hz
+ * @phase0:             power up phase0 value [0..4095] correlates with 0..2PI
+ * @phase1:             power up phase1 value [0..4095] correlates with 0..2PI
+ * @en_div2:            digital output/2 is passed to the SIGN BIT OUT pin
+ * @en_signbit_msb_out: the MSB (or MSB/2) of the DAC data is connected to the
+ *                      SIGN BIT OUT pin. en_div2 controls whether it is the MSB
+ *                      or MSB/2 that is output. if en_signbit_msb_out=false,
+ *                      the on-board comparator is connected to SIGN BIT OUT
+ */
+
+struct ad9834_platform_data {
+        unsigned int            mclk;
+        unsigned int            freq0;
+        unsigned int            freq1;
+        unsigned short          phase0;
+        unsigned short          phase1;
+        bool                    en_div2;
+        bool                    en_signbit_msb_out;
+};
+
+/**
+ * ad9834_supported_device_ids:
+ */
+
+enum ad9834_supported_device_ids {
+        ID_AD9833,
+        ID_AD9834,
+};
+
+#endif /* IIO_DDS_AD9834_H_ */
diff --git a/drivers/staging/iio/dds/ad9850.c b/drivers/staging/iio/dds/ad9850.c
new file mode 100644
index 000000000000..b259bfeaf5aa
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9850.c
@@ -0,0 +1,156 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad9850
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad9850"
+
+#define value_mask (u16)0xf000
+#define addr_shift 12
+
+/* Register format: 4 bits addr + 12 bits value */
+struct ad9850_config {
+        u8 control[5];
+};
+
+struct ad9850_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad9850_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad9850_config *config = (struct ad9850_config *)buf;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad9850_state *st = idev->dev_data;
+
+        xfer.len = len;
+        xfer.tx_buf = config;
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9850_set_parameter, 0);
+
+static struct attribute *ad9850_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad9850_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad9850_attributes,
+};
+
+static int __devinit ad9850_probe(struct spi_device *spi)
+{
+        struct ad9850_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad9850_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 16;
+        spi_setup(spi);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9850_remove(struct spi_device *spi)
+{
+        struct ad9850_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad9850_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad9850_probe,
+        .remove = __devexit_p(ad9850_remove),
+};
+
+static __init int ad9850_spi_init(void)
+{
+        return spi_register_driver(&ad9850_driver);
+}
+module_init(ad9850_spi_init);
+
+static __exit void ad9850_spi_exit(void)
+{
+        spi_unregister_driver(&ad9850_driver);
+}
+module_exit(ad9850_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad9850 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad9852.c b/drivers/staging/iio/dds/ad9852.c
new file mode 100644
index 000000000000..594fb6a94331
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9852.c
@@ -0,0 +1,305 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad9852
+ *
+ * Copyright (c) 2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad9852"
+
+#define addr_phaad1 0x0
+#define addr_phaad2 0x1
+#define addr_fretu1 0x2
+#define addr_fretu2 0x3
+#define addr_delfre 0x4
+#define addr_updclk 0x5
+#define addr_ramclk 0x6
+#define addr_contrl 0x7
+#define addr_optskm 0x8
+#define addr_optskr 0xa
+#define addr_dacctl 0xb
+
+#define COMPPD          (1 << 4)
+#define REFMULT2        (1 << 2)
+#define BYPPLL          (1 << 5)
+#define PLLRANG         (1 << 6)
+#define IEUPCLK         (1)
+#define OSKEN           (1 << 5)
+
+#define read_bit        (1 << 7)
+
+/* Register format: 1 byte addr + value */
+struct ad9852_config {
+        u8 phajst0[3];
+        u8 phajst1[3];
+        u8 fretun1[6];
+        u8 fretun2[6];
+        u8 dltafre[6];
+        u8 updtclk[5];
+        u8 ramprat[4];
+        u8 control[5];
+        u8 outpskm[3];
+        u8 outpskr[2];
+        u8 daccntl[3];
+};
+
+struct ad9852_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad9852_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad9852_config *config = (struct ad9852_config *)buf;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad9852_state *st = idev->dev_data;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->phajst0[0];
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->phajst1[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 6;
+        xfer.tx_buf = &config->fretun1[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 6;
+        xfer.tx_buf = &config->fretun2[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 6;
+        xfer.tx_buf = &config->dltafre[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->updtclk[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 4;
+        xfer.tx_buf = &config->ramprat[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->control[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->outpskm[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 2;
+        xfer.tx_buf = &config->outpskr[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->daccntl[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9852_set_parameter, 0);
+
+static void ad9852_init(struct ad9852_state *st)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        u8 config[5];
+
+        config[0] = addr_contrl;
+        config[1] = COMPPD;
+        config[2] = REFMULT2 | BYPPLL | PLLRANG;
+        config[3] = IEUPCLK;
+        config[4] = OSKEN;
+
+        mutex_lock(&st->lock);
+
+        xfer.len = 5;
+        xfer.tx_buf = &config;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        mutex_unlock(&st->lock);
+
+
+
+}
+
+static struct attribute *ad9852_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad9852_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad9852_attributes,
+};
+
+static int __devinit ad9852_probe(struct spi_device *spi)
+{
+        struct ad9852_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad9852_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 8;
+        spi_setup(spi);
+        ad9852_init(st);
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9852_remove(struct spi_device *spi)
+{
+        struct ad9852_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad9852_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad9852_probe,
+        .remove = __devexit_p(ad9852_remove),
+};
+
+static __init int ad9852_spi_init(void)
+{
+        return spi_register_driver(&ad9852_driver);
+}
+module_init(ad9852_spi_init);
+
+static __exit void ad9852_spi_exit(void)
+{
+        spi_unregister_driver(&ad9852_driver);
+}
+module_exit(ad9852_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad9852 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad9910.c b/drivers/staging/iio/dds/ad9910.c
new file mode 100644
index 000000000000..e8fb75cb66ec
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9910.c
@@ -0,0 +1,440 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad9910
+ *
+ * Copyright (c) 2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad9910"
+
+#define CFR1 0x0
+#define CFR2 0x1
+#define CFR3 0x2
+
+#define AUXDAC 0x3
+#define IOUPD 0x4
+#define FTW 0x7
+#define POW 0x8
+#define ASF 0x9
+#define MULTC 0x0A
+#define DIG_RAMPL 0x0B
+#define DIG_RAMPS 0x0C
+#define DIG_RAMPR 0x0D
+#define SIN_TONEP0 0x0E
+#define SIN_TONEP1 0x0F
+#define SIN_TONEP2 0x10
+#define SIN_TONEP3 0x11
+#define SIN_TONEP4 0x12
+#define SIN_TONEP5 0x13
+#define SIN_TONEP6 0x14
+#define SIN_TONEP7 0x15
+
+#define RAM_ENABLE      (1 << 7)
+
+#define MANUAL_OSK      (1 << 7)
+#define INVSIC          (1 << 6)
+#define DDS_SINEOP      (1)
+
+#define AUTO_OSK        (1)
+#define OSKEN           (1 << 1)
+#define LOAD_ARR        (1 << 2)
+#define CLR_PHA         (1 << 3)
+#define CLR_DIG         (1 << 4)
+#define ACLR_PHA        (1 << 5)
+#define ACLR_DIG        (1 << 6)
+#define LOAD_LRR        (1 << 7)
+
+#define LSB_FST         (1)
+#define SDIO_IPT        (1 << 1)
+#define EXT_PWD         (1 << 3)
+#define ADAC_PWD        (1 << 4)
+#define REFCLK_PWD      (1 << 5)
+#define DAC_PWD         (1 << 6)
+#define DIG_PWD         (1 << 7)
+
+#define ENA_AMP         (1)
+#define READ_FTW        (1)
+#define DIGR_LOW        (1 << 1)
+#define DIGR_HIGH       (1 << 2)
+#define DIGR_ENA        (1 << 3)
+#define SYNCCLK_ENA     (1 << 6)
+#define ITER_IOUPD      (1 << 7)
+
+#define TX_ENA          (1 << 1)
+#define PDCLK_INV       (1 << 2)
+#define PDCLK_ENB       (1 << 3)
+
+#define PARA_ENA        (1 << 4)
+#define SYNC_DIS        (1 << 5)
+#define DATA_ASS        (1 << 6)
+#define MATCH_ENA       (1 << 7)
+
+#define PLL_ENA         (1)
+#define PFD_RST         (1 << 2)
+#define REFCLK_RST      (1 << 6)
+#define REFCLK_BYP      (1 << 7)
+
+/* Register format: 1 byte addr + value */
+struct ad9910_config {
+        u8 auxdac[5];
+        u8 ioupd[5];
+        u8 ftw[5];
+        u8 pow[3];
+        u8 asf[5];
+        u8 multc[5];
+        u8 dig_rampl[9];
+        u8 dig_ramps[9];
+        u8 dig_rampr[5];
+        u8 sin_tonep0[9];
+        u8 sin_tonep1[9];
+        u8 sin_tonep2[9];
+        u8 sin_tonep3[9];
+        u8 sin_tonep4[9];
+        u8 sin_tonep5[9];
+        u8 sin_tonep6[9];
+        u8 sin_tonep7[9];
+};
+
+struct ad9910_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad9910_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad9910_config *config = (struct ad9910_config *)buf;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad9910_state *st = idev->dev_data;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->auxdac[0];
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->ioupd[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->ftw[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->pow[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->asf[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->multc[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->dig_rampl[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->dig_ramps[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->dig_rampr[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep0[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep1[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep2[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep3[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep4[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep5[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep6[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 9;
+        xfer.tx_buf = &config->sin_tonep7[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9910_set_parameter, 0);
+
+static void ad9910_init(struct ad9910_state *st)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        u8 cfr[5];
+
+        cfr[0] = CFR1;
+        cfr[1] = 0;
+        cfr[2] = MANUAL_OSK | INVSIC | DDS_SINEOP;
+        cfr[3] = AUTO_OSK | OSKEN | ACLR_PHA | ACLR_DIG | LOAD_LRR;
+        cfr[4] = 0;
+
+        mutex_lock(&st->lock);
+
+        xfer.len = 5;
+        xfer.tx_buf = &cfr;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        cfr[0] = CFR2;
+        cfr[1] = ENA_AMP;
+        cfr[2] = READ_FTW | DIGR_ENA | ITER_IOUPD;
+        cfr[3] = TX_ENA | PDCLK_INV | PDCLK_ENB;
+        cfr[4] = PARA_ENA;
+
+        xfer.len = 5;
+        xfer.tx_buf = &cfr;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        cfr[0] = CFR3;
+        cfr[1] = PLL_ENA;
+        cfr[2] = 0;
+        cfr[3] = REFCLK_RST | REFCLK_BYP;
+        cfr[4] = 0;
+
+        xfer.len = 5;
+        xfer.tx_buf = &cfr;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        mutex_unlock(&st->lock);
+
+
+
+}
+
+static struct attribute *ad9910_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad9910_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad9910_attributes,
+};
+
+static int __devinit ad9910_probe(struct spi_device *spi)
+{
+        struct ad9910_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad9910_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 8;
+        spi_setup(spi);
+        ad9910_init(st);
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9910_remove(struct spi_device *spi)
+{
+        struct ad9910_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad9910_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad9910_probe,
+        .remove = __devexit_p(ad9910_remove),
+};
+
+static __init int ad9910_spi_init(void)
+{
+        return spi_register_driver(&ad9910_driver);
+}
+module_init(ad9910_spi_init);
+
+static __exit void ad9910_spi_exit(void)
+{
+        spi_unregister_driver(&ad9910_driver);
+}
+module_exit(ad9910_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad9910 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad9951.c b/drivers/staging/iio/dds/ad9951.c
new file mode 100644
index 000000000000..57eddf6d4713
--- /dev/null
+++ b/drivers/staging/iio/dds/ad9951.c
@@ -0,0 +1,249 @@
+/*
+ * Driver for ADI Direct Digital Synthesis ad9951
+ *
+ * Copyright (c) 2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad9951"
+
+#define CFR1 0x0
+#define CFR2 0x1
+
+#define AUTO_OSK        (1)
+#define OSKEN           (1 << 1)
+#define LOAD_ARR        (1 << 2)
+
+#define AUTO_SYNC       (1 << 7)
+
+#define LSB_FST         (1)
+#define SDIO_IPT        (1 << 1)
+#define CLR_PHA         (1 << 2)
+#define SINE_OPT        (1 << 4)
+#define ACLR_PHA        (1 << 5)
+
+#define VCO_RANGE       (1 << 2)
+
+#define CRS_OPT         (1 << 1)
+#define HMANU_SYNC      (1 << 2)
+#define HSPD_SYNC       (1 << 3)
+
+/* Register format: 1 byte addr + value */
+struct ad9951_config {
+        u8 asf[3];
+        u8 arr[2];
+        u8 ftw0[5];
+        u8 ftw1[3];
+};
+
+struct ad9951_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+};
+
+static ssize_t ad9951_set_parameter(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf,
+                                        size_t len)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        struct ad9951_config *config = (struct ad9951_config *)buf;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad9951_state *st = idev->dev_data;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->asf[0];
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 2;
+        xfer.tx_buf = &config->arr[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 5;
+        xfer.tx_buf = &config->ftw0[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        xfer.len = 3;
+        xfer.tx_buf = &config->ftw1[0];
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9951_set_parameter, 0);
+
+static void ad9951_init(struct ad9951_state *st)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        u8 cfr[5];
+
+        cfr[0] = CFR1;
+        cfr[1] = 0;
+        cfr[2] = LSB_FST | CLR_PHA | SINE_OPT | ACLR_PHA;
+        cfr[3] = AUTO_OSK | OSKEN | LOAD_ARR;
+        cfr[4] = 0;
+
+        mutex_lock(&st->lock);
+
+        xfer.len = 5;
+        xfer.tx_buf = &cfr;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+        cfr[0] = CFR2;
+        cfr[1] = VCO_RANGE;
+        cfr[2] = HSPD_SYNC;
+        cfr[3] = 0;
+
+        xfer.len = 4;
+        xfer.tx_buf = &cfr;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        mutex_unlock(&st->lock);
+
+
+
+}
+
+static struct attribute *ad9951_attributes[] = {
+        &iio_dev_attr_dds.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad9951_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad9951_attributes,
+};
+
+static int __devinit ad9951_probe(struct spi_device *spi)
+{
+        struct ad9951_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad9951_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+        spi->max_speed_hz = 2000000;
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 8;
+        spi_setup(spi);
+        ad9951_init(st);
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad9951_remove(struct spi_device *spi)
+{
+        struct ad9951_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad9951_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad9951_probe,
+        .remove = __devexit_p(ad9951_remove),
+};
+
+static __init int ad9951_spi_init(void)
+{
+        return spi_register_driver(&ad9951_driver);
+}
+module_init(ad9951_spi_init);
+
+static __exit void ad9951_spi_exit(void)
+{
+        spi_unregister_driver(&ad9951_driver);
+}
+module_exit(ad9951_spi_exit);
+
+MODULE_AUTHOR("Cliff Cai");
+MODULE_DESCRIPTION("Analog Devices ad9951 driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/dds.h b/drivers/staging/iio/dds/dds.h
new file mode 100644
index 000000000000..d8ac3a93baf6
--- /dev/null
+++ b/drivers/staging/iio/dds/dds.h
@@ -0,0 +1,110 @@
+/*
+ * dds.h - sysfs attributes associated with DDS devices
+ *
+ * Copyright (c) 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_freqY
+ */
+
+#define IIO_DEV_ATTR_FREQ(_channel, _num, _mode, _show, _store, _addr)  \
+        IIO_DEVICE_ATTR(dds##_channel##_freq##_num,                     \
+                        _mode, _show, _store, _addr)
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_freqY_scale
+ */
+
+#define IIO_CONST_ATTR_FREQ_SCALE(_channel, _string)                    \
+        IIO_CONST_ATTR(dds##_channel##_freq_scale, _string)
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_freqsymbol
+ */
+
+#define IIO_DEV_ATTR_FREQSYMBOL(_channel, _mode, _show, _store, _addr)  \
+        IIO_DEVICE_ATTR(dds##_channel##_freqsymbol,                     \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_phaseY
+ */
+
+#define IIO_DEV_ATTR_PHASE(_channel, _num, _mode, _show, _store, _addr) \
+        IIO_DEVICE_ATTR(dds##_channel##_phase##_num,                    \
+                        _mode, _show, _store, _addr)
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_phaseY_scale
+ */
+
+#define IIO_CONST_ATTR_PHASE_SCALE(_channel, _string)                   \
+        IIO_CONST_ATTR(dds##_channel##_phase_scale, _string)
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_phasesymbol
+ */
+
+#define IIO_DEV_ATTR_PHASESYMBOL(_channel, _mode, _show, _store, _addr) \
+        IIO_DEVICE_ATTR(dds##_channel##_phasesymbol,                    \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_pincontrol_en
+ */
+
+#define IIO_DEV_ATTR_PINCONTROL_EN(_channel, _mode, _show, _store, _addr)\
+        IIO_DEVICE_ATTR(dds##_channel##_pincontrol_en,                  \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_pincontrol_freq_en
+ */
+
+#define IIO_DEV_ATTR_PINCONTROL_FREQ_EN(_channel, _mode, _show, _store, _addr)\
+        IIO_DEVICE_ATTR(dds##_channel##_pincontrol_freq_en,             \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_pincontrol_phase_en
+ */
+
+#define IIO_DEV_ATTR_PINCONTROL_PHASE_EN(_channel, _mode, _show, _store, _addr)\
+        IIO_DEVICE_ATTR(dds##_channel##_pincontrol_phase_en,            \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_out_enable
+ */
+
+#define IIO_DEV_ATTR_OUT_ENABLE(_channel, _mode, _show, _store, _addr)  \
+        IIO_DEVICE_ATTR(dds##_channel##_out_enable,                     \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_outY_enable
+ */
+
+#define IIO_DEV_ATTR_OUTY_ENABLE(_channel, _output,                     \
+                        _mode, _show, _store, _addr)                    \
+        IIO_DEVICE_ATTR(dds##_channel##_out##_output##_enable,          \
+                        _mode, _show, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_outY_wavetype
+ */
+
+#define IIO_DEV_ATTR_OUT_WAVETYPE(_channel, _output, _store, _addr)     \
+        IIO_DEVICE_ATTR(dds##_channel##_out##_output##_wavetype,        \
+                        S_IWUSR, NULL, _store, _addr);
+
+/**
+ * /sys/bus/iio/devices/.../ddsX_outY_wavetype_available
+ */
+
+#define IIO_CONST_ATTR_OUT_WAVETYPES_AVAILABLE(_channel, _output, _modes)\
+        IIO_CONST_ATTR(dds##_channel##_out##_output##_wavetype_available,\
+                        _modes);
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index c4043610c0df..236f15fdbfc9 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -3,11 +3,45 @@
 #
 comment "Digital gyroscope sensors"
 
+config ADIS16060
+        tristate "Analog Devices ADIS16060 Yaw Rate Gyroscope with SPI driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices adis16060 wide bandwidth
+          yaw rate gyroscope with SPI.
+
+config ADIS16080
+        tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices adis16080/100 Yaw Rate
+          Gyroscope with SPI.
+
+config ADIS16130
+        tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADIS16130 High Precision
+          Angular Rate Sensor driver.
+
 config ADIS16260
-        tristate "Analog Devices ADIS16260/5 Digital Gyroscope Sensor SPI driver"
+        tristate "Analog Devices ADIS16260 ADIS16265 Digital Gyroscope Sensor SPI driver"
         depends on SPI
         select IIO_TRIGGER if IIO_RING_BUFFER
         select IIO_SW_RING if IIO_RING_BUFFER
         help
-          Say yes here to build support for Analog Devices adis16260/5
+          Say yes here to build support for Analog Devices ADIS16260 ADIS16265
           programmable digital gyroscope sensor.
+
+          This driver can also be built as a module.  If so, the module
+          will be called adis16260.
+
+config ADIS16251
+        tristate "Analog Devices ADIS16251 Digital Gyroscope Sensor SPI driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices adis16261 programmable
+          digital gyroscope sensor.
+
+          This driver can also be built as a module.  If so, the module
+          will be called adis16251.
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index b5f0dc01122c..2764c15025a5 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -2,6 +2,18 @@
 # Makefile for digital gyroscope sensor drivers
 #
 
+adis16060-y             := adis16060_core.o
+obj-$(CONFIG_ADIS16060) += adis16060.o
+
+adis16080-y             := adis16080_core.o
+obj-$(CONFIG_ADIS16080) += adis16080.o
+
+adis16130-y             := adis16130_core.o
+obj-$(CONFIG_ADIS16130) += adis16130.o
+
 adis16260-y             := adis16260_core.o
 adis16260-$(CONFIG_IIO_RING_BUFFER) += adis16260_ring.o adis16260_trigger.o
 obj-$(CONFIG_ADIS16260) += adis16260.o
+
+adis16251-y             := adis16251_core.o
+obj-$(CONFIG_ADIS16251) += adis16251.o
diff --git a/drivers/staging/iio/gyro/adis16060.h b/drivers/staging/iio/gyro/adis16060.h
new file mode 100644
index 000000000000..5c00e5385ee0
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16060.h
@@ -0,0 +1,101 @@
+#ifndef SPI_ADIS16060_H_
+#define SPI_ADIS16060_H_
+
+#define ADIS16060_GYRO       0x20 /* Measure Angular Rate (Gyro) */
+#define ADIS16060_SUPPLY_OUT 0x10 /* Measure Temperature */
+#define ADIS16060_AIN2       0x80 /* Measure AIN2 */
+#define ADIS16060_AIN1       0x40 /* Measure AIN1 */
+#define ADIS16060_TEMP_OUT   0x22 /* Set Positive Self-Test and Output for Angular Rate */
+#define ADIS16060_ANGL_OUT   0x21 /* Set Negative Self-Test and Output for Angular Rate */
+
+#define ADIS16060_MAX_TX     3
+#define ADIS16060_MAX_RX     3
+
+/**
+ * struct adis16060_state - device instance specific data
+ * @us_w:                       actual spi_device to write data
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16060_state {
+        struct spi_device               *us_w;
+        struct spi_device               *us_r;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum adis16060_scan {
+        ADIS16060_SCAN_GYRO,
+        ADIS16060_SCAN_TEMP,
+        ADIS16060_SCAN_ADC_1,
+        ADIS16060_SCAN_ADC_2,
+};
+
+void adis16060_remove_trigger(struct iio_dev *indio_dev);
+int adis16060_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16060_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int adis16060_configure_ring(struct iio_dev *indio_dev);
+void adis16060_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16060_initialize_ring(struct iio_ring_buffer *ring);
+void adis16060_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16060_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16060_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16060_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16060_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16060_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16060_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16060_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16060_H_ */
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
new file mode 100644
index 000000000000..fc48aca04bd3
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -0,0 +1,319 @@
+/*
+ * ADIS16060 Wide Bandwidth Yaw Rate Gyroscope with SPI driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16060.h"
+
+#define DRIVER_NAME             "adis16060"
+
+struct adis16060_state *adis16060_st;
+
+int adis16060_spi_write(struct device *dev,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16060_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = 0;
+        st->tx[1] = 0;
+        st->tx[2] = val; /* The last 8 bits clocked in are latched */
+
+        ret = spi_write(st->us_w, st->tx, 3);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+int adis16060_spi_read(struct device *dev,
+                u16 *val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16060_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+
+        ret = spi_read(st->us_r, st->rx, 3);
+
+        /* The internal successive approximation ADC begins the conversion process
+         * on the falling edge of MSEL1 and starts to place data MSB first on the
+         * DOUT line at the 6th falling edge of SCLK
+         */
+        if (ret == 0)
+                *val = ((st->rx[0] & 0x3) << 12) | (st->rx[1] << 4) | ((st->rx[2] >> 4) & 0xF);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static ssize_t adis16060_read(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        u16 val;
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16060_spi_read(dev, &val);
+        mutex_unlock(&indio_dev->mlock);
+
+        if (ret == 0)
+                return sprintf(buf, "%d\n", val);
+        else
+                return ret;
+}
+
+static ssize_t adis16060_write(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 16, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16060_spi_write(dev, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+#define IIO_DEV_ATTR_IN(_show)                          \
+        IIO_DEVICE_ATTR(in, S_IRUGO, _show, NULL, 0)
+
+#define IIO_DEV_ATTR_OUT(_store)                                \
+        IIO_DEVICE_ATTR(out, S_IRUGO, NULL, _store, 0)
+
+static IIO_DEV_ATTR_IN(adis16060_read);
+static IIO_DEV_ATTR_OUT(adis16060_write);
+
+static IIO_CONST_ATTR(name, "adis16060");
+
+static struct attribute *adis16060_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16060_event_attribute_group = {
+        .attrs = adis16060_event_attributes,
+};
+
+static struct attribute *adis16060_attributes[] = {
+        &iio_dev_attr_in.dev_attr.attr,
+        &iio_dev_attr_out.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16060_attribute_group = {
+        .attrs = adis16060_attributes,
+};
+
+static int __devinit adis16060_r_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16060_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16060_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16060_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us_r = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16060_event_attribute_group;
+        st->indio_dev->attrs = &adis16060_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16060_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16060_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16060");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16060_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        adis16060_st = st;
+        return 0;
+
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16060_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16060_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int adis16060_r_remove(struct spi_device *spi)
+{
+        struct adis16060_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16060_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16060_uninitialize_ring(indio_dev->ring);
+        adis16060_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static int __devinit adis16060_w_probe(struct spi_device *spi)
+{
+        int ret;
+        struct adis16060_state *st = adis16060_st;
+        if (!st) {
+                ret =  -ENODEV;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+        st->us_w = spi;
+        return 0;
+
+error_ret:
+        return ret;
+}
+
+static int adis16060_w_remove(struct spi_device *spi)
+{
+        return 0;
+}
+
+static struct spi_driver adis16060_r_driver = {
+        .driver = {
+                .name = "adis16060_r",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16060_r_probe,
+        .remove = __devexit_p(adis16060_r_remove),
+};
+
+static struct spi_driver adis16060_w_driver = {
+        .driver = {
+                .name = "adis16060_w",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16060_w_probe,
+        .remove = __devexit_p(adis16060_w_remove),
+};
+
+static __init int adis16060_init(void)
+{
+        int ret;
+
+        ret = spi_register_driver(&adis16060_r_driver);
+        if (ret < 0)
+                return ret;
+
+        ret = spi_register_driver(&adis16060_w_driver);
+        if (ret < 0) {
+                spi_unregister_driver(&adis16060_r_driver);
+                return ret;
+        }
+
+        return 0;
+}
+module_init(adis16060_init);
+
+static __exit void adis16060_exit(void)
+{
+        spi_unregister_driver(&adis16060_w_driver);
+        spi_unregister_driver(&adis16060_r_driver);
+}
+module_exit(adis16060_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16060 Yaw Rate Gyroscope with SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/gyro/adis16080.h b/drivers/staging/iio/gyro/adis16080.h
new file mode 100644
index 000000000000..3fcbe67f7c31
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16080.h
@@ -0,0 +1,102 @@
+#ifndef SPI_ADIS16080_H_
+#define SPI_ADIS16080_H_
+
+#define ADIS16080_DIN_CODE   4 /* Output data format setting. 0: Twos complement. 1: Offset binary. */
+#define ADIS16080_DIN_GYRO   (0 << 10) /* Gyroscope output */
+#define ADIS16080_DIN_TEMP   (1 << 10) /* Temperature output */
+#define ADIS16080_DIN_AIN1   (2 << 10)
+#define ADIS16080_DIN_AIN2   (3 << 10)
+#define ADIS16080_DIN_WRITE  (1 << 15) /* 1: Write contents on DIN to control register.
+                                        * 0: No changes to control register.
+                                        */
+
+#define ADIS16080_MAX_TX     2
+#define ADIS16080_MAX_RX     2
+
+/**
+ * struct adis16080_state - device instance specific data
+ * @us:                 actual spi_device to write data
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16080_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum adis16080_scan {
+        ADIS16080_SCAN_GYRO,
+        ADIS16080_SCAN_TEMP,
+        ADIS16080_SCAN_ADC_1,
+        ADIS16080_SCAN_ADC_2,
+};
+
+void adis16080_remove_trigger(struct iio_dev *indio_dev);
+int adis16080_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16080_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int adis16080_configure_ring(struct iio_dev *indio_dev);
+void adis16080_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16080_initialize_ring(struct iio_ring_buffer *ring);
+void adis16080_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16080_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16080_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16080_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16080_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16080_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16080_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16080_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16080_H_ */
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c
new file mode 100644
index 000000000000..0efb768db7d3
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16080_core.c
@@ -0,0 +1,271 @@
+/*
+ * ADIS16080/100 Yaw Rate Gyroscope with SPI driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16080.h"
+
+#define DRIVER_NAME             "adis16080"
+
+struct adis16080_state *adis16080_st;
+
+int adis16080_spi_write(struct device *dev,
+                u16 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16080_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = val >> 8;
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+int adis16080_spi_read(struct device *dev,
+                u16 *val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16080_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+
+        ret = spi_read(st->us, st->rx, 2);
+
+        if (ret == 0)
+                *val = ((st->rx[0] & 0xF) << 8) | st->rx[1];
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static ssize_t adis16080_read(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        u16 val;
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16080_spi_read(dev, &val);
+        mutex_unlock(&indio_dev->mlock);
+
+        if (ret == 0)
+                return sprintf(buf, "%d\n", val);
+        else
+                return ret;
+}
+
+static ssize_t adis16080_write(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 16, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16080_spi_write(dev, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+#define IIO_DEV_ATTR_IN(_show)                          \
+        IIO_DEVICE_ATTR(in, S_IRUGO, _show, NULL, 0)
+
+#define IIO_DEV_ATTR_OUT(_store)                                \
+        IIO_DEVICE_ATTR(out, S_IRUGO, NULL, _store, 0)
+
+static IIO_DEV_ATTR_IN(adis16080_read);
+static IIO_DEV_ATTR_OUT(adis16080_write);
+
+static IIO_CONST_ATTR(name, "adis16080");
+
+static struct attribute *adis16080_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16080_event_attribute_group = {
+        .attrs = adis16080_event_attributes,
+};
+
+static struct attribute *adis16080_attributes[] = {
+        &iio_dev_attr_in.dev_attr.attr,
+        &iio_dev_attr_out.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16080_attribute_group = {
+        .attrs = adis16080_attributes,
+};
+
+static int __devinit adis16080_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16080_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16080_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16080_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16080_event_attribute_group;
+        st->indio_dev->attrs = &adis16080_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16080_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16080_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16080");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16080_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        adis16080_st = st;
+        return 0;
+
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16080_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16080_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int adis16080_remove(struct spi_device *spi)
+{
+        struct adis16080_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16080_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16080_uninitialize_ring(indio_dev->ring);
+        adis16080_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver adis16080_driver = {
+        .driver = {
+                .name = "adis16080",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16080_probe,
+        .remove = __devexit_p(adis16080_remove),
+};
+
+static __init int adis16080_init(void)
+{
+        return spi_register_driver(&adis16080_driver);
+}
+module_init(adis16080_init);
+
+static __exit void adis16080_exit(void)
+{
+        spi_unregister_driver(&adis16080_driver);
+}
+module_exit(adis16080_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/gyro/adis16130.h b/drivers/staging/iio/gyro/adis16130.h
new file mode 100644
index 000000000000..ab80ef6a8961
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16130.h
@@ -0,0 +1,108 @@
+#ifndef SPI_ADIS16130_H_
+#define SPI_ADIS16130_H_
+
+#define ADIS16130_CON         0x0
+#define ADIS16130_CON_RD      (1 << 6)
+#define ADIS16130_IOP         0x1
+#define ADIS16130_IOP_ALL_RDY (1 << 3) /* 1 = data-ready signal low when unread data on all channels; */
+#define ADIS16130_IOP_SYNC    (1 << 0) /* 1 = synchronization enabled */
+#define ADIS16130_RATEDATA    0x8 /* Gyroscope output, rate of rotation */
+#define ADIS16130_TEMPDATA    0xA /* Temperature output */
+#define ADIS16130_RATECS      0x28 /* Gyroscope channel setup */
+#define ADIS16130_RATECS_EN   (1 << 3) /* 1 = channel enable; */
+#define ADIS16130_TEMPCS      0x2A /* Temperature channel setup */
+#define ADIS16130_TEMPCS_EN   (1 << 3)
+#define ADIS16130_RATECONV    0x30
+#define ADIS16130_TEMPCONV    0x32
+#define ADIS16130_MODE        0x38
+#define ADIS16130_MODE_24BIT  (1 << 1) /* 1 = 24-bit resolution; */
+
+#define ADIS16130_MAX_TX     4
+#define ADIS16130_MAX_RX     4
+
+/**
+ * struct adis16130_state - device instance specific data
+ * @us:                 actual spi_device to write data
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16130_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        u32                             mode; /* 1: 24bits mode 0:16bits mode */
+        struct mutex                    buf_lock;
+};
+
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum adis16130_scan {
+        ADIS16130_SCAN_GYRO,
+        ADIS16130_SCAN_TEMP,
+};
+
+void adis16130_remove_trigger(struct iio_dev *indio_dev);
+int adis16130_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16130_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int adis16130_configure_ring(struct iio_dev *indio_dev);
+void adis16130_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16130_initialize_ring(struct iio_ring_buffer *ring);
+void adis16130_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16130_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16130_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16130_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16130_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16130_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16130_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16130_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16130_H_ */
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
new file mode 100644
index 000000000000..49ffc7b26e8a
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -0,0 +1,313 @@
+/*
+ * ADIS16130 Digital Output, High Precision Angular Rate Sensor driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16130.h"
+
+#define DRIVER_NAME             "adis16130"
+
+struct adis16130_state *adis16130_st;
+
+int adis16130_spi_write(struct device *dev, u8 reg_addr,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16130_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = reg_addr;
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+int adis16130_spi_read(struct device *dev, u8 reg_addr,
+                u32 *val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16130_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADIS16130_CON_RD | reg_addr;
+        if (st->mode)
+                ret = spi_read(st->us, st->rx, 4);
+        else
+                ret = spi_read(st->us, st->rx, 3);
+
+        if (ret == 0) {
+                if (st->mode)
+                        *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+                else
+                        *val = (st->rx[1] << 8) | st->rx[2];
+        }
+
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static ssize_t adis16130_gyro_read(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        u32 val;
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16130_spi_read(dev, ADIS16130_RATEDATA, &val);
+        mutex_unlock(&indio_dev->mlock);
+
+        if (ret == 0)
+                return sprintf(buf, "%d\n", val);
+        else
+                return ret;
+}
+
+static ssize_t adis16130_temp_read(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        u32 val;
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16130_spi_read(dev, ADIS16130_TEMPDATA, &val);
+        mutex_unlock(&indio_dev->mlock);
+
+        if (ret == 0)
+                return sprintf(buf, "%d\n", val);
+        else
+                return ret;
+}
+
+static ssize_t adis16130_bitsmode_read(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16130_state *st = iio_dev_get_devdata(indio_dev);
+
+        return sprintf(buf, "%d\n", st->mode);
+}
+
+static ssize_t adis16130_bitsmode_write(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 16, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16130_spi_write(dev, ADIS16130_MODE, !!val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static IIO_DEV_ATTR_TEMP_RAW(adis16130_temp_read);
+
+static IIO_CONST_ATTR(name, "adis16130");
+
+static IIO_DEV_ATTR_GYRO(adis16130_gyro_read,
+                ADIS16130_RATEDATA);
+
+#define IIO_DEV_ATTR_BITS_MODE(_mode, _show, _store, _addr)     \
+        IIO_DEVICE_ATTR(bits_mode, _mode, _show, _store, _addr)
+
+static IIO_DEV_ATTR_BITS_MODE(S_IWUSR | S_IRUGO, adis16130_bitsmode_read, adis16130_bitsmode_write,
+                        ADIS16130_MODE);
+
+static struct attribute *adis16130_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16130_event_attribute_group = {
+        .attrs = adis16130_event_attributes,
+};
+
+static struct attribute *adis16130_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_gyro_raw.dev_attr.attr,
+        &iio_dev_attr_bits_mode.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16130_attribute_group = {
+        .attrs = adis16130_attributes,
+};
+
+static int __devinit adis16130_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16130_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16130_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16130_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16130_event_attribute_group;
+        st->indio_dev->attrs = &adis16130_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+        st->mode = 1;
+
+        ret = adis16130_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16130_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16130");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16130_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        adis16130_st = st;
+        return 0;
+
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16130_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16130_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int adis16130_remove(struct spi_device *spi)
+{
+        struct adis16130_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        adis16130_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16130_uninitialize_ring(indio_dev->ring);
+        adis16130_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver adis16130_driver = {
+        .driver = {
+                .name = "adis16130",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16130_probe,
+        .remove = __devexit_p(adis16130_remove),
+};
+
+static __init int adis16130_init(void)
+{
+        return spi_register_driver(&adis16130_driver);
+}
+module_init(adis16130_init);
+
+static __exit void adis16130_exit(void)
+{
+        spi_unregister_driver(&adis16130_driver);
+}
+module_exit(adis16130_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16130 High Precision Angular Rate Sensor driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/gyro/adis16251.h b/drivers/staging/iio/gyro/adis16251.h
new file mode 100644
index 000000000000..d23852cf78e8
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16251.h
@@ -0,0 +1,185 @@
+#ifndef SPI_ADIS16251_H_
+#define SPI_ADIS16251_H_
+
+#define ADIS16251_STARTUP_DELAY 220 /* ms */
+
+#define ADIS16251_READ_REG(a)    a
+#define ADIS16251_WRITE_REG(a) ((a) | 0x80)
+
+#define ADIS16251_ENDURANCE  0x00 /* Flash memory write count */
+#define ADIS16251_SUPPLY_OUT 0x02 /* Power supply measurement */
+#define ADIS16251_GYRO_OUT   0x04 /* X-axis gyroscope output */
+#define ADIS16251_AUX_ADC    0x0A /* analog input channel measurement */
+#define ADIS16251_TEMP_OUT   0x0C /* internal temperature measurement */
+#define ADIS16251_ANGL_OUT   0x0E /* angle displacement */
+#define ADIS16251_GYRO_OFF   0x14 /* Calibration, offset/bias adjustment */
+#define ADIS16251_GYRO_SCALE 0x16 /* Calibration, scale adjustment */
+#define ADIS16251_ALM_MAG1   0x20 /* Alarm 1 magnitude/polarity setting */
+#define ADIS16251_ALM_MAG2   0x22 /* Alarm 2 magnitude/polarity setting */
+#define ADIS16251_ALM_SMPL1  0x24 /* Alarm 1 dynamic rate of change setting */
+#define ADIS16251_ALM_SMPL2  0x26 /* Alarm 2 dynamic rate of change setting */
+#define ADIS16251_ALM_CTRL   0x28 /* Alarm control */
+#define ADIS16251_AUX_DAC    0x30 /* Auxiliary DAC data */
+#define ADIS16251_GPIO_CTRL  0x32 /* Control, digital I/O line */
+#define ADIS16251_MSC_CTRL   0x34 /* Control, data ready, self-test settings */
+#define ADIS16251_SMPL_PRD   0x36 /* Control, internal sample rate */
+#define ADIS16251_SENS_AVG   0x38 /* Control, dynamic range, filtering */
+#define ADIS16251_SLP_CNT    0x3A /* Control, sleep mode initiation */
+#define ADIS16251_DIAG_STAT  0x3C /* Diagnostic, error flags */
+#define ADIS16251_GLOB_CMD   0x3E /* Control, global commands */
+
+#define ADIS16251_ERROR_ACTIVE                  (1<<14)
+#define ADIS16251_NEW_DATA                      (1<<14)
+
+/* MSC_CTRL */
+#define ADIS16251_MSC_CTRL_INT_SELF_TEST        (1<<10) /* Internal self-test enable */
+#define ADIS16251_MSC_CTRL_NEG_SELF_TEST        (1<<9)
+#define ADIS16251_MSC_CTRL_POS_SELF_TEST        (1<<8)
+#define ADIS16251_MSC_CTRL_DATA_RDY_EN          (1<<2)
+#define ADIS16251_MSC_CTRL_DATA_RDY_POL_HIGH    (1<<1)
+#define ADIS16251_MSC_CTRL_DATA_RDY_DIO2        (1<<0)
+
+/* SMPL_PRD */
+#define ADIS16251_SMPL_PRD_TIME_BASE    (1<<7) /* Time base (tB): 0 = 1.953 ms, 1 = 60.54 ms */
+#define ADIS16251_SMPL_PRD_DIV_MASK     0x7F
+
+/* SLP_CNT */
+#define ADIS16251_SLP_CNT_POWER_OFF     0x80
+
+/* DIAG_STAT */
+#define ADIS16251_DIAG_STAT_ALARM2      (1<<9)
+#define ADIS16251_DIAG_STAT_ALARM1      (1<<8)
+#define ADIS16251_DIAG_STAT_SELF_TEST   (1<<5)
+#define ADIS16251_DIAG_STAT_OVERFLOW    (1<<4)
+#define ADIS16251_DIAG_STAT_SPI_FAIL    (1<<3)
+#define ADIS16251_DIAG_STAT_FLASH_UPT   (1<<2)
+#define ADIS16251_DIAG_STAT_POWER_HIGH  (1<<1)
+#define ADIS16251_DIAG_STAT_POWER_LOW   (1<<0)
+
+#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16251_DIAG_STAT_ALARM2 | \
+                                      ADIS16251_DIAG_STAT_ALARM1 | \
+                                      ADIS16251_DIAG_STAT_SELF_TEST | \
+                                      ADIS16251_DIAG_STAT_OVERFLOW | \
+                                      ADIS16251_DIAG_STAT_SPI_FAIL | \
+                                      ADIS16251_DIAG_STAT_FLASH_UPT | \
+                                      ADIS16251_DIAG_STAT_POWER_HIGH | \
+                                      ADIS16251_DIAG_STAT_POWER_LOW)
+
+/* GLOB_CMD */
+#define ADIS16251_GLOB_CMD_SW_RESET     (1<<7)
+#define ADIS16251_GLOB_CMD_FLASH_UPD    (1<<3)
+#define ADIS16251_GLOB_CMD_DAC_LATCH    (1<<2)
+#define ADIS16251_GLOB_CMD_FAC_CALIB    (1<<1)
+#define ADIS16251_GLOB_CMD_AUTO_NULL    (1<<0)
+
+#define ADIS16251_MAX_TX 24
+#define ADIS16251_MAX_RX 24
+
+#define ADIS16251_SPI_SLOW      (u32)(300 * 1000)
+#define ADIS16251_SPI_BURST     (u32)(1000 * 1000)
+#define ADIS16251_SPI_FAST      (u32)(2000 * 1000)
+
+/**
+ * struct adis16251_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct adis16251_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+
+int adis16251_spi_write_reg_8(struct device *dev,
+                              u8 reg_address,
+                              u8 val);
+
+int adis16251_spi_read_burst(struct device *dev, u8 *rx);
+
+int adis16251_spi_read_sequence(struct device *dev,
+                                      u8 *tx, u8 *rx, int num);
+
+int adis16251_set_irq(struct device *dev, bool enable);
+
+int adis16251_reset(struct device *dev);
+
+int adis16251_stop_device(struct device *dev);
+
+int adis16251_check_status(struct device *dev);
+
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum adis16251_scan {
+        ADIS16251_SCAN_SUPPLY,
+        ADIS16251_SCAN_GYRO,
+        ADIS16251_SCAN_TEMP,
+        ADIS16251_SCAN_ADC_0,
+};
+
+void adis16251_remove_trigger(struct iio_dev *indio_dev);
+int adis16251_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t adis16251_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int adis16251_configure_ring(struct iio_dev *indio_dev);
+void adis16251_unconfigure_ring(struct iio_dev *indio_dev);
+
+int adis16251_initialize_ring(struct iio_ring_buffer *ring);
+void adis16251_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void adis16251_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16251_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+adis16251_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int adis16251_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void adis16251_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+
+static inline int adis16251_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+
+static inline void adis16251_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+
+#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* SPI_ADIS16251_H_ */
diff --git a/drivers/staging/iio/gyro/adis16251_core.c b/drivers/staging/iio/gyro/adis16251_core.c
new file mode 100644
index 000000000000..a0d400f7ee62
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16251_core.c
@@ -0,0 +1,777 @@
+/*
+ * ADIS16251 Programmable Digital Gyroscope Sensor Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "gyro.h"
+#include "../adc/adc.h"
+
+#include "adis16251.h"
+
+#define DRIVER_NAME             "adis16251"
+
+/* At the moment the spi framework doesn't allow global setting of cs_change.
+ * It's in the likely to be added comment at the top of spi.h.
+ * This means that use cannot be made of spi_write etc.
+ */
+
+/**
+ * adis16251_spi_write_reg_8() - write single byte to a register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the register to be written
+ * @val: the value to write
+ **/
+int adis16251_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16251_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16251_spi_write_reg_16() - write 2 bytes to a pair of registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: value to be written
+ **/
+static int adis16251_spi_write_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .tx_buf = st->tx + 2,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16251_WRITE_REG(lower_reg_address);
+        st->tx[1] = value & 0xFF;
+        st->tx[2] = ADIS16251_WRITE_REG(lower_reg_address + 1);
+        st->tx[3] = (value >> 8) & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/**
+ * adis16251_spi_read_reg_16() - read 2 bytes from a 16-bit register
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @reg_address: the address of the lower of the two registers. Second register
+ *               is assumed to have address one greater.
+ * @val: somewhere to pass back the value read
+ **/
+static int adis16251_spi_read_reg_16(struct device *dev,
+                u8 lower_reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                }, {
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16251_READ_REG(lower_reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                lower_reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[0] << 8) | st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+/**
+ * adis16251_spi_read_burst() - read all data registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @rx: somewhere to pass back the value read (min size is 24 bytes)
+ **/
+int adis16251_spi_read_burst(struct device *dev, u8 *rx)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+        u32 old_speed_hz = st->us->max_speed_hz;
+        int ret;
+
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                        .cs_change = 0,
+                }, {
+                        .rx_buf = rx,
+                        .bits_per_word = 8,
+                        .len = 24,
+                        .cs_change = 1,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADIS16251_READ_REG(ADIS16251_GLOB_CMD);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+
+        st->us->max_speed_hz = min(ADIS16251_SPI_BURST, old_speed_hz);
+        spi_setup(st->us);
+
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when burst reading");
+
+        st->us->max_speed_hz = old_speed_hz;
+        spi_setup(st->us);
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+/**
+ * adis16251_spi_read_sequence() - read a sequence of 16-bit registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @tx: register addresses in bytes 0,2,4,6... (min size is 2*num bytes)
+ * @rx: somewhere to pass back the value read (min size is 2*num bytes)
+ **/
+int adis16251_spi_read_sequence(struct device *dev,
+                u8 *tx, u8 *rx, int num)
+{
+        struct spi_message msg;
+        struct spi_transfer *xfers;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+        int ret, i;
+
+        xfers = kzalloc(num + 1, GFP_KERNEL);
+        if (xfers == NULL) {
+                dev_err(&st->us->dev, "memory alloc failed");
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+
+        /* tx: |add1|addr2|addr3|...|addrN |zero|
+         * rx: |zero|res1 |res2 |...|resN-1|resN| */
+        spi_message_init(&msg);
+        for (i = 0; i < num + 1; i++) {
+                if (i > 0)
+                        xfers[i].rx_buf = st->rx + 2*(i - 1);
+                if (i < num)
+                        xfers[i].tx_buf = st->tx + 2*i;
+                xfers[i].bits_per_word = 8;
+                xfers[i].len = 2;
+                xfers[i].cs_change = 1;
+                spi_message_add_tail(&xfers[i], &msg);
+        }
+
+        mutex_lock(&st->buf_lock);
+
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when reading sequence");
+
+        mutex_unlock(&st->buf_lock);
+        kfree(xfers);
+
+error_ret:
+        return ret;
+}
+
+static ssize_t adis16251_spi_read_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf,
+                unsigned bits)
+{
+        int ret;
+        s16 val = 0;
+        unsigned shift = 16 - bits;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = adis16251_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
+        if (ret)
+                return ret;
+
+        if (val & ADIS16251_ERROR_ACTIVE)
+                adis16251_check_status(dev);
+        val = ((s16)(val << shift) >> shift);
+        return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t adis16251_read_12bit_unsigned(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = adis16251_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        if (val & ADIS16251_ERROR_ACTIVE)
+                adis16251_check_status(dev);
+
+        return sprintf(buf, "%u\n", val & 0x0FFF);
+}
+
+static ssize_t adis16251_read_14bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16251_spi_read_signed(dev, attr, buf, 14);
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16251_read_12bit_signed(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        ssize_t ret;
+
+        /* Take the iio_dev status lock */
+        mutex_lock(&indio_dev->mlock);
+        ret =  adis16251_spi_read_signed(dev, attr, buf, 12);
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static ssize_t adis16251_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = adis16251_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t adis16251_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u16 t;
+        int sps;
+        ret = adis16251_spi_read_reg_16(dev,
+                        ADIS16251_SMPL_PRD,
+                        &t);
+        if (ret)
+                return ret;
+        sps =  (t & ADIS16251_SMPL_PRD_TIME_BASE) ? 8 : 256;
+        sps /= (t & ADIS16251_SMPL_PRD_DIV_MASK) + 1;
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t adis16251_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16251_state *st = iio_dev_get_devdata(indio_dev);
+        long val;
+        int ret;
+        u8 t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (256 / val);
+        if (t > 0)
+                t--;
+        t &= ADIS16251_SMPL_PRD_DIV_MASK;
+        if ((t & ADIS16251_SMPL_PRD_DIV_MASK) >= 0x0A)
+                st->us->max_speed_hz = ADIS16251_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADIS16251_SPI_FAST;
+
+        ret = adis16251_spi_write_reg_8(dev,
+                        ADIS16251_SMPL_PRD,
+                        t);
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t adis16251_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return adis16251_reset(dev);
+        }
+        return -1;
+}
+
+
+
+int adis16251_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u16 msc;
+        ret = adis16251_spi_read_reg_16(dev, ADIS16251_MSC_CTRL, &msc);
+        if (ret)
+                goto error_ret;
+
+        msc |= ADIS16251_MSC_CTRL_DATA_RDY_POL_HIGH;
+        if (enable)
+                msc |= ADIS16251_MSC_CTRL_DATA_RDY_EN;
+        else
+                msc &= ~ADIS16251_MSC_CTRL_DATA_RDY_EN;
+
+        ret = adis16251_spi_write_reg_16(dev, ADIS16251_MSC_CTRL, msc);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+int adis16251_reset(struct device *dev)
+{
+        int ret;
+        ret = adis16251_spi_write_reg_8(dev,
+                        ADIS16251_GLOB_CMD,
+                        ADIS16251_GLOB_CMD_SW_RESET);
+        if (ret)
+                dev_err(dev, "problem resetting device");
+
+        return ret;
+}
+
+/* Power down the device */
+int adis16251_stop_device(struct device *dev)
+{
+        int ret;
+        u16 val = ADIS16251_SLP_CNT_POWER_OFF;
+
+        ret = adis16251_spi_write_reg_16(dev, ADIS16251_SLP_CNT, val);
+        if (ret)
+                dev_err(dev, "problem with turning device off: SLP_CNT");
+
+        return ret;
+}
+
+static int adis16251_self_test(struct device *dev)
+{
+        int ret;
+
+        ret = adis16251_spi_write_reg_16(dev,
+                        ADIS16251_MSC_CTRL,
+                        ADIS16251_MSC_CTRL_INT_SELF_TEST);
+        if (ret) {
+                dev_err(dev, "problem starting self test");
+                goto err_ret;
+        }
+
+        adis16251_check_status(dev);
+
+err_ret:
+        return ret;
+}
+
+int adis16251_check_status(struct device *dev)
+{
+        u16 status;
+        int ret;
+
+        ret = adis16251_spi_read_reg_16(dev, ADIS16251_DIAG_STAT, &status);
+
+        if (ret < 0) {
+                dev_err(dev, "Reading status failed\n");
+                goto error_ret;
+        }
+
+        if (!(status & ADIS16251_DIAG_STAT_ERR_MASK)) {
+                ret = 0;
+                goto error_ret;
+        }
+
+        ret = -EFAULT;
+
+        if (status & ADIS16251_DIAG_STAT_ALARM2)
+                dev_err(dev, "Alarm 2 active\n");
+        if (status & ADIS16251_DIAG_STAT_ALARM1)
+                dev_err(dev, "Alarm 1 active\n");
+        if (status & ADIS16251_DIAG_STAT_SELF_TEST)
+                dev_err(dev, "Self test error\n");
+        if (status & ADIS16251_DIAG_STAT_OVERFLOW)
+                dev_err(dev, "Sensor overrange\n");
+        if (status & ADIS16251_DIAG_STAT_SPI_FAIL)
+                dev_err(dev, "SPI failure\n");
+        if (status & ADIS16251_DIAG_STAT_FLASH_UPT)
+                dev_err(dev, "Flash update failed\n");
+        if (status & ADIS16251_DIAG_STAT_POWER_HIGH)
+                dev_err(dev, "Power supply above 5.25V\n");
+        if (status & ADIS16251_DIAG_STAT_POWER_LOW)
+                dev_err(dev, "Power supply below 4.75V\n");
+
+error_ret:
+        return ret;
+}
+
+static int adis16251_initial_setup(struct adis16251_state *st)
+{
+        int ret;
+        u16 smp_prd;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->max_speed_hz = ADIS16251_SPI_SLOW;
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = adis16251_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        /* Do self test */
+
+        /* Read status register to check the result */
+        ret = adis16251_check_status(dev);
+        if (ret) {
+                adis16251_reset(dev);
+                dev_err(dev, "device not playing ball -> reset");
+                msleep(ADIS16251_STARTUP_DELAY);
+                ret = adis16251_check_status(dev);
+                if (ret) {
+                        dev_err(dev, "giving up");
+                        goto err_ret;
+                }
+        }
+
+        printk(KERN_INFO DRIVER_NAME ": at CS%d (irq %d)\n",
+                        st->us->chip_select, st->us->irq);
+
+        /* use high spi speed if possible */
+        ret = adis16251_spi_read_reg_16(dev, ADIS16251_SMPL_PRD, &smp_prd);
+        if (!ret && (smp_prd & ADIS16251_SMPL_PRD_DIV_MASK) < 0x0A) {
+                st->us->max_speed_hz = ADIS16251_SPI_SLOW;
+                spi_setup(st->us);
+        }
+
+err_ret:
+        return ret;
+}
+
+static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16251_read_12bit_signed,
+                ADIS16251_SUPPLY_OUT);
+static IIO_CONST_ATTR(in0_supply_scale, "0.0018315");
+
+static IIO_DEV_ATTR_GYRO(adis16251_read_14bit_signed,
+                ADIS16251_GYRO_OUT);
+static IIO_DEV_ATTR_GYRO_SCALE(S_IWUSR | S_IRUGO,
+                adis16251_read_12bit_signed,
+                adis16251_write_16bit,
+                ADIS16251_GYRO_SCALE);
+static IIO_DEV_ATTR_GYRO_OFFSET(S_IWUSR | S_IRUGO,
+                adis16251_read_12bit_signed,
+                adis16251_write_16bit,
+                ADIS16251_GYRO_OFF);
+
+static IIO_DEV_ATTR_TEMP_RAW(adis16251_read_12bit_signed);
+static IIO_CONST_ATTR(temp_offset, "25 K");
+static IIO_CONST_ATTR(temp_scale, "0.1453 K");
+
+static IIO_DEV_ATTR_IN_NAMED_RAW(1, aux, adis16251_read_12bit_unsigned,
+                ADIS16251_AUX_ADC);
+static IIO_CONST_ATTR(in1_aux_scale, "0.0006105");
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                adis16251_read_frequency,
+                adis16251_write_frequency);
+static IIO_DEV_ATTR_ANGL(adis16251_read_14bit_signed,
+                ADIS16251_ANGL_OUT);
+
+static IIO_DEV_ATTR_RESET(adis16251_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("0.129 ~ 256");
+
+static IIO_CONST_ATTR(name, "adis16251");
+
+static struct attribute *adis16251_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group adis16251_event_attribute_group = {
+        .attrs = adis16251_event_attributes,
+};
+
+static struct attribute *adis16251_attributes[] = {
+        &iio_dev_attr_in0_supply_raw.dev_attr.attr,
+        &iio_const_attr_in0_supply_scale.dev_attr.attr,
+        &iio_dev_attr_gyro_raw.dev_attr.attr,
+        &iio_dev_attr_gyro_scale.dev_attr.attr,
+        &iio_dev_attr_gyro_offset.dev_attr.attr,
+        &iio_dev_attr_angl_raw.dev_attr.attr,
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_in1_aux_raw.dev_attr.attr,
+        &iio_const_attr_in1_aux_scale.dev_attr.attr,
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adis16251_attribute_group = {
+        .attrs = adis16251_attributes,
+};
+
+static int __devinit adis16251_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct adis16251_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADIS16251_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADIS16251_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &adis16251_event_attribute_group;
+        st->indio_dev->attrs = &adis16251_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = adis16251_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = adis16251_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_RISING,
+                                "adis16251");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = adis16251_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = adis16251_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                adis16251_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        adis16251_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        adis16251_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int adis16251_remove(struct spi_device *spi)
+{
+        int ret;
+        struct adis16251_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = adis16251_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        adis16251_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        adis16251_uninitialize_ring(indio_dev->ring);
+        adis16251_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver adis16251_driver = {
+        .driver = {
+                .name = "adis16251",
+                .owner = THIS_MODULE,
+        },
+        .probe = adis16251_probe,
+        .remove = __devexit_p(adis16251_remove),
+};
+
+static __init int adis16251_init(void)
+{
+        return spi_register_driver(&adis16251_driver);
+}
+module_init(adis16251_init);
+
+static __exit void adis16251_exit(void)
+{
+        spi_unregister_driver(&adis16251_driver);
+}
+module_exit(adis16251_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADIS16251 Digital Gyroscope Sensor SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index 812440af57d6..c1fd4364287f 100644
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -1,5 +1,6 @@
 #ifndef SPI_ADIS16260_H_
 #define SPI_ADIS16260_H_
+#include "adis16260_platform_data.h"
 
 #define ADIS16260_STARTUP_DELAY 220 /* ms */
 
@@ -92,6 +93,7 @@
  * @tx:                 transmit buffer
  * @rx:                 recieve buffer
  * @buf_lock:           mutex to protect tx and rx
+ * @negate:             negate the scale parameter
  **/
 struct adis16260_state {
         struct spi_device               *us;
@@ -102,6 +104,7 @@ struct adis16260_state {
         u8                              *tx;
         u8                              *rx;
         struct mutex                    buf_lock;
+        unsigned                        negate:1;
 };
 
 int adis16260_set_irq(struct device *dev, bool enable);
diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index 7d7716e5857c..045e27da980a 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -1,5 +1,5 @@
 /*
- * ADIS16260 Programmable Digital Gyroscope Sensor Driver
+ * ADIS16260/ADIS16265 Programmable Digital Gyroscope Sensor Driver
  *
  * Copyright 2010 Analog Devices Inc.
  *
@@ -134,8 +134,6 @@ static int adis16260_spi_read_reg_16(struct device *dev,
         mutex_lock(&st->buf_lock);
         st->tx[0] = ADIS16260_READ_REG(lower_reg_address);
         st->tx[1] = 0;
-        st->tx[2] = 0;
-        st->tx[3] = 0;
 
         spi_message_init(&msg);
         spi_message_add_tail(&xfers[0], &msg);
@@ -293,6 +291,22 @@ static ssize_t adis16260_write_frequency(struct device *dev,
         return ret ? ret : len;
 }
 
+static ssize_t adis16260_read_gyro_scale(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct adis16260_state *st = iio_dev_get_devdata(indio_dev);
+        ssize_t ret = 0;
+
+        if (st->negate)
+                ret = sprintf(buf, "-");
+        /* Take the iio_dev status lock */
+        ret += sprintf(buf + ret, "%s\n", "0.00127862821");
+
+        return ret;
+}
+
 static int adis16260_reset(struct device *dev)
 {
         int ret;
@@ -447,18 +461,6 @@ static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply,
                                 ADIS16260_SUPPLY_OUT);
 static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.0018315");
 
-static IIO_DEV_ATTR_GYRO(adis16260_read_14bit_signed,
-                ADIS16260_GYRO_OUT);
-static IIO_CONST_ATTR_GYRO_SCALE("0.00127862821");
-static IIO_DEV_ATTR_GYRO_CALIBSCALE(S_IWUSR | S_IRUGO,
-                adis16260_read_14bit_signed,
-                adis16260_write_16bit,
-                ADIS16260_GYRO_SCALE);
-static IIO_DEV_ATTR_GYRO_CALIBBIAS(S_IWUSR | S_IRUGO,
-                adis16260_read_12bit_signed,
-                adis16260_write_16bit,
-                ADIS16260_GYRO_OFF);
-
 static IIO_DEV_ATTR_TEMP_RAW(adis16260_read_12bit_unsigned);
 static IIO_CONST_ATTR_TEMP_OFFSET("25");
 static IIO_CONST_ATTR_TEMP_SCALE("0.1453");
@@ -470,8 +472,6 @@ static IIO_CONST_ATTR(in1_scale, "0.0006105");
 static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
                 adis16260_read_frequency,
                 adis16260_write_frequency);
-static IIO_DEV_ATTR_ANGL(adis16260_read_14bit_signed,
-                ADIS16260_ANGL_OUT);
 
 static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16260_write_reset, 0);
 
@@ -487,38 +487,70 @@ static struct attribute_group adis16260_event_attribute_group = {
         .attrs = adis16260_event_attributes,
 };
 
-static struct attribute *adis16260_attributes[] = {
-        &iio_dev_attr_in0_supply_raw.dev_attr.attr,
-        &iio_const_attr_in0_supply_scale.dev_attr.attr,
-        &iio_dev_attr_gyro_raw.dev_attr.attr,
-        &iio_const_attr_gyro_scale.dev_attr.attr,
-        &iio_dev_attr_gyro_calibscale.dev_attr.attr,
-        &iio_dev_attr_gyro_calibbias.dev_attr.attr,
-        &iio_dev_attr_angl_raw.dev_attr.attr,
-        &iio_dev_attr_temp_raw.dev_attr.attr,
-        &iio_const_attr_temp_offset.dev_attr.attr,
-        &iio_const_attr_temp_scale.dev_attr.attr,
-        &iio_dev_attr_in1_raw.dev_attr.attr,
-        &iio_const_attr_in1_scale.dev_attr.attr,
-        &iio_dev_attr_sampling_frequency.dev_attr.attr,
-        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
-        &iio_dev_attr_reset.dev_attr.attr,
-        &iio_const_attr_name.dev_attr.attr,
-        NULL
-};
+#define ADIS16260_GYRO_ATTR_SET(axis)                                   \
+        IIO_DEV_ATTR_GYRO##axis(adis16260_read_14bit_signed,            \
+                                ADIS16260_GYRO_OUT);                    \
+        static IIO_DEV_ATTR_GYRO##axis##_SCALE(S_IRUGO,                 \
+                                        adis16260_read_gyro_scale,      \
+                                        NULL,                           \
+                                        0);                             \
+        static IIO_DEV_ATTR_GYRO##axis##_CALIBSCALE(S_IRUGO | S_IWUSR,  \
+                                        adis16260_read_12bit_unsigned,  \
+                                        adis16260_write_16bit,          \
+                                        ADIS16260_GYRO_SCALE);          \
+        static IIO_DEV_ATTR_GYRO##axis##_CALIBBIAS(S_IWUSR | S_IRUGO,   \
+                                        adis16260_read_12bit_signed,    \
+                                        adis16260_write_16bit,          \
+                                        ADIS16260_GYRO_OFF);            \
+        static IIO_DEV_ATTR_ANGL##axis(adis16260_read_14bit_signed,     \
+                                       ADIS16260_ANGL_OUT);
+
+static ADIS16260_GYRO_ATTR_SET();
+static ADIS16260_GYRO_ATTR_SET(_X);
+static ADIS16260_GYRO_ATTR_SET(_Y);
+static ADIS16260_GYRO_ATTR_SET(_Z);
+
+#define ADIS16260_ATTR_GROUP(axis)                                      \
+        struct attribute *adis16260_attributes##axis[] = {              \
+                &iio_dev_attr_in0_supply_raw.dev_attr.attr,             \
+                &iio_const_attr_in0_supply_scale.dev_attr.attr,         \
+                &iio_dev_attr_gyro##axis##_raw.dev_attr.attr,           \
+                &iio_dev_attr_gyro##axis##_scale.dev_attr.attr,         \
+                &iio_dev_attr_gyro##axis##_calibscale.dev_attr.attr,    \
+                &iio_dev_attr_gyro##axis##_calibbias.dev_attr.attr,     \
+                &iio_dev_attr_angl##axis##_raw.dev_attr.attr,           \
+                &iio_dev_attr_temp_raw.dev_attr.attr,                   \
+                &iio_const_attr_temp_offset.dev_attr.attr,              \
+                &iio_const_attr_temp_scale.dev_attr.attr,               \
+                &iio_dev_attr_in1_raw.dev_attr.attr,                    \
+                &iio_const_attr_in1_scale.dev_attr.attr,                \
+                &iio_dev_attr_sampling_frequency.dev_attr.attr,         \
+                &iio_const_attr_sampling_frequency_available.dev_attr.attr, \
+                &iio_dev_attr_reset.dev_attr.attr,                      \
+                &iio_const_attr_name.dev_attr.attr,                     \
+                NULL                                                    \
+        };                                                              \
+        static const struct attribute_group adis16260_attribute_group##axis \
+        = {                                                             \
+                .attrs = adis16260_attributes##axis,                    \
+        };
 
-static const struct attribute_group adis16260_attribute_group = {
-        .attrs = adis16260_attributes,
-};
+static ADIS16260_ATTR_GROUP();
+static ADIS16260_ATTR_GROUP(_x);
+static ADIS16260_ATTR_GROUP(_y);
+static ADIS16260_ATTR_GROUP(_z);
 
 static int __devinit adis16260_probe(struct spi_device *spi)
 {
         int ret, regdone = 0;
+        struct adis16260_platform_data *pd = spi->dev.platform_data;
         struct adis16260_state *st = kzalloc(sizeof *st, GFP_KERNEL);
         if (!st) {
                 ret =  -ENOMEM;
                 goto error_ret;
         }
+        if (pd)
+                st->negate = pd->negate;
         /* this is only used for removal purposes */
         spi_set_drvdata(spi, st);
 
@@ -545,7 +577,24 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         st->indio_dev->dev.parent = &spi->dev;
         st->indio_dev->num_interrupt_lines = 1;
         st->indio_dev->event_attrs = &adis16260_event_attribute_group;
-        st->indio_dev->attrs = &adis16260_attribute_group;
+        if (pd && pd->direction)
+                switch (pd->direction) {
+                case 'x':
+                        st->indio_dev->attrs = &adis16260_attribute_group_x;
+                        break;
+                case 'y':
+                        st->indio_dev->attrs = &adis16260_attribute_group_y;
+                        break;
+                case 'z':
+                        st->indio_dev->attrs = &adis16260_attribute_group_z;
+                        break;
+                default:
+                        st->indio_dev->attrs = &adis16260_attribute_group;
+                        break;
+                }
+        else
+                st->indio_dev->attrs = &adis16260_attribute_group;
+
         st->indio_dev->dev_data = (void *)(st);
         st->indio_dev->driver_module = THIS_MODULE;
         st->indio_dev->modes = INDIO_DIRECT_MODE;
@@ -635,6 +684,18 @@ err_ret:
         return ret;
 }
 
+/*
+ * These parts do not need to be differentiated until someone adds
+ * support for the on chip filtering.
+ */
+static const struct spi_device_id adis16260_id[] = {
+        {"adis16260", 0},
+        {"adis16265", 0},
+        {"adis16250", 0},
+        {"adis16255", 0},
+        {}
+};
+
 static struct spi_driver adis16260_driver = {
         .driver = {
                 .name = "adis16260",
@@ -642,6 +703,7 @@ static struct spi_driver adis16260_driver = {
         },
         .probe = adis16260_probe,
         .remove = __devexit_p(adis16260_remove),
+        .id_table = adis16260_id,
 };
 
 static __init int adis16260_init(void)
diff --git a/drivers/staging/iio/gyro/adis16260_platform_data.h b/drivers/staging/iio/gyro/adis16260_platform_data.h
new file mode 100644
index 000000000000..12802e97be92
--- /dev/null
+++ b/drivers/staging/iio/gyro/adis16260_platform_data.h
@@ -0,0 +1,19 @@
+/*
+ * ADIS16260 Programmable Digital Gyroscope Sensor Driver Platform Data
+ *
+ * Based on adis16255.h Matthia Brugger <m_brugger&web.de>
+ *
+ * Copyright (C) 2010 Fraunhofer Institute for Integrated Circuits
+  *
+ * Licensed under the GPL-2 or later.
+ */
+
+/**
+ * struct adis16260_platform_data - instance specific data
+ * @direction: x y or z
+ * @negate: flag to indicate value should be inverted.
+ **/
+struct adis16260_platform_data {
+        char direction;
+        unsigned negate:1;
+};
diff --git a/drivers/staging/iio/gyro/gyro.h b/drivers/staging/iio/gyro/gyro.h
index 98b837b775a2..b4ea5bf161ff 100644
--- a/drivers/staging/iio/gyro/gyro.h
+++ b/drivers/staging/iio/gyro/gyro.h
@@ -71,3 +71,12 @@
 
 #define IIO_DEV_ATTR_ANGL(_show, _addr)                         \
         IIO_DEVICE_ATTR(angl_raw, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGL_X(_show, _addr)                               \
+        IIO_DEVICE_ATTR(angl_x_raw, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGL_Y(_show, _addr)                               \
+        IIO_DEVICE_ATTR(angl_y_raw, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGL_Z(_show, _addr)                               \
+        IIO_DEVICE_ATTR(angl_z_raw, S_IRUGO, _show, NULL, _addr)
diff --git a/drivers/staging/iio/imu/adis16350_core.c b/drivers/staging/iio/imu/adis16350_core.c
index 97c1ec8594ce..cf7176bc766b 100644
--- a/drivers/staging/iio/imu/adis16350_core.c
+++ b/drivers/staging/iio/imu/adis16350_core.c
@@ -570,6 +570,7 @@ static struct attribute *adis16350_attributes[] = {
         &iio_dev_attr_temp_y_raw.dev_attr.attr,
         &iio_dev_attr_temp_z_raw.dev_attr.attr,
         &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
         &iio_dev_attr_in1_raw.dev_attr.attr,
         &iio_const_attr_in1_scale.dev_attr.attr,
         &iio_dev_attr_sampling_frequency.dev_attr.attr,
diff --git a/drivers/staging/iio/meter/Kconfig b/drivers/staging/iio/meter/Kconfig
new file mode 100644
index 000000000000..12e36e460693
--- /dev/null
+++ b/drivers/staging/iio/meter/Kconfig
@@ -0,0 +1,61 @@
+#
+# IIO meter drivers configuration
+#
+comment "Active energy metering IC"
+
+config ADE7753
+        tristate "Analog Devices ADE7753/6 Single-Phase Multifunction Metering IC Driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADE7753 Single-Phase Multifunction
+          Metering IC with di/dt Sensor Interface.
+
+config ADE7754
+        tristate "Analog Devices ADE7754 Polyphase Multifunction Energy Metering IC Driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADE7754 Polyphase
+          Multifunction Energy Metering IC Driver.
+
+config ADE7758
+        tristate "Analog Devices ADE7758 Poly Phase Multifunction Energy Metering IC Driver"
+        depends on SPI
+        select IIO_TRIGGER if IIO_RING_BUFFER
+        select IIO_SW_RING if IIO_RING_BUFFER
+        help
+          Say yes here to build support for Analog Devices ADE7758 Polyphase
+          Multifunction Energy Metering IC with Per Phase Information Driver.
+
+config ADE7759
+        tristate "Analog Devices ADE7759 Active Energy Metering IC Driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADE7758 Active Energy
+          Metering IC with di/dt Sensor Interface.
+
+config ADE7854
+        tristate "Analog Devices ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver"
+        depends on SPI || I2C
+        help
+          Say yes here to build support for Analog Devices ADE7854/58/68/78 Polyphase
+          Multifunction Energy Metering IC Driver.
+
+config ADE7854_I2C
+        tristate "support I2C bus connection"
+        depends on ADE7854 && I2C
+        default y
+        help
+          Say Y here if you have ADE7854/58/68/78 hooked to an I2C bus.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ade7854-i2c.
+
+config ADE7854_SPI
+        tristate "support SPI bus connection"
+        depends on ADE7854 && SPI
+        default y
+        help
+          Say Y here if you have ADE7854/58/68/78 hooked to a SPI bus.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ade7854-spi.
diff --git a/drivers/staging/iio/meter/Makefile b/drivers/staging/iio/meter/Makefile
new file mode 100644
index 000000000000..0cc7d5140dfe
--- /dev/null
+++ b/drivers/staging/iio/meter/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for metering ic drivers
+#
+
+obj-$(CONFIG_ADE7753) += ade7753.o
+obj-$(CONFIG_ADE7754) += ade7754.o
+
+ade7758-y             := ade7758_core.o
+ade7758-$(CONFIG_IIO_RING_BUFFER) += ade7758_ring.o ade7758_trigger.o
+obj-$(CONFIG_ADE7758) += ade7758.o
+
+obj-$(CONFIG_ADE7759) += ade7759.o
+obj-$(CONFIG_ADE7854) += ade7854.o
+obj-$(CONFIG_ADE7854_I2C) += ade7854-i2c.o
+obj-$(CONFIG_ADE7854_SPI) += ade7854-spi.o
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
new file mode 100644
index 000000000000..e72afbd2b841
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -0,0 +1,730 @@
+/*
+ * ADE7753 Single-Phase Multifunction Metering IC with di/dt Sensor Interface Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7753.h"
+
+int ade7753_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7753_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7753_spi_read_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7753_spi_read_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 8) | st->rx[2];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7753_spi_read_reg_24(struct device *dev,
+                u8 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7753_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t ade7753_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7753_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7753_read_24bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7753_spi_read_reg_24(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val & 0xFFFFFF);
+}
+
+static ssize_t ade7753_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7753_spi_write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7753_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7753_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int ade7753_reset(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &val);
+        val |= 1 << 6; /* Software Chip Reset */
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        val);
+
+        return ret;
+}
+
+static ssize_t ade7753_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7753_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_AENERGY(ade7753_read_24bit, ADE7753_AENERGY);
+static IIO_DEV_ATTR_LAENERGY(ade7753_read_24bit, ADE7753_LAENERGY);
+static IIO_DEV_ATTR_VAENERGY(ade7753_read_24bit, ADE7753_VAENERGY);
+static IIO_DEV_ATTR_LVAENERGY(ade7753_read_24bit, ADE7753_LVAENERGY);
+static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_CFDEN);
+static IIO_DEV_ATTR_CFNUM(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CFNUM);
+static IIO_DEV_ATTR_CHKSUM(ade7753_read_8bit, ADE7753_CHKSUM);
+static IIO_DEV_ATTR_PHCAL(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_PHCAL);
+static IIO_DEV_ATTR_APOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_APOS);
+static IIO_DEV_ATTR_SAGCYC(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_SAGCYC);
+static IIO_DEV_ATTR_SAGLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_SAGLVL);
+static IIO_DEV_ATTR_LINECYC(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_LINECYC);
+static IIO_DEV_ATTR_WDIV(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_WDIV);
+static IIO_DEV_ATTR_IRMS(S_IWUSR | S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_IRMS);
+static IIO_DEV_ATTR_VRMS(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_VRMS);
+static IIO_DEV_ATTR_IRMSOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_IRMSOS);
+static IIO_DEV_ATTR_VRMSOS(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_VRMSOS);
+static IIO_DEV_ATTR_WGAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_WGAIN);
+static IIO_DEV_ATTR_VAGAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_VAGAIN);
+static IIO_DEV_ATTR_PGA_GAIN(S_IWUSR | S_IRUGO,
+                ade7753_read_16bit,
+                ade7753_write_16bit,
+                ADE7753_GAIN);
+static IIO_DEV_ATTR_IPKLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_IPKLVL);
+static IIO_DEV_ATTR_VPKLVL(S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_VPKLVL);
+static IIO_DEV_ATTR_IPEAK(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_IPEAK);
+static IIO_DEV_ATTR_VPEAK(S_IRUGO,
+                ade7753_read_24bit,
+                NULL,
+                ADE7753_VPEAK);
+static IIO_DEV_ATTR_VPERIOD(S_IRUGO,
+                ade7753_read_16bit,
+                NULL,
+                ADE7753_PERIOD);
+static IIO_DEV_ATTR_CH_OFF(1, S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CH1OS);
+static IIO_DEV_ATTR_CH_OFF(2, S_IWUSR | S_IRUGO,
+                ade7753_read_8bit,
+                ade7753_write_8bit,
+                ADE7753_CH2OS);
+
+static int ade7753_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u8 irqen;
+        ret = ade7753_spi_read_reg_8(dev, ADE7753_IRQEN, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 3; /* Enables an interrupt when a data is
+                                    present in the waveform register */
+        else
+                irqen &= ~(1 << 3);
+
+        ret = ade7753_spi_write_reg_8(dev, ADE7753_IRQEN, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+/* Power down the device */
+int ade7753_stop_device(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &val);
+        val |= 1 << 4;  /* AD converters can be turned off */
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        val);
+
+        return ret;
+}
+
+static int ade7753_initial_setup(struct ade7753_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = ade7753_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7753_reset(dev);
+        msleep(ADE7753_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static ssize_t ade7753_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u8 t;
+        int sps;
+        ret = ade7753_spi_read_reg_8(dev,
+                        ADE7753_MODE,
+                        &t);
+        if (ret)
+                return ret;
+
+        t = (t >> 11) & 0x3;
+        sps = 27900 / (1 + t);
+
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t ade7753_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7753_state *st = iio_dev_get_devdata(indio_dev);
+        unsigned long val;
+        int ret;
+        u16 reg, t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (27900 / val);
+        if (t > 0)
+                t--;
+
+        if (t > 1)
+                st->us->max_speed_hz = ADE7753_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADE7753_SPI_FAST;
+
+        ret = ade7753_spi_read_reg_16(dev,
+                        ADE7753_MODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(3 << 11);
+        reg |= t << 11;
+
+        ret = ade7753_spi_write_reg_16(dev,
+                        ADE7753_MODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+static IIO_DEV_ATTR_TEMP_RAW(ade7753_read_8bit);
+static IIO_CONST_ATTR(temp_offset, "-25 C");
+static IIO_CONST_ATTR(temp_scale, "0.67 C");
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                ade7753_read_frequency,
+                ade7753_write_frequency);
+
+static IIO_DEV_ATTR_RESET(ade7753_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500");
+
+static IIO_CONST_ATTR(name, "ade7753");
+
+static struct attribute *ade7753_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7753_event_attribute_group = {
+        .attrs = ade7753_event_attributes,
+};
+
+static struct attribute *ade7753_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_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_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_phcal.dev_attr.attr,
+        &iio_dev_attr_cfden.dev_attr.attr,
+        &iio_dev_attr_aenergy.dev_attr.attr,
+        &iio_dev_attr_laenergy.dev_attr.attr,
+        &iio_dev_attr_vaenergy.dev_attr.attr,
+        &iio_dev_attr_lvaenergy.dev_attr.attr,
+        &iio_dev_attr_cfnum.dev_attr.attr,
+        &iio_dev_attr_apos.dev_attr.attr,
+        &iio_dev_attr_sagcyc.dev_attr.attr,
+        &iio_dev_attr_saglvl.dev_attr.attr,
+        &iio_dev_attr_linecyc.dev_attr.attr,
+        &iio_dev_attr_chksum.dev_attr.attr,
+        &iio_dev_attr_pga_gain.dev_attr.attr,
+        &iio_dev_attr_wgain.dev_attr.attr,
+        &iio_dev_attr_choff_1.dev_attr.attr,
+        &iio_dev_attr_choff_2.dev_attr.attr,
+        &iio_dev_attr_wdiv.dev_attr.attr,
+        &iio_dev_attr_irms.dev_attr.attr,
+        &iio_dev_attr_vrms.dev_attr.attr,
+        &iio_dev_attr_irmsos.dev_attr.attr,
+        &iio_dev_attr_vrmsos.dev_attr.attr,
+        &iio_dev_attr_vagain.dev_attr.attr,
+        &iio_dev_attr_ipklvl.dev_attr.attr,
+        &iio_dev_attr_vpklvl.dev_attr.attr,
+        &iio_dev_attr_ipeak.dev_attr.attr,
+        &iio_dev_attr_vpeak.dev_attr.attr,
+        &iio_dev_attr_vperiod.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7753_attribute_group = {
+        .attrs = ade7753_attributes,
+};
+
+static int __devinit ade7753_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct ade7753_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7753_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7753_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7753_event_attribute_group;
+        st->indio_dev->attrs = &ade7753_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7753_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7753_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7753");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7753_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = ade7753_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7753_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7753_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7753_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int ade7753_remove(struct spi_device *spi)
+{
+        int ret;
+        struct ade7753_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = ade7753_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        ade7753_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7753_uninitialize_ring(indio_dev->ring);
+        ade7753_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver ade7753_driver = {
+        .driver = {
+                .name = "ade7753",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7753_probe,
+        .remove = __devexit_p(ade7753_remove),
+};
+
+static __init int ade7753_init(void)
+{
+        return spi_register_driver(&ade7753_driver);
+}
+module_init(ade7753_init);
+
+static __exit void ade7753_exit(void)
+{
+        spi_unregister_driver(&ade7753_driver);
+}
+module_exit(ade7753_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7753/6 Single-Phase Multifunction Metering IC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h
new file mode 100644
index 000000000000..a3722b8c90fa
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7753.h
@@ -0,0 +1,140 @@
+#ifndef _ADE7753_H
+#define _ADE7753_H
+
+#define ADE7753_WAVEFORM   0x01
+#define ADE7753_AENERGY    0x02
+#define ADE7753_RAENERGY   0x03
+#define ADE7753_LAENERGY   0x04
+#define ADE7753_VAENERGY   0x05
+#define ADE7753_RVAENERGY  0x06
+#define ADE7753_LVAENERGY  0x07
+#define ADE7753_LVARENERGY 0x08
+#define ADE7753_MODE       0x09
+#define ADE7753_IRQEN      0x0A
+#define ADE7753_STATUS     0x0B
+#define ADE7753_RSTSTATUS  0x0C
+#define ADE7753_CH1OS      0x0D
+#define ADE7753_CH2OS      0x0E
+#define ADE7753_GAIN       0x0F
+#define ADE7753_PHCAL      0x10
+#define ADE7753_APOS       0x11
+#define ADE7753_WGAIN      0x12
+#define ADE7753_WDIV       0x13
+#define ADE7753_CFNUM      0x14
+#define ADE7753_CFDEN      0x15
+#define ADE7753_IRMS       0x16
+#define ADE7753_VRMS       0x17
+#define ADE7753_IRMSOS     0x18
+#define ADE7753_VRMSOS     0x19
+#define ADE7753_VAGAIN     0x1A
+#define ADE7753_VADIV      0x1B
+#define ADE7753_LINECYC    0x1C
+#define ADE7753_ZXTOUT     0x1D
+#define ADE7753_SAGCYC     0x1E
+#define ADE7753_SAGLVL     0x1F
+#define ADE7753_IPKLVL     0x20
+#define ADE7753_VPKLVL     0x21
+#define ADE7753_IPEAK      0x22
+#define ADE7753_RSTIPEAK   0x23
+#define ADE7753_VPEAK      0x24
+#define ADE7753_RSTVPEAK   0x25
+#define ADE7753_TEMP       0x26
+#define ADE7753_PERIOD     0x27
+#define ADE7753_TMODE      0x3D
+#define ADE7753_CHKSUM     0x3E
+#define ADE7753_DIEREV     0x3F
+
+#define ADE7753_READ_REG(a)    a
+#define ADE7753_WRITE_REG(a) ((a) | 0x80)
+
+#define ADE7753_MAX_TX    4
+#define ADE7753_MAX_RX    4
+#define ADE7753_STARTUP_DELAY 1
+
+#define ADE7753_SPI_SLOW        (u32)(300 * 1000)
+#define ADE7753_SPI_BURST       (u32)(1000 * 1000)
+#define ADE7753_SPI_FAST        (u32)(2000 * 1000)
+
+#define DRIVER_NAME             "ade7753"
+
+/**
+ * struct ade7753_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct ade7753_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum ade7753_scan {
+        ADE7753_SCAN_ACTIVE_POWER,
+        ADE7753_SCAN_CH1,
+        ADE7753_SCAN_CH2,
+};
+
+void ade7753_remove_trigger(struct iio_dev *indio_dev);
+int ade7753_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t ade7753_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf);
+
+
+int ade7753_configure_ring(struct iio_dev *indio_dev);
+void ade7753_unconfigure_ring(struct iio_dev *indio_dev);
+
+int ade7753_initialize_ring(struct iio_ring_buffer *ring);
+void ade7753_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void ade7753_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7753_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+ade7753_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return 0;
+}
+
+static int ade7753_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+static inline void ade7753_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7753_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+static inline void ade7753_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+
+#endif
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
new file mode 100644
index 000000000000..23dedfa7a270
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -0,0 +1,756 @@
+/*
+ * ADE7754 Polyphase Multifunction Energy Metering IC Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7754.h"
+
+static int ade7754_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7754_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7754_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7754_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7754_spi_read_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7754_READ_REG(reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7754_spi_read_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7754_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 8) | st->rx[2];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7754_spi_read_reg_24(struct device *dev,
+                u8 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7754_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t ade7754_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7754_spi_read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7754_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7754_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7754_read_24bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7754_spi_read_reg_24(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val & 0xFFFFFF);
+}
+
+static ssize_t ade7754_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7754_spi_write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7754_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7754_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int ade7754_reset(struct device *dev)
+{
+        int ret;
+        u8 val;
+        ade7754_spi_read_reg_8(dev,
+                        ADE7754_OPMODE,
+                        &val);
+        val |= 1 << 6; /* Software Chip Reset */
+        ret = ade7754_spi_write_reg_8(dev,
+                        ADE7754_OPMODE,
+                        val);
+
+        return ret;
+}
+
+
+static ssize_t ade7754_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7754_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_AENERGY(ade7754_read_24bit, ADE7754_AENERGY);
+static IIO_DEV_ATTR_LAENERGY(ade7754_read_24bit, ADE7754_LAENERGY);
+static IIO_DEV_ATTR_VAENERGY(ade7754_read_24bit, ADE7754_VAENERGY);
+static IIO_DEV_ATTR_LVAENERGY(ade7754_read_24bit, ADE7754_LVAENERGY);
+static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_VPEAK);
+static IIO_DEV_ATTR_IPEAK(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_VPEAK);
+static IIO_DEV_ATTR_APHCAL(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_APHCAL);
+static IIO_DEV_ATTR_BPHCAL(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_BPHCAL);
+static IIO_DEV_ATTR_CPHCAL(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_CPHCAL);
+static IIO_DEV_ATTR_AAPOS(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_AAPOS);
+static IIO_DEV_ATTR_BAPOS(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_BAPOS);
+static IIO_DEV_ATTR_CAPOS(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CAPOS);
+static IIO_DEV_ATTR_WDIV(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_WDIV);
+static IIO_DEV_ATTR_VADIV(S_IWUSR | S_IRUGO,
+                ade7754_read_8bit,
+                ade7754_write_8bit,
+                ADE7754_VADIV);
+static IIO_DEV_ATTR_CFNUM(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CFNUM);
+static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CFDEN);
+static IIO_DEV_ATTR_ACTIVE_POWER_A_GAIN(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_AAPGAIN);
+static IIO_DEV_ATTR_ACTIVE_POWER_B_GAIN(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_BAPGAIN);
+static IIO_DEV_ATTR_ACTIVE_POWER_C_GAIN(S_IWUSR | S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CAPGAIN);
+static IIO_DEV_ATTR_AIRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_AIRMS);
+static IIO_DEV_ATTR_BIRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_BIRMS);
+static IIO_DEV_ATTR_CIRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_CIRMS);
+static IIO_DEV_ATTR_AVRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_AVRMS);
+static IIO_DEV_ATTR_BVRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_BVRMS);
+static IIO_DEV_ATTR_CVRMS(S_IRUGO,
+                ade7754_read_24bit,
+                NULL,
+                ADE7754_CVRMS);
+static IIO_DEV_ATTR_AIRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_AIRMSOS);
+static IIO_DEV_ATTR_BIRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_BIRMSOS);
+static IIO_DEV_ATTR_CIRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CIRMSOS);
+static IIO_DEV_ATTR_AVRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_AVRMSOS);
+static IIO_DEV_ATTR_BVRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_BVRMSOS);
+static IIO_DEV_ATTR_CVRMSOS(S_IRUGO,
+                ade7754_read_16bit,
+                ade7754_write_16bit,
+                ADE7754_CVRMSOS);
+
+static int ade7754_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u16 irqen;
+        ret = ade7754_spi_read_reg_16(dev, ADE7754_IRQEN, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 14; /* Enables an interrupt when a data is
+                                     present in the waveform register */
+        else
+                irqen &= ~(1 << 14);
+
+        ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+/* Power down the device */
+static int ade7754_stop_device(struct device *dev)
+{
+        int ret;
+        u8 val;
+        ade7754_spi_read_reg_8(dev,
+                        ADE7754_OPMODE,
+                        &val);
+        val |= 7 << 3;  /* ADE7754 powered down */
+        ret = ade7754_spi_write_reg_8(dev,
+                        ADE7754_OPMODE,
+                        val);
+
+        return ret;
+}
+
+static int ade7754_initial_setup(struct ade7754_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = ade7754_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7754_reset(dev);
+        msleep(ADE7754_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static ssize_t ade7754_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u8 t;
+        int sps;
+        ret = ade7754_spi_read_reg_8(dev,
+                        ADE7754_WAVMODE,
+                        &t);
+        if (ret)
+                return ret;
+
+        t = (t >> 3) & 0x3;
+        sps = 26000 / (1 + t);
+
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t ade7754_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+        unsigned long val;
+        int ret;
+        u8 reg, t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (26000 / val);
+        if (t > 0)
+                t--;
+
+        if (t > 1)
+                st->us->max_speed_hz = ADE7754_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADE7754_SPI_FAST;
+
+        ret = ade7754_spi_read_reg_8(dev,
+                        ADE7754_WAVMODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(3 << 3);
+        reg |= t << 3;
+
+        ret = ade7754_spi_write_reg_8(dev,
+                        ADE7754_WAVMODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+static IIO_DEV_ATTR_TEMP_RAW(ade7754_read_8bit);
+static IIO_CONST_ATTR(temp_offset, "129 C");
+static IIO_CONST_ATTR(temp_scale, "4 C");
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                ade7754_read_frequency,
+                ade7754_write_frequency);
+
+static IIO_DEV_ATTR_RESET(ade7754_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26000 13000 65000 33000");
+
+static IIO_CONST_ATTR(name, "ade7754");
+
+static struct attribute *ade7754_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7754_event_attribute_group = {
+        .attrs = ade7754_event_attributes,
+};
+
+static struct attribute *ade7754_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_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_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_aenergy.dev_attr.attr,
+        &iio_dev_attr_laenergy.dev_attr.attr,
+        &iio_dev_attr_vaenergy.dev_attr.attr,
+        &iio_dev_attr_lvaenergy.dev_attr.attr,
+        &iio_dev_attr_vpeak.dev_attr.attr,
+        &iio_dev_attr_ipeak.dev_attr.attr,
+        &iio_dev_attr_aphcal.dev_attr.attr,
+        &iio_dev_attr_bphcal.dev_attr.attr,
+        &iio_dev_attr_cphcal.dev_attr.attr,
+        &iio_dev_attr_aapos.dev_attr.attr,
+        &iio_dev_attr_bapos.dev_attr.attr,
+        &iio_dev_attr_capos.dev_attr.attr,
+        &iio_dev_attr_wdiv.dev_attr.attr,
+        &iio_dev_attr_vadiv.dev_attr.attr,
+        &iio_dev_attr_cfnum.dev_attr.attr,
+        &iio_dev_attr_cfden.dev_attr.attr,
+        &iio_dev_attr_active_power_a_gain.dev_attr.attr,
+        &iio_dev_attr_active_power_b_gain.dev_attr.attr,
+        &iio_dev_attr_active_power_c_gain.dev_attr.attr,
+        &iio_dev_attr_airms.dev_attr.attr,
+        &iio_dev_attr_birms.dev_attr.attr,
+        &iio_dev_attr_cirms.dev_attr.attr,
+        &iio_dev_attr_avrms.dev_attr.attr,
+        &iio_dev_attr_bvrms.dev_attr.attr,
+        &iio_dev_attr_cvrms.dev_attr.attr,
+        &iio_dev_attr_airmsos.dev_attr.attr,
+        &iio_dev_attr_birmsos.dev_attr.attr,
+        &iio_dev_attr_cirmsos.dev_attr.attr,
+        &iio_dev_attr_avrmsos.dev_attr.attr,
+        &iio_dev_attr_bvrmsos.dev_attr.attr,
+        &iio_dev_attr_cvrmsos.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7754_attribute_group = {
+        .attrs = ade7754_attributes,
+};
+
+
+
+static int __devinit ade7754_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct ade7754_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7754_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7754_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7754_event_attribute_group;
+        st->indio_dev->attrs = &ade7754_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7754_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7754_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7754");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7754_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = ade7754_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7754_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7754_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7754_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int ade7754_remove(struct spi_device *spi)
+{
+        int ret;
+        struct ade7754_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = ade7754_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        ade7754_remove_trigger(indio_dev);
+        if (spi->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7754_uninitialize_ring(indio_dev->ring);
+        ade7754_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver ade7754_driver = {
+        .driver = {
+                .name = "ade7754",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7754_probe,
+        .remove = __devexit_p(ade7754_remove),
+};
+
+static __init int ade7754_init(void)
+{
+        return spi_register_driver(&ade7754_driver);
+}
+module_init(ade7754_init);
+
+static __exit void ade7754_exit(void)
+{
+        spi_unregister_driver(&ade7754_driver);
+}
+module_exit(ade7754_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7754 Polyphase Multifunction Energy Metering IC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h
new file mode 100644
index 000000000000..f6a3e4b926cf
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7754.h
@@ -0,0 +1,161 @@
+#ifndef _ADE7754_H
+#define _ADE7754_H
+
+#define ADE7754_AENERGY   0x01
+#define ADE7754_RAENERGY  0x02
+#define ADE7754_LAENERGY  0x03
+#define ADE7754_VAENERGY  0x04
+#define ADE7754_RVAENERGY 0x05
+#define ADE7754_LVAENERGY 0x06
+#define ADE7754_PERIOD    0x07
+#define ADE7754_TEMP      0x08
+#define ADE7754_WFORM     0x09
+#define ADE7754_OPMODE    0x0A
+#define ADE7754_MMODE     0x0B
+#define ADE7754_WAVMODE   0x0C
+#define ADE7754_WATMODE   0x0D
+#define ADE7754_VAMODE    0x0E
+#define ADE7754_IRQEN     0x0F
+#define ADE7754_STATUS    0x10
+#define ADE7754_RSTATUS   0x11
+#define ADE7754_ZXTOUT    0x12
+#define ADE7754_LINCYC    0x13
+#define ADE7754_SAGCYC    0x14
+#define ADE7754_SAGLVL    0x15
+#define ADE7754_VPEAK     0x16
+#define ADE7754_IPEAK     0x17
+#define ADE7754_GAIN      0x18
+#define ADE7754_AWG       0x19
+#define ADE7754_BWG       0x1A
+#define ADE7754_CWG       0x1B
+#define ADE7754_AVAG      0x1C
+#define ADE7754_BVAG      0x1D
+#define ADE7754_CVAG      0x1E
+#define ADE7754_APHCAL    0x1F
+#define ADE7754_BPHCAL    0x20
+#define ADE7754_CPHCAL    0x21
+#define ADE7754_AAPOS     0x22
+#define ADE7754_BAPOS     0x23
+#define ADE7754_CAPOS     0x24
+#define ADE7754_CFNUM     0x25
+#define ADE7754_CFDEN     0x26
+#define ADE7754_WDIV      0x27
+#define ADE7754_VADIV     0x28
+#define ADE7754_AIRMS     0x29
+#define ADE7754_BIRMS     0x2A
+#define ADE7754_CIRMS     0x2B
+#define ADE7754_AVRMS     0x2C
+#define ADE7754_BVRMS     0x2D
+#define ADE7754_CVRMS     0x2E
+#define ADE7754_AIRMSOS   0x2F
+#define ADE7754_BIRMSOS   0x30
+#define ADE7754_CIRMSOS   0x31
+#define ADE7754_AVRMSOS   0x32
+#define ADE7754_BVRMSOS   0x33
+#define ADE7754_CVRMSOS   0x34
+#define ADE7754_AAPGAIN   0x35
+#define ADE7754_BAPGAIN   0x36
+#define ADE7754_CAPGAIN   0x37
+#define ADE7754_AVGAIN    0x38
+#define ADE7754_BVGAIN    0x39
+#define ADE7754_CVGAIN    0x3A
+#define ADE7754_CHKSUM    0x3E
+#define ADE7754_VERSION   0x3F
+
+#define ADE7754_READ_REG(a)    a
+#define ADE7754_WRITE_REG(a) ((a) | 0x80)
+
+#define ADE7754_MAX_TX    4
+#define ADE7754_MAX_RX    4
+#define ADE7754_STARTUP_DELAY 1
+
+#define ADE7754_SPI_SLOW        (u32)(300 * 1000)
+#define ADE7754_SPI_BURST       (u32)(1000 * 1000)
+#define ADE7754_SPI_FAST        (u32)(2000 * 1000)
+
+#define DRIVER_NAME             "ade7754"
+
+/**
+ * struct ade7754_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct ade7754_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum ade7754_scan {
+        ADE7754_SCAN_PHA_V,
+        ADE7754_SCAN_PHB_V,
+        ADE7754_SCAN_PHC_V,
+        ADE7754_SCAN_PHA_I,
+        ADE7754_SCAN_PHB_I,
+        ADE7754_SCAN_PHC_I,
+};
+
+void ade7754_remove_trigger(struct iio_dev *indio_dev);
+int ade7754_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t ade7754_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int ade7754_configure_ring(struct iio_dev *indio_dev);
+void ade7754_unconfigure_ring(struct iio_dev *indio_dev);
+
+int ade7754_initialize_ring(struct iio_ring_buffer *ring);
+void ade7754_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void ade7754_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7754_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+ade7754_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static int ade7754_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+static inline void ade7754_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7754_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+static inline void ade7754_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+
+#endif
diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
new file mode 100644
index 000000000000..df5bb7ba5a0f
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -0,0 +1,171 @@
+#ifndef _ADE7758_H
+#define _ADE7758_H
+
+#define ADE7758_AWATTHR   0x01
+#define ADE7758_BWATTHR   0x02
+#define ADE7758_CWATTHR   0x03
+#define ADE7758_AVARHR    0x04
+#define ADE7758_BVARHR    0x05
+#define ADE7758_CVARHR    0x06
+#define ADE7758_AVAHR     0x07
+#define ADE7758_BVAHR     0x08
+#define ADE7758_CVAHR     0x09
+#define ADE7758_AIRMS     0x0A
+#define ADE7758_BIRMS     0x0B
+#define ADE7758_CIRMS     0x0C
+#define ADE7758_AVRMS     0x0D
+#define ADE7758_BVRMS     0x0E
+#define ADE7758_CVRMS     0x0F
+#define ADE7758_FREQ      0x10
+#define ADE7758_TEMP      0x11
+#define ADE7758_WFORM     0x12
+#define ADE7758_OPMODE    0x13
+#define ADE7758_MMODE     0x14
+#define ADE7758_WAVMODE   0x15
+#define ADE7758_COMPMODE  0x16
+#define ADE7758_LCYCMODE  0x17
+#define ADE7758_MASK      0x18
+#define ADE7758_STATUS    0x19
+#define ADE7758_RSTATUS   0x1A
+#define ADE7758_ZXTOUT    0x1B
+#define ADE7758_LINECYC   0x1C
+#define ADE7758_SAGCYC    0x1D
+#define ADE7758_SAGLVL    0x1E
+#define ADE7758_VPINTLVL  0x1F
+#define ADE7758_IPINTLVL  0x20
+#define ADE7758_VPEAK     0x21
+#define ADE7758_IPEAK     0x22
+#define ADE7758_GAIN      0x23
+#define ADE7758_AVRMSGAIN 0x24
+#define ADE7758_BVRMSGAIN 0x25
+#define ADE7758_CVRMSGAIN 0x26
+#define ADE7758_AIGAIN    0x27
+#define ADE7758_BIGAIN    0x28
+#define ADE7758_CIGAIN    0x29
+#define ADE7758_AWG       0x2A
+#define ADE7758_BWG       0x2B
+#define ADE7758_CWG       0x2C
+#define ADE7758_AVARG     0x2D
+#define ADE7758_BVARG     0x2E
+#define ADE7758_CVARG     0x2F
+#define ADE7758_AVAG      0x30
+#define ADE7758_BVAG      0x31
+#define ADE7758_CVAG      0x32
+#define ADE7758_AVRMSOS   0x33
+#define ADE7758_BVRMSOS   0x34
+#define ADE7758_CVRMSOS   0x35
+#define ADE7758_AIRMSOS   0x36
+#define ADE7758_BIRMSOS   0x37
+#define ADE7758_CIRMSOS   0x38
+#define ADE7758_AWAITOS   0x39
+#define ADE7758_BWAITOS   0x3A
+#define ADE7758_CWAITOS   0x3B
+#define ADE7758_AVAROS    0x3C
+#define ADE7758_BVAROS    0x3D
+#define ADE7758_CVAROS    0x3E
+#define ADE7758_APHCAL    0x3F
+#define ADE7758_BPHCAL    0x40
+#define ADE7758_CPHCAL    0x41
+#define ADE7758_WDIV      0x42
+#define ADE7758_VADIV     0x44
+#define ADE7758_VARDIV    0x43
+#define ADE7758_APCFNUM   0x45
+#define ADE7758_APCFDEN   0x46
+#define ADE7758_VARCFNUM  0x47
+#define ADE7758_VARCFDEN  0x48
+#define ADE7758_CHKSUM    0x7E
+#define ADE7758_VERSION   0x7F
+
+#define ADE7758_READ_REG(a)    a
+#define ADE7758_WRITE_REG(a) ((a) | 0x80)
+
+#define ADE7758_MAX_TX    8
+#define ADE7758_MAX_RX    4
+#define ADE7758_STARTUP_DELAY 1
+
+#define ADE7758_SPI_SLOW        (u32)(300 * 1000)
+#define ADE7758_SPI_BURST       (u32)(1000 * 1000)
+#define ADE7758_SPI_FAST        (u32)(2000 * 1000)
+
+#define DRIVER_NAME             "ade7758"
+
+/**
+ * struct ade7758_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct ade7758_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+#ifdef CONFIG_IIO_RING_BUFFER
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum ade7758_scan {
+        ADE7758_SCAN_WFORM,
+};
+
+void ade7758_remove_trigger(struct iio_dev *indio_dev);
+int ade7758_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t ade7758_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf);
+
+
+int ade7758_configure_ring(struct iio_dev *indio_dev);
+void ade7758_unconfigure_ring(struct iio_dev *indio_dev);
+
+int ade7758_initialize_ring(struct iio_ring_buffer *ring);
+void ade7758_uninitialize_ring(struct iio_ring_buffer *ring);
+int ade7758_set_irq(struct device *dev, bool enable);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void ade7758_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7758_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+ade7758_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return 0;
+}
+
+static int ade7758_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+static inline void ade7758_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7758_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+static inline void ade7758_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+
+#endif
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
new file mode 100644
index 000000000000..b7634cb7aa4f
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -0,0 +1,866 @@
+/*
+ * ADE7758 Polyphase Multifunction Energy Metering IC Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7758.h"
+
+int ade7758_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7758_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7758_spi_write_reg_24(struct device *dev,
+                u8 reg_address,
+                u32 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 16) & 0xFF;
+        st->tx[2] = (value >> 8) & 0xFF;
+        st->tx[3] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7758_spi_read_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_READ_REG(reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7758_spi_read_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 8) | st->rx[2];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7758_spi_read_reg_24(struct device *dev,
+                u8 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t ade7758_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7758_spi_read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7758_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7758_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7758_read_24bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7758_spi_read_reg_24(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val & 0xFFFFFF);
+}
+
+static ssize_t ade7758_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7758_spi_write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7758_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7758_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+int ade7758_reset(struct device *dev)
+{
+        int ret;
+        u8 val;
+        ade7758_spi_read_reg_8(dev,
+                        ADE7758_OPMODE,
+                        &val);
+        val |= 1 << 6; /* Software Chip Reset */
+        ret = ade7758_spi_write_reg_8(dev,
+                        ADE7758_OPMODE,
+                        val);
+
+        return ret;
+}
+
+static ssize_t ade7758_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7758_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_VPEAK);
+static IIO_DEV_ATTR_IPEAK(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_VPEAK);
+static IIO_DEV_ATTR_APHCAL(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_APHCAL);
+static IIO_DEV_ATTR_BPHCAL(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_BPHCAL);
+static IIO_DEV_ATTR_CPHCAL(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_CPHCAL);
+static IIO_DEV_ATTR_WDIV(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_WDIV);
+static IIO_DEV_ATTR_VADIV(S_IWUSR | S_IRUGO,
+                ade7758_read_8bit,
+                ade7758_write_8bit,
+                ADE7758_VADIV);
+static IIO_DEV_ATTR_AIRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_AIRMS);
+static IIO_DEV_ATTR_BIRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_BIRMS);
+static IIO_DEV_ATTR_CIRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_CIRMS);
+static IIO_DEV_ATTR_AVRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_AVRMS);
+static IIO_DEV_ATTR_BVRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_BVRMS);
+static IIO_DEV_ATTR_CVRMS(S_IRUGO,
+                ade7758_read_24bit,
+                NULL,
+                ADE7758_CVRMS);
+static IIO_DEV_ATTR_AIRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_AIRMSOS);
+static IIO_DEV_ATTR_BIRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_BIRMSOS);
+static IIO_DEV_ATTR_CIRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_CIRMSOS);
+static IIO_DEV_ATTR_AVRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_AVRMSOS);
+static IIO_DEV_ATTR_BVRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_BVRMSOS);
+static IIO_DEV_ATTR_CVRMSOS(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_CVRMSOS);
+static IIO_DEV_ATTR_AIGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_AIGAIN);
+static IIO_DEV_ATTR_BIGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_BIGAIN);
+static IIO_DEV_ATTR_CIGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_CIGAIN);
+static IIO_DEV_ATTR_AVRMSGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_AVRMSGAIN);
+static IIO_DEV_ATTR_BVRMSGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_BVRMSGAIN);
+static IIO_DEV_ATTR_CVRMSGAIN(S_IWUSR | S_IRUGO,
+                ade7758_read_16bit,
+                ade7758_write_16bit,
+                ADE7758_CVRMSGAIN);
+
+int ade7758_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u32 irqen;
+        ret = ade7758_spi_read_reg_24(dev, ADE7758_MASK, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 16; /* Enables an interrupt when a data is
+                                     present in the waveform register */
+        else
+                irqen &= ~(1 << 16);
+
+        ret = ade7758_spi_write_reg_24(dev, ADE7758_MASK, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+/* Power down the device */
+static int ade7758_stop_device(struct device *dev)
+{
+        int ret;
+        u8 val;
+        ade7758_spi_read_reg_8(dev,
+                        ADE7758_OPMODE,
+                        &val);
+        val |= 7 << 3;  /* ADE7758 powered down */
+        ret = ade7758_spi_write_reg_8(dev,
+                        ADE7758_OPMODE,
+                        val);
+
+        return ret;
+}
+
+static int ade7758_initial_setup(struct ade7758_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = ade7758_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7758_reset(dev);
+        msleep(ADE7758_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static ssize_t ade7758_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        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);
+
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t ade7758_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        unsigned long val;
+        int ret;
+        u8 reg, t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (26040 / val);
+        if (t > 0)
+                t >>= 1;
+
+        if (t > 1)
+                st->us->max_speed_hz = ADE7758_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADE7758_SPI_FAST;
+
+        ret = ade7758_spi_read_reg_8(dev,
+                        ADE7758_WAVMODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(5 << 3);
+        reg |= t << 5;
+
+        ret = ade7758_spi_write_reg_8(dev,
+                        ADE7758_WAVMODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ade7758_read_waveform_type(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u8 t;
+        ret = ade7758_spi_read_reg_8(dev,
+                        ADE7758_WAVMODE,
+                        &t);
+        if (ret)
+                return ret;
+
+        t = (t >> 2) & 0x7;
+
+        len = sprintf(buf, "%d\n", t);
+
+        return len;
+}
+
+static ssize_t ade7758_write_waveform_type(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        unsigned long val;
+        int ret;
+        u8 reg;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        if (val > 4)
+                return -EINVAL;
+
+        mutex_lock(&indio_dev->mlock);
+
+        ret = ade7758_spi_read_reg_8(dev,
+                        ADE7758_WAVMODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(7 << 2);
+        reg |= val << 2;
+
+        ret = ade7758_spi_write_reg_8(dev,
+                        ADE7758_WAVMODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEV_ATTR_TEMP_RAW(ade7758_read_8bit);
+static IIO_CONST_ATTR(temp_offset, "129 C");
+static IIO_CONST_ATTR(temp_scale, "4 C");
+
+static IIO_DEV_ATTR_AWATTHR(ade7758_read_16bit,
+                ADE7758_AWATTHR);
+static IIO_DEV_ATTR_BWATTHR(ade7758_read_16bit,
+                ADE7758_BWATTHR);
+static IIO_DEV_ATTR_CWATTHR(ade7758_read_16bit,
+                ADE7758_CWATTHR);
+static IIO_DEV_ATTR_AVARHR(ade7758_read_16bit,
+                ADE7758_AVARHR);
+static IIO_DEV_ATTR_BVARHR(ade7758_read_16bit,
+                ADE7758_BVARHR);
+static IIO_DEV_ATTR_CVARHR(ade7758_read_16bit,
+                ADE7758_CVARHR);
+static IIO_DEV_ATTR_AVAHR(ade7758_read_16bit,
+                ADE7758_AVAHR);
+static IIO_DEV_ATTR_BVAHR(ade7758_read_16bit,
+                ADE7758_BVAHR);
+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);
+
+/**
+ * IIO_DEV_ATTR_WAVEFORM_TYPE - set the type of waveform.
+ * @_mode: sysfs file mode/permissions
+ * @_show: output method for the attribute
+ * @_store: input method for the attribute
+ **/
+#define IIO_DEV_ATTR_WAVEFORM_TYPE(_mode, _show, _store)                        \
+        IIO_DEVICE_ATTR(waveform_type, _mode, _show, _store, 0)
+
+static IIO_DEV_ATTR_WAVEFORM_TYPE(S_IWUSR | S_IRUGO,
+                ade7758_read_waveform_type,
+                ade7758_write_waveform_type);
+
+static IIO_DEV_ATTR_RESET(ade7758_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26000 13000 65000 33000");
+
+static IIO_CONST_ATTR(name, "ade7758");
+
+static struct attribute *ade7758_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7758_event_attribute_group = {
+        .attrs = ade7758_event_attributes,
+};
+
+static struct attribute *ade7758_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_temp_scale.dev_attr.attr,
+        &iio_dev_attr_sampling_frequency.dev_attr.attr,
+        &iio_dev_attr_waveform_type.dev_attr.attr,
+        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_awatthr.dev_attr.attr,
+        &iio_dev_attr_bwatthr.dev_attr.attr,
+        &iio_dev_attr_cwatthr.dev_attr.attr,
+        &iio_dev_attr_avarhr.dev_attr.attr,
+        &iio_dev_attr_bvarhr.dev_attr.attr,
+        &iio_dev_attr_cvarhr.dev_attr.attr,
+        &iio_dev_attr_avahr.dev_attr.attr,
+        &iio_dev_attr_bvahr.dev_attr.attr,
+        &iio_dev_attr_cvahr.dev_attr.attr,
+        &iio_dev_attr_vpeak.dev_attr.attr,
+        &iio_dev_attr_ipeak.dev_attr.attr,
+        &iio_dev_attr_aphcal.dev_attr.attr,
+        &iio_dev_attr_bphcal.dev_attr.attr,
+        &iio_dev_attr_cphcal.dev_attr.attr,
+        &iio_dev_attr_wdiv.dev_attr.attr,
+        &iio_dev_attr_vadiv.dev_attr.attr,
+        &iio_dev_attr_airms.dev_attr.attr,
+        &iio_dev_attr_birms.dev_attr.attr,
+        &iio_dev_attr_cirms.dev_attr.attr,
+        &iio_dev_attr_avrms.dev_attr.attr,
+        &iio_dev_attr_bvrms.dev_attr.attr,
+        &iio_dev_attr_cvrms.dev_attr.attr,
+        &iio_dev_attr_aigain.dev_attr.attr,
+        &iio_dev_attr_bigain.dev_attr.attr,
+        &iio_dev_attr_cigain.dev_attr.attr,
+        &iio_dev_attr_avrmsgain.dev_attr.attr,
+        &iio_dev_attr_bvrmsgain.dev_attr.attr,
+        &iio_dev_attr_cvrmsgain.dev_attr.attr,
+        &iio_dev_attr_airmsos.dev_attr.attr,
+        &iio_dev_attr_birmsos.dev_attr.attr,
+        &iio_dev_attr_cirmsos.dev_attr.attr,
+        &iio_dev_attr_avrmsos.dev_attr.attr,
+        &iio_dev_attr_bvrmsos.dev_attr.attr,
+        &iio_dev_attr_cvrmsos.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7758_attribute_group = {
+        .attrs = ade7758_attributes,
+};
+
+
+
+static int __devinit ade7758_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct ade7758_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7758_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7758_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7758_event_attribute_group;
+        st->indio_dev->attrs = &ade7758_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7758_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7758_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7758");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7758_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = ade7758_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7758_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7758_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7758_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int ade7758_remove(struct spi_device *spi)
+{
+        int ret;
+        struct ade7758_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = ade7758_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        ade7758_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7758_uninitialize_ring(indio_dev->ring);
+        iio_device_unregister(indio_dev);
+        ade7758_unconfigure_ring(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver ade7758_driver = {
+        .driver = {
+                .name = "ade7758",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7758_probe,
+        .remove = __devexit_p(ade7758_remove),
+};
+
+static __init int ade7758_init(void)
+{
+        return spi_register_driver(&ade7758_driver);
+}
+module_init(ade7758_init);
+
+static __exit void ade7758_exit(void)
+{
+        spi_unregister_driver(&ade7758_driver);
+}
+module_exit(ade7758_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7758 Polyphase Multifunction Energy Metering IC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
new file mode 100644
index 000000000000..274b4a07808c
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -0,0 +1,212 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/workqueue.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../ring_sw.h"
+#include "../accel/accel.h"
+#include "../trigger.h"
+#include "ade7758.h"
+
+/**
+ * combine_8_to_32() utility function to munge to u8s into u32
+ **/
+static inline u32 combine_8_to_32(u8 lower, u8 mid, u8 upper)
+{
+        u32 _lower = lower;
+        u32 _mid = mid;
+        u32 _upper = upper;
+
+        return _lower | (_mid << 8) | (_upper << 16);
+}
+
+static IIO_SCAN_EL_C(wform, ADE7758_SCAN_WFORM, ADE7758_WFORM, NULL);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(wform, s, 24, 32);
+static IIO_SCAN_EL_TIMESTAMP(1);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
+
+static struct attribute *ade7758_scan_el_attrs[] = {
+        &iio_scan_el_wform.dev_attr.attr,
+        &iio_const_attr_wform_index.dev_attr.attr,
+        &iio_const_attr_wform_type.dev_attr.attr,
+        &iio_scan_el_timestamp.dev_attr.attr,
+        &iio_const_attr_timestamp_index.dev_attr.attr,
+        &iio_const_attr_timestamp_type.dev_attr.attr,
+        NULL,
+};
+
+static struct attribute_group ade7758_scan_el_group = {
+        .attrs = ade7758_scan_el_attrs,
+        .name = "scan_elements",
+};
+
+/**
+ * ade7758_poll_func_th() top half interrupt handler called by trigger
+ * @private_data:       iio_dev
+ **/
+static void ade7758_poll_func_th(struct iio_dev *indio_dev, s64 time)
+{
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        st->last_timestamp = time;
+        schedule_work(&st->work_trigger_to_ring);
+        /* Indicate that this interrupt is being handled */
+
+        /* Technically this is trigger related, but without this
+         * handler running there is currently no way for the interrupt
+         * to clear.
+         */
+}
+
+/**
+ * ade7758_spi_read_burst() - read all data registers
+ * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @rx: somewhere to pass back the value read (min size is 24 bytes)
+ **/
+static int ade7758_spi_read_burst(struct device *dev, u8 *rx)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                }, {
+                        .tx_buf = st->tx + 4,
+                        .rx_buf = rx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7758_READ_REG(ADE7758_RSTATUS);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+        st->tx[3] = 0;
+        st->tx[4] = ADE7758_READ_REG(ADE7758_WFORM);
+        st->tx[5] = 0;
+        st->tx[6] = 0;
+        st->tx[7] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfers[0], &msg);
+        spi_message_add_tail(&xfers[1], &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret)
+                dev_err(&st->us->dev, "problem when reading WFORM value\n");
+
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
+ * specific to be rolled into the core.
+ */
+static void ade7758_trigger_bh_to_ring(struct work_struct *work_s)
+{
+        struct ade7758_state *st
+                = container_of(work_s, struct ade7758_state,
+                               work_trigger_to_ring);
+        struct iio_ring_buffer *ring = st->indio_dev->ring;
+
+        int i = 0;
+        s32 *data;
+        size_t datasize = ring->access.get_bytes_per_datum(ring);
+
+        data = kmalloc(datasize, GFP_KERNEL);
+        if (data == NULL) {
+                dev_err(&st->us->dev, "memory alloc failed in ring bh");
+                return;
+        }
+
+        if (ring->scan_count)
+                if (ade7758_spi_read_burst(&st->indio_dev->dev, st->rx) >= 0)
+                        for (; i < ring->scan_count; i++)
+                                data[i] = combine_8_to_32(st->rx[i*2+2],
+                                                st->rx[i*2+1],
+                                                st->rx[i*2]);
+
+        /* Guaranteed to be aligned with 8 byte boundary */
+        if (ring->scan_timestamp)
+                *((s64 *)
+                (((u32)data + 4 * ring->scan_count + 4) & ~0x7)) =
+                        st->last_timestamp;
+
+        ring->access.store_to(ring,
+                              (u8 *)data,
+                              st->last_timestamp);
+
+        iio_trigger_notify_done(st->indio_dev->trig);
+        kfree(data);
+
+        return;
+}
+
+void ade7758_unconfigure_ring(struct iio_dev *indio_dev)
+{
+        kfree(indio_dev->pollfunc);
+        iio_sw_rb_free(indio_dev->ring);
+}
+
+int ade7758_configure_ring(struct iio_dev *indio_dev)
+{
+        int ret = 0;
+        struct ade7758_state *st = indio_dev->dev_data;
+        struct iio_ring_buffer *ring;
+        INIT_WORK(&st->work_trigger_to_ring, ade7758_trigger_bh_to_ring);
+
+        ring = iio_sw_rb_allocate(indio_dev);
+        if (!ring) {
+                ret = -ENOMEM;
+                return ret;
+        }
+        indio_dev->ring = ring;
+        /* Effectively select the ring buffer implementation */
+        iio_ring_sw_register_funcs(&ring->access);
+        ring->bpe = 4;
+        ring->scan_el_attrs = &ade7758_scan_el_group;
+        ring->scan_timestamp = true;
+        ring->preenable = &iio_sw_ring_preenable;
+        ring->postenable = &iio_triggered_ring_postenable;
+        ring->predisable = &iio_triggered_ring_predisable;
+        ring->owner = THIS_MODULE;
+
+        /* Set default scan mode */
+        iio_scan_mask_set(ring, iio_scan_el_wform.number);
+
+        ret = iio_alloc_pollfunc(indio_dev, NULL, &ade7758_poll_func_th);
+        if (ret)
+                goto error_iio_sw_rb_free;
+
+        indio_dev->modes |= INDIO_RING_TRIGGERED;
+        return 0;
+
+error_iio_sw_rb_free:
+        iio_sw_rb_free(indio_dev->ring);
+        return ret;
+}
+
+int ade7758_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return iio_ring_buffer_register(ring, 0);
+}
+
+void ade7758_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+        iio_ring_buffer_unregister(ring);
+}
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c
new file mode 100644
index 000000000000..60abca0c28ff
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7758_trigger.c
@@ -0,0 +1,125 @@
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+#include <linux/spi/spi.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../trigger.h"
+#include "ade7758.h"
+
+/**
+ * ade7758_data_rdy_trig_poll() the event handler for the data rdy trig
+ **/
+static int ade7758_data_rdy_trig_poll(struct iio_dev *dev_info,
+                                       int index,
+                                       s64 timestamp,
+                                       int no_test)
+{
+        struct ade7758_state *st = iio_dev_get_devdata(dev_info);
+        struct iio_trigger *trig = st->trig;
+
+        iio_trigger_poll(trig, timestamp);
+
+        return IRQ_HANDLED;
+}
+
+IIO_EVENT_SH(data_rdy_trig, &ade7758_data_rdy_trig_poll);
+
+static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+
+static struct attribute *ade7758_trigger_attrs[] = {
+        &dev_attr_name.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7758_trigger_attr_group = {
+        .attrs = ade7758_trigger_attrs,
+};
+
+/**
+ * ade7758_data_rdy_trigger_set_state() set datardy interrupt state
+ **/
+static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig,
+                                                bool state)
+{
+        struct ade7758_state *st = trig->private_data;
+        struct iio_dev *indio_dev = st->indio_dev;
+        int ret = 0;
+
+        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
+        ret = ade7758_set_irq(&st->indio_dev->dev, state);
+        if (state == false) {
+                iio_remove_event_from_list(&iio_event_data_rdy_trig,
+                                           &indio_dev->interrupts[0]
+                                           ->ev_list);
+                /* possible quirk with handler currently worked around
+                   by ensuring the work queue is empty */
+                flush_scheduled_work();
+        } else {
+                iio_add_event_to_list(&iio_event_data_rdy_trig,
+                                      &indio_dev->interrupts[0]->ev_list);
+        }
+        return ret;
+}
+
+/**
+ * ade7758_trig_try_reen() try renabling irq for data rdy trigger
+ * @trig:       the datardy trigger
+ **/
+static int ade7758_trig_try_reen(struct iio_trigger *trig)
+{
+        struct ade7758_state *st = trig->private_data;
+        enable_irq(st->us->irq);
+        /* irq reenabled so success! */
+        return 0;
+}
+
+int ade7758_probe_trigger(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct ade7758_state *st = indio_dev->dev_data;
+
+        st->trig = iio_allocate_trigger();
+        st->trig->name = kasprintf(GFP_KERNEL,
+                                "ade7758-dev%d",
+                                indio_dev->id);
+        if (!st->trig->name) {
+                ret = -ENOMEM;
+                goto error_free_trig;
+        }
+        st->trig->dev.parent = &st->us->dev;
+        st->trig->owner = THIS_MODULE;
+        st->trig->private_data = st;
+        st->trig->set_trigger_state = &ade7758_data_rdy_trigger_set_state;
+        st->trig->try_reenable = &ade7758_trig_try_reen;
+        st->trig->control_attrs = &ade7758_trigger_attr_group;
+        ret = iio_trigger_register(st->trig);
+
+        /* select default trigger */
+        indio_dev->trig = st->trig;
+        if (ret)
+                goto error_free_trig_name;
+
+        return 0;
+
+error_free_trig_name:
+        kfree(st->trig->name);
+error_free_trig:
+        iio_free_trigger(st->trig);
+
+        return ret;
+}
+
+void ade7758_remove_trigger(struct iio_dev *indio_dev)
+{
+        struct ade7758_state *state = indio_dev->dev_data;
+
+        iio_trigger_unregister(state->trig);
+        kfree(state->trig->name);
+        iio_free_trigger(state->trig);
+}
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
new file mode 100644
index 000000000000..fafc3c1e5aaa
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -0,0 +1,670 @@
+/*
+ * ADE7759 Active Energy Metering IC with di/dt Sensor Interface Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7759.h"
+
+int ade7759_spi_write_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 val)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7759_WRITE_REG(reg_address);
+        st->tx[1] = val;
+
+        ret = spi_write(st->us, st->tx, 2);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7759_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7759_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7759_spi_read_reg_8(struct device *dev,
+                u8 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 2,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7759_READ_REG(reg_address);
+        st->tx[1] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[1];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7759_spi_read_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 3,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7759_READ_REG(reg_address);
+        st->tx[1] = 0;
+        st->tx[2] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[1] << 8) | st->rx[2];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7759_spi_read_reg_40(struct device *dev,
+                u8 reg_address,
+                u64 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .rx_buf = st->rx,
+                        .bits_per_word = 8,
+                        .len = 6,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7759_READ_REG(reg_address);
+        memset(&st->tx[1], 0 , 5);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->us, &msg);
+        if (ret) {
+                dev_err(&st->us->dev, "problem when reading 40 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = ((u64)st->rx[1] << 32) | (st->rx[2] << 24) |
+                (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static ssize_t ade7759_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7759_spi_read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7759_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7759_spi_read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7759_read_40bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u64 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = ade7759_spi_read_reg_40(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%llu\n", val);
+}
+
+static ssize_t ade7759_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7759_spi_write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7759_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = ade7759_spi_write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int ade7759_reset(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7759_spi_read_reg_16(dev,
+                        ADE7759_MODE,
+                        &val);
+        val |= 1 << 6; /* Software Chip Reset */
+        ret = ade7759_spi_write_reg_16(dev,
+                        ADE7759_MODE,
+                        val);
+
+        return ret;
+}
+
+static ssize_t ade7759_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7759_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_AENERGY(ade7759_read_40bit, ADE7759_AENERGY);
+static IIO_DEV_ATTR_CFDEN(S_IWUSR | S_IRUGO,
+                ade7759_read_16bit,
+                ade7759_write_16bit,
+                ADE7759_CFDEN);
+static IIO_DEV_ATTR_CFNUM(S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_CFNUM);
+static IIO_DEV_ATTR_CHKSUM(ade7759_read_8bit, ADE7759_CHKSUM);
+static IIO_DEV_ATTR_PHCAL(S_IWUSR | S_IRUGO,
+                ade7759_read_16bit,
+                ade7759_write_16bit,
+                ADE7759_PHCAL);
+static IIO_DEV_ATTR_APOS(S_IWUSR | S_IRUGO,
+                ade7759_read_16bit,
+                ade7759_write_16bit,
+                ADE7759_APOS);
+static IIO_DEV_ATTR_SAGCYC(S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_SAGCYC);
+static IIO_DEV_ATTR_SAGLVL(S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_SAGLVL);
+static IIO_DEV_ATTR_LINECYC(S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_LINECYC);
+static IIO_DEV_ATTR_LENERGY(ade7759_read_40bit, ADE7759_LENERGY);
+static IIO_DEV_ATTR_PGA_GAIN(S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_GAIN);
+static IIO_DEV_ATTR_ACTIVE_POWER_GAIN(S_IWUSR | S_IRUGO,
+                ade7759_read_16bit,
+                ade7759_write_16bit,
+                ADE7759_APGAIN);
+static IIO_DEV_ATTR_CH_OFF(1, S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_CH1OS);
+static IIO_DEV_ATTR_CH_OFF(2, S_IWUSR | S_IRUGO,
+                ade7759_read_8bit,
+                ade7759_write_8bit,
+                ADE7759_CH2OS);
+
+static int ade7759_set_irq(struct device *dev, bool enable)
+{
+        int ret;
+        u8 irqen;
+        ret = ade7759_spi_read_reg_8(dev, ADE7759_IRQEN, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 3; /* Enables an interrupt when a data is
+                                    present in the waveform register */
+        else
+                irqen &= ~(1 << 3);
+
+        ret = ade7759_spi_write_reg_8(dev, ADE7759_IRQEN, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+/* Power down the device */
+int ade7759_stop_device(struct device *dev)
+{
+        int ret;
+        u16 val;
+        ade7759_spi_read_reg_16(dev,
+                        ADE7759_MODE,
+                        &val);
+        val |= 1 << 4;  /* AD converters can be turned off */
+        ret = ade7759_spi_write_reg_16(dev,
+                        ADE7759_MODE,
+                        val);
+
+        return ret;
+}
+
+static int ade7759_initial_setup(struct ade7759_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* use low spi speed for init */
+        st->us->mode = SPI_MODE_3;
+        spi_setup(st->us);
+
+        /* Disable IRQ */
+        ret = ade7759_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7759_reset(dev);
+        msleep(ADE7759_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static ssize_t ade7759_read_frequency(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret, len = 0;
+        u16 t;
+        int sps;
+        ret = ade7759_spi_read_reg_16(dev,
+                        ADE7759_MODE,
+                        &t);
+        if (ret)
+                return ret;
+
+        t = (t >> 3) & 0x3;
+        sps = 27900 / (1 + t);
+
+        len = sprintf(buf, "%d SPS\n", sps);
+        return len;
+}
+
+static ssize_t ade7759_write_frequency(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
+        unsigned long val;
+        int ret;
+        u16 reg, t;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        t = (27900 / val);
+        if (t > 0)
+                t--;
+
+        if (t > 1)
+                st->us->max_speed_hz = ADE7759_SPI_SLOW;
+        else
+                st->us->max_speed_hz = ADE7759_SPI_FAST;
+
+        ret = ade7759_spi_read_reg_16(dev,
+                        ADE7759_MODE,
+                        &reg);
+        if (ret)
+                goto out;
+
+        reg &= ~(3 << 13);
+        reg |= t << 13;
+
+        ret = ade7759_spi_write_reg_16(dev,
+                        ADE7759_MODE,
+                        reg);
+
+out:
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+static IIO_DEV_ATTR_TEMP_RAW(ade7759_read_8bit);
+static IIO_CONST_ATTR(temp_offset, "70 C");
+static IIO_CONST_ATTR(temp_scale, "1 C");
+
+static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
+                ade7759_read_frequency,
+                ade7759_write_frequency);
+
+static IIO_DEV_ATTR_RESET(ade7759_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500");
+
+static IIO_CONST_ATTR(name, "ade7759");
+
+static struct attribute *ade7759_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7759_event_attribute_group = {
+        .attrs = ade7759_event_attributes,
+};
+
+static struct attribute *ade7759_attributes[] = {
+        &iio_dev_attr_temp_raw.dev_attr.attr,
+        &iio_const_attr_temp_offset.dev_attr.attr,
+        &iio_const_attr_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_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_phcal.dev_attr.attr,
+        &iio_dev_attr_cfden.dev_attr.attr,
+        &iio_dev_attr_aenergy.dev_attr.attr,
+        &iio_dev_attr_cfnum.dev_attr.attr,
+        &iio_dev_attr_apos.dev_attr.attr,
+        &iio_dev_attr_sagcyc.dev_attr.attr,
+        &iio_dev_attr_saglvl.dev_attr.attr,
+        &iio_dev_attr_linecyc.dev_attr.attr,
+        &iio_dev_attr_lenergy.dev_attr.attr,
+        &iio_dev_attr_chksum.dev_attr.attr,
+        &iio_dev_attr_pga_gain.dev_attr.attr,
+        &iio_dev_attr_active_power_gain.dev_attr.attr,
+        &iio_dev_attr_choff_1.dev_attr.attr,
+        &iio_dev_attr_choff_2.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7759_attribute_group = {
+        .attrs = ade7759_attributes,
+};
+
+static int __devinit ade7759_probe(struct spi_device *spi)
+{
+        int ret, regdone = 0;
+        struct ade7759_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                goto error_ret;
+        }
+        /* this is only used for removal purposes */
+        spi_set_drvdata(spi, st);
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7759_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7759_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        st->us = spi;
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = &spi->dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7759_event_attribute_group;
+        st->indio_dev->attrs = &ade7759_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7759_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7759_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (spi->irq) {
+                ret = iio_register_interrupt_line(spi->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7759");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7759_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+
+        /* Get the device into a sane initial state */
+        ret = ade7759_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7759_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7759_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7759_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+/* fixme, confirm ordering in this function */
+static int ade7759_remove(struct spi_device *spi)
+{
+        int ret;
+        struct ade7759_state *st = spi_get_drvdata(spi);
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        ret = ade7759_stop_device(&(indio_dev->dev));
+        if (ret)
+                goto err_ret;
+
+        flush_scheduled_work();
+
+        ade7759_remove_trigger(indio_dev);
+        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7759_uninitialize_ring(indio_dev->ring);
+        ade7759_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+
+err_ret:
+        return ret;
+}
+
+static struct spi_driver ade7759_driver = {
+        .driver = {
+                .name = "ade7759",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7759_probe,
+        .remove = __devexit_p(ade7759_remove),
+};
+
+static __init int ade7759_init(void)
+{
+        return spi_register_driver(&ade7759_driver);
+}
+module_init(ade7759_init);
+
+static __exit void ade7759_exit(void)
+{
+        spi_unregister_driver(&ade7759_driver);
+}
+module_exit(ade7759_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7759 Active Energy Metering IC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7759.h b/drivers/staging/iio/meter/ade7759.h
new file mode 100644
index 000000000000..813dea2676a9
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7759.h
@@ -0,0 +1,122 @@
+#ifndef _ADE7759_H
+#define _ADE7759_H
+
+#define ADE7759_WAVEFORM  0x01
+#define ADE7759_AENERGY   0x02
+#define ADE7759_RSTENERGY 0x03
+#define ADE7759_STATUS    0x04
+#define ADE7759_RSTSTATUS 0x05
+#define ADE7759_MODE      0x06
+#define ADE7759_CFDEN     0x07
+#define ADE7759_CH1OS     0x08
+#define ADE7759_CH2OS     0x09
+#define ADE7759_GAIN      0x0A
+#define ADE7759_APGAIN    0x0B
+#define ADE7759_PHCAL     0x0C
+#define ADE7759_APOS      0x0D
+#define ADE7759_ZXTOUT    0x0E
+#define ADE7759_SAGCYC    0x0F
+#define ADE7759_IRQEN     0x10
+#define ADE7759_SAGLVL    0x11
+#define ADE7759_TEMP      0x12
+#define ADE7759_LINECYC   0x13
+#define ADE7759_LENERGY   0x14
+#define ADE7759_CFNUM     0x15
+#define ADE7759_CHKSUM    0x1E
+#define ADE7759_DIEREV    0x1F
+
+#define ADE7759_READ_REG(a)    a
+#define ADE7759_WRITE_REG(a) ((a) | 0x80)
+
+#define ADE7759_MAX_TX    6
+#define ADE7759_MAX_RX    6
+#define ADE7759_STARTUP_DELAY 1
+
+#define ADE7759_SPI_SLOW        (u32)(300 * 1000)
+#define ADE7759_SPI_BURST       (u32)(1000 * 1000)
+#define ADE7759_SPI_FAST        (u32)(2000 * 1000)
+
+#define DRIVER_NAME             "ade7759"
+
+/**
+ * struct ade7759_state - device instance specific data
+ * @us:                 actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct ade7759_state {
+        struct spi_device               *us;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        struct mutex                    buf_lock;
+};
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum ade7759_scan {
+        ADE7759_SCAN_ACTIVE_POWER,
+        ADE7759_SCAN_CH1_CH2,
+        ADE7759_SCAN_CH1,
+        ADE7759_SCAN_CH2,
+};
+
+void ade7759_remove_trigger(struct iio_dev *indio_dev);
+int ade7759_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t ade7759_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf);
+
+
+int ade7759_configure_ring(struct iio_dev *indio_dev);
+void ade7759_unconfigure_ring(struct iio_dev *indio_dev);
+
+int ade7759_initialize_ring(struct iio_ring_buffer *ring);
+void ade7759_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void ade7759_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7759_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+ade7759_read_data_from_ring(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        return 0;
+}
+
+static int ade7759_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+static inline void ade7759_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7759_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+static inline void ade7759_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+
+#endif
diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c
new file mode 100644
index 000000000000..4578e7b7f460
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7854-i2c.c
@@ -0,0 +1,272 @@
+/*
+ * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver (I2C Bus)
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+
+#include "../iio.h"
+#include "ade7854.h"
+
+static int ade7854_i2c_write_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 value)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+        st->tx[2] = value;
+
+        ret = i2c_master_send(st->i2c, st->tx, 3);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_i2c_write_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 value)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+        st->tx[2] = (value >> 8) & 0xFF;
+        st->tx[3] = value & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 4);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_i2c_write_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+        st->tx[2] = (value >> 16) & 0xFF;
+        st->tx[3] = (value >> 8) & 0xFF;
+        st->tx[4] = value & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 5);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_i2c_write_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+        st->tx[2] = (value >> 24) & 0xFF;
+        st->tx[3] = (value >> 16) & 0xFF;
+        st->tx[4] = (value >> 8) & 0xFF;
+        st->tx[5] = value & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 6);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_i2c_read_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 *val)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 2);
+        if (ret)
+                goto out;
+
+        ret = i2c_master_recv(st->i2c, st->rx, 1);
+        if (ret)
+                goto out;
+
+        *val = st->rx[0];
+out:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_i2c_read_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 *val)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 2);
+        if (ret)
+                goto out;
+
+        ret = i2c_master_recv(st->i2c, st->rx, 2);
+        if (ret)
+                goto out;
+
+        *val = (st->rx[0] << 8) | st->rx[1];
+out:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_i2c_read_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 2);
+        if (ret)
+                goto out;
+
+        ret = i2c_master_recv(st->i2c, st->rx, 3);
+        if (ret)
+                goto out;
+
+        *val = (st->rx[0] << 16) | (st->rx[1] << 8) | st->rx[2];
+out:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_i2c_read_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = (reg_address >> 8) & 0xFF;
+        st->tx[1] = reg_address & 0xFF;
+
+        ret = i2c_master_send(st->i2c, st->tx, 2);
+        if (ret)
+                goto out;
+
+        ret = i2c_master_recv(st->i2c, st->rx, 3);
+        if (ret)
+                goto out;
+
+        *val = (st->rx[0] << 24) | (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
+out:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int __devinit ade7854_i2c_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        int ret;
+        struct ade7854_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                return ret;
+        }
+
+        i2c_set_clientdata(client, st);
+        st->read_reg_8 = ade7854_i2c_read_reg_8;
+        st->read_reg_16 = ade7854_i2c_read_reg_16;
+        st->read_reg_24 = ade7854_i2c_read_reg_24;
+        st->read_reg_32 = ade7854_i2c_read_reg_32;
+        st->write_reg_8 = ade7854_i2c_write_reg_8;
+        st->write_reg_16 = ade7854_i2c_write_reg_16;
+        st->write_reg_24 = ade7854_i2c_write_reg_24;
+        st->write_reg_32 = ade7854_i2c_write_reg_32;
+        st->i2c = client;
+        st->irq = client->irq;
+
+        ret = ade7854_probe(st, &client->dev);
+        if (ret) {
+                kfree(st);
+                return ret;
+        }
+
+        return ret;
+}
+
+static int __devexit ade7854_i2c_remove(struct i2c_client *client)
+{
+        return ade7854_remove(i2c_get_clientdata(client));
+}
+
+static const struct i2c_device_id ade7854_id[] = {
+        { "ade7854", 0 },
+        { "ade7858", 0 },
+        { "ade7868", 0 },
+        { "ade7878", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ade7854_id);
+
+static struct i2c_driver ade7854_i2c_driver = {
+        .driver = {
+                .name = "ade7854",
+        },
+        .probe    = ade7854_i2c_probe,
+        .remove   = __devexit_p(ade7854_i2c_remove),
+        .id_table = ade7854_id,
+};
+
+static __init int ade7854_i2c_init(void)
+{
+        return i2c_add_driver(&ade7854_i2c_driver);
+}
+module_init(ade7854_i2c_init);
+
+static __exit void ade7854_i2c_exit(void)
+{
+        i2c_del_driver(&ade7854_i2c_driver);
+}
+module_exit(ade7854_i2c_exit);
+
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC I2C Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
new file mode 100644
index 000000000000..fe58103ed4ca
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -0,0 +1,360 @@
+/*
+ * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver (SPI Bus)
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+
+#include "../iio.h"
+#include "ade7854.h"
+
+static int ade7854_spi_write_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 5,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 8) & 0xFF;
+        st->tx[4] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 6,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 16) & 0xFF;
+        st->tx[4] = (value >> 8) & 0xFF;
+        st->tx[5] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 7,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 24) & 0xFF;
+        st->tx[4] = (value >> 16) & 0xFF;
+        st->tx[5] = (value >> 8) & 0xFF;
+        st->tx[6] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_read_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 5,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 8) | st->rx[4];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 6,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+        st->tx[5] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 7,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+        st->tx[5] = 0;
+        st->tx[6] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 32 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 24) | (st->rx[4] << 16) | (st->rx[5] << 8) | st->rx[6];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int __devinit ade7854_spi_probe(struct spi_device *spi)
+{
+        int ret;
+        struct ade7854_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                return ret;
+        }
+
+        spi_set_drvdata(spi, st);
+        st->read_reg_8 = ade7854_spi_read_reg_8;
+        st->read_reg_16 = ade7854_spi_read_reg_16;
+        st->read_reg_24 = ade7854_spi_read_reg_24;
+        st->read_reg_32 = ade7854_spi_read_reg_32;
+        st->write_reg_8 = ade7854_spi_write_reg_8;
+        st->write_reg_16 = ade7854_spi_write_reg_16;
+        st->write_reg_24 = ade7854_spi_write_reg_24;
+        st->write_reg_32 = ade7854_spi_write_reg_32;
+        st->irq = spi->irq;
+        st->spi = spi;
+
+        ret = ade7854_probe(st, &spi->dev);
+        if (ret) {
+                kfree(st);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int ade7854_spi_remove(struct spi_device *spi)
+{
+        ade7854_remove(spi_get_drvdata(spi));
+
+        return 0;
+}
+
+static struct spi_driver ade7854_driver = {
+        .driver = {
+                .name = "ade7854",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7854_spi_probe,
+        .remove = __devexit_p(ade7854_spi_remove),
+};
+
+static __init int ade7854_init(void)
+{
+        return spi_register_driver(&ade7854_driver);
+}
+module_init(ade7854_init);
+
+static __exit void ade7854_exit(void)
+{
+        spi_unregister_driver(&ade7854_driver);
+}
+module_exit(ade7854_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC SPI Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
new file mode 100644
index 000000000000..a13d5048cf42
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7854.c
@@ -0,0 +1,680 @@
+/*
+ * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/list.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "meter.h"
+#include "ade7854.h"
+
+static ssize_t ade7854_read_8bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u8 val = 0;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = st->read_reg_8(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7854_read_16bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u16 val = 0;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = st->read_reg_16(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7854_read_24bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+
+        ret = st->read_reg_24(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val & 0xFFFFFF);
+}
+
+static ssize_t ade7854_read_32bit(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int ret;
+        u32 val = 0;
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        ret = st->read_reg_32(dev, this_attr->address, &val);
+        if (ret)
+                return ret;
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t ade7854_write_8bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = st->write_reg_8(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7854_write_16bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = st->write_reg_16(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7854_write_24bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = st->write_reg_24(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static ssize_t ade7854_write_32bit(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf,
+                size_t len)
+{
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        long val;
+
+        ret = strict_strtol(buf, 10, &val);
+        if (ret)
+                goto error_ret;
+        ret = st->write_reg_32(dev, this_attr->address, val);
+
+error_ret:
+        return ret ? ret : len;
+}
+
+static int ade7854_reset(struct device *dev)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        u16 val;
+
+        st->read_reg_16(dev, ADE7854_CONFIG, &val);
+        val |= 1 << 7; /* Software Chip Reset */
+        ret = st->write_reg_16(dev, ADE7854_CONFIG, val);
+
+        return ret;
+}
+
+
+static ssize_t ade7854_write_reset(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        if (len < 1)
+                return -1;
+        switch (buf[0]) {
+        case '1':
+        case 'y':
+        case 'Y':
+                return ade7854_reset(dev);
+        }
+        return -1;
+}
+
+static IIO_DEV_ATTR_AIGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AIGAIN);
+static IIO_DEV_ATTR_BIGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BIGAIN);
+static IIO_DEV_ATTR_CIGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CIGAIN);
+static IIO_DEV_ATTR_NIGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_NIGAIN);
+static IIO_DEV_ATTR_AVGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AVGAIN);
+static IIO_DEV_ATTR_BVGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BVGAIN);
+static IIO_DEV_ATTR_CVGAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CVGAIN);
+static IIO_DEV_ATTR_APPARENT_POWER_A_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AVAGAIN);
+static IIO_DEV_ATTR_APPARENT_POWER_B_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BVAGAIN);
+static IIO_DEV_ATTR_APPARENT_POWER_C_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CVAGAIN);
+static IIO_DEV_ATTR_ACTIVE_POWER_A_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AWATTOS);
+static IIO_DEV_ATTR_ACTIVE_POWER_B_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BWATTOS);
+static IIO_DEV_ATTR_ACTIVE_POWER_C_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CWATTOS);
+static IIO_DEV_ATTR_REACTIVE_POWER_A_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AVARGAIN);
+static IIO_DEV_ATTR_REACTIVE_POWER_B_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BVARGAIN);
+static IIO_DEV_ATTR_REACTIVE_POWER_C_GAIN(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CVARGAIN);
+static IIO_DEV_ATTR_REACTIVE_POWER_A_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_AVAROS);
+static IIO_DEV_ATTR_REACTIVE_POWER_B_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_BVAROS);
+static IIO_DEV_ATTR_REACTIVE_POWER_C_OFFSET(S_IWUSR | S_IRUGO,
+                ade7854_read_24bit,
+                ade7854_write_24bit,
+                ADE7854_CVAROS);
+static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO,
+                ade7854_read_32bit,
+                ade7854_write_32bit,
+                ADE7854_VPEAK);
+static IIO_DEV_ATTR_IPEAK(S_IWUSR | S_IRUGO,
+                ade7854_read_32bit,
+                ade7854_write_32bit,
+                ADE7854_VPEAK);
+static IIO_DEV_ATTR_APHCAL(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_APHCAL);
+static IIO_DEV_ATTR_BPHCAL(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_BPHCAL);
+static IIO_DEV_ATTR_CPHCAL(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CPHCAL);
+static IIO_DEV_ATTR_CF1DEN(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CF1DEN);
+static IIO_DEV_ATTR_CF2DEN(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CF2DEN);
+static IIO_DEV_ATTR_CF3DEN(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CF3DEN);
+static IIO_DEV_ATTR_LINECYC(S_IWUSR | S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_LINECYC);
+static IIO_DEV_ATTR_SAGCYC(S_IWUSR | S_IRUGO,
+                ade7854_read_8bit,
+                ade7854_write_8bit,
+                ADE7854_SAGCYC);
+static IIO_DEV_ATTR_CFCYC(S_IWUSR | S_IRUGO,
+                ade7854_read_8bit,
+                ade7854_write_8bit,
+                ADE7854_CFCYC);
+static IIO_DEV_ATTR_PEAKCYC(S_IWUSR | S_IRUGO,
+                ade7854_read_8bit,
+                ade7854_write_8bit,
+                ADE7854_PEAKCYC);
+static IIO_DEV_ATTR_CHKSUM(ade7854_read_24bit,
+                ADE7854_CHECKSUM);
+static IIO_DEV_ATTR_ANGLE0(ade7854_read_24bit,
+                ADE7854_ANGLE0);
+static IIO_DEV_ATTR_ANGLE1(ade7854_read_24bit,
+                ADE7854_ANGLE1);
+static IIO_DEV_ATTR_ANGLE2(ade7854_read_24bit,
+                ADE7854_ANGLE2);
+static IIO_DEV_ATTR_AIRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_AIRMS);
+static IIO_DEV_ATTR_BIRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_BIRMS);
+static IIO_DEV_ATTR_CIRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_CIRMS);
+static IIO_DEV_ATTR_NIRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_NIRMS);
+static IIO_DEV_ATTR_AVRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_AVRMS);
+static IIO_DEV_ATTR_BVRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_BVRMS);
+static IIO_DEV_ATTR_CVRMS(S_IRUGO,
+                ade7854_read_24bit,
+                NULL,
+                ADE7854_CVRMS);
+static IIO_DEV_ATTR_AIRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_AIRMSOS);
+static IIO_DEV_ATTR_BIRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_BIRMSOS);
+static IIO_DEV_ATTR_CIRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CIRMSOS);
+static IIO_DEV_ATTR_AVRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_AVRMSOS);
+static IIO_DEV_ATTR_BVRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_BVRMSOS);
+static IIO_DEV_ATTR_CVRMSOS(S_IRUGO,
+                ade7854_read_16bit,
+                ade7854_write_16bit,
+                ADE7854_CVRMSOS);
+static IIO_DEV_ATTR_VOLT_A(ade7854_read_24bit,
+                ADE7854_VAWV);
+static IIO_DEV_ATTR_VOLT_B(ade7854_read_24bit,
+                ADE7854_VBWV);
+static IIO_DEV_ATTR_VOLT_C(ade7854_read_24bit,
+                ADE7854_VCWV);
+static IIO_DEV_ATTR_CURRENT_A(ade7854_read_24bit,
+                ADE7854_IAWV);
+static IIO_DEV_ATTR_CURRENT_B(ade7854_read_24bit,
+                ADE7854_IBWV);
+static IIO_DEV_ATTR_CURRENT_C(ade7854_read_24bit,
+                ADE7854_ICWV);
+static IIO_DEV_ATTR_AWATTHR(ade7854_read_32bit,
+                ADE7854_AWATTHR);
+static IIO_DEV_ATTR_BWATTHR(ade7854_read_32bit,
+                ADE7854_BWATTHR);
+static IIO_DEV_ATTR_CWATTHR(ade7854_read_32bit,
+                ADE7854_CWATTHR);
+static IIO_DEV_ATTR_AFWATTHR(ade7854_read_32bit,
+                ADE7854_AFWATTHR);
+static IIO_DEV_ATTR_BFWATTHR(ade7854_read_32bit,
+                ADE7854_BFWATTHR);
+static IIO_DEV_ATTR_CFWATTHR(ade7854_read_32bit,
+                ADE7854_CFWATTHR);
+static IIO_DEV_ATTR_AVARHR(ade7854_read_32bit,
+                ADE7854_AVARHR);
+static IIO_DEV_ATTR_BVARHR(ade7854_read_32bit,
+                ADE7854_BVARHR);
+static IIO_DEV_ATTR_CVARHR(ade7854_read_32bit,
+                ADE7854_CVARHR);
+static IIO_DEV_ATTR_AVAHR(ade7854_read_32bit,
+                ADE7854_AVAHR);
+static IIO_DEV_ATTR_BVAHR(ade7854_read_32bit,
+                ADE7854_BVAHR);
+static IIO_DEV_ATTR_CVAHR(ade7854_read_32bit,
+                ADE7854_CVAHR);
+
+static int ade7854_set_irq(struct device *dev, bool enable)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+
+        int ret;
+        u32 irqen;
+
+        ret = st->read_reg_32(dev, ADE7854_MASK0, &irqen);
+        if (ret)
+                goto error_ret;
+
+        if (enable)
+                irqen |= 1 << 17; /* 1: interrupt enabled when all periodical
+                                     (at 8 kHz rate) DSP computations finish. */
+        else
+                irqen &= ~(1 << 17);
+
+        ret = st->write_reg_32(dev, ADE7854_MASK0, irqen);
+        if (ret)
+                goto error_ret;
+
+error_ret:
+        return ret;
+}
+
+static int ade7854_initial_setup(struct ade7854_state *st)
+{
+        int ret;
+        struct device *dev = &st->indio_dev->dev;
+
+        /* Disable IRQ */
+        ret = ade7854_set_irq(dev, false);
+        if (ret) {
+                dev_err(dev, "disable irq failed");
+                goto err_ret;
+        }
+
+        ade7854_reset(dev);
+        msleep(ADE7854_STARTUP_DELAY);
+
+err_ret:
+        return ret;
+}
+
+static IIO_DEV_ATTR_RESET(ade7854_write_reset);
+
+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("8000");
+
+static IIO_CONST_ATTR(name, "ade7854");
+
+static struct attribute *ade7854_event_attributes[] = {
+        NULL
+};
+
+static struct attribute_group ade7854_event_attribute_group = {
+        .attrs = ade7854_event_attributes,
+};
+
+static struct attribute *ade7854_attributes[] = {
+        &iio_dev_attr_aigain.dev_attr.attr,
+        &iio_dev_attr_bigain.dev_attr.attr,
+        &iio_dev_attr_cigain.dev_attr.attr,
+        &iio_dev_attr_nigain.dev_attr.attr,
+        &iio_dev_attr_avgain.dev_attr.attr,
+        &iio_dev_attr_bvgain.dev_attr.attr,
+        &iio_dev_attr_cvgain.dev_attr.attr,
+        &iio_dev_attr_linecyc.dev_attr.attr,
+        &iio_dev_attr_sagcyc.dev_attr.attr,
+        &iio_dev_attr_cfcyc.dev_attr.attr,
+        &iio_dev_attr_peakcyc.dev_attr.attr,
+        &iio_dev_attr_chksum.dev_attr.attr,
+        &iio_dev_attr_apparent_power_a_gain.dev_attr.attr,
+        &iio_dev_attr_apparent_power_b_gain.dev_attr.attr,
+        &iio_dev_attr_apparent_power_c_gain.dev_attr.attr,
+        &iio_dev_attr_active_power_a_offset.dev_attr.attr,
+        &iio_dev_attr_active_power_b_offset.dev_attr.attr,
+        &iio_dev_attr_active_power_c_offset.dev_attr.attr,
+        &iio_dev_attr_reactive_power_a_gain.dev_attr.attr,
+        &iio_dev_attr_reactive_power_b_gain.dev_attr.attr,
+        &iio_dev_attr_reactive_power_c_gain.dev_attr.attr,
+        &iio_dev_attr_reactive_power_a_offset.dev_attr.attr,
+        &iio_dev_attr_reactive_power_b_offset.dev_attr.attr,
+        &iio_dev_attr_reactive_power_c_offset.dev_attr.attr,
+        &iio_dev_attr_awatthr.dev_attr.attr,
+        &iio_dev_attr_bwatthr.dev_attr.attr,
+        &iio_dev_attr_cwatthr.dev_attr.attr,
+        &iio_dev_attr_afwatthr.dev_attr.attr,
+        &iio_dev_attr_bfwatthr.dev_attr.attr,
+        &iio_dev_attr_cfwatthr.dev_attr.attr,
+        &iio_dev_attr_avarhr.dev_attr.attr,
+        &iio_dev_attr_bvarhr.dev_attr.attr,
+        &iio_dev_attr_cvarhr.dev_attr.attr,
+        &iio_dev_attr_angle0.dev_attr.attr,
+        &iio_dev_attr_angle1.dev_attr.attr,
+        &iio_dev_attr_angle2.dev_attr.attr,
+        &iio_dev_attr_avahr.dev_attr.attr,
+        &iio_dev_attr_bvahr.dev_attr.attr,
+        &iio_dev_attr_cvahr.dev_attr.attr,
+        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_const_attr_name.dev_attr.attr,
+        &iio_dev_attr_vpeak.dev_attr.attr,
+        &iio_dev_attr_ipeak.dev_attr.attr,
+        &iio_dev_attr_aphcal.dev_attr.attr,
+        &iio_dev_attr_bphcal.dev_attr.attr,
+        &iio_dev_attr_cphcal.dev_attr.attr,
+        &iio_dev_attr_cf1den.dev_attr.attr,
+        &iio_dev_attr_cf2den.dev_attr.attr,
+        &iio_dev_attr_cf3den.dev_attr.attr,
+        &iio_dev_attr_airms.dev_attr.attr,
+        &iio_dev_attr_birms.dev_attr.attr,
+        &iio_dev_attr_cirms.dev_attr.attr,
+        &iio_dev_attr_nirms.dev_attr.attr,
+        &iio_dev_attr_avrms.dev_attr.attr,
+        &iio_dev_attr_bvrms.dev_attr.attr,
+        &iio_dev_attr_cvrms.dev_attr.attr,
+        &iio_dev_attr_airmsos.dev_attr.attr,
+        &iio_dev_attr_birmsos.dev_attr.attr,
+        &iio_dev_attr_cirmsos.dev_attr.attr,
+        &iio_dev_attr_avrmsos.dev_attr.attr,
+        &iio_dev_attr_bvrmsos.dev_attr.attr,
+        &iio_dev_attr_cvrmsos.dev_attr.attr,
+        &iio_dev_attr_volt_a.dev_attr.attr,
+        &iio_dev_attr_volt_b.dev_attr.attr,
+        &iio_dev_attr_volt_c.dev_attr.attr,
+        &iio_dev_attr_current_a.dev_attr.attr,
+        &iio_dev_attr_current_b.dev_attr.attr,
+        &iio_dev_attr_current_c.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ade7854_attribute_group = {
+        .attrs = ade7854_attributes,
+};
+
+int ade7854_probe(struct ade7854_state *st, struct device *dev)
+{
+        int ret, regdone = 0;
+
+        /* Allocate the comms buffers */
+        st->rx = kzalloc(sizeof(*st->rx)*ADE7854_MAX_RX, GFP_KERNEL);
+        if (st->rx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->tx = kzalloc(sizeof(*st->tx)*ADE7854_MAX_TX, GFP_KERNEL);
+        if (st->tx == NULL) {
+                ret = -ENOMEM;
+                goto error_free_rx;
+        }
+        mutex_init(&st->buf_lock);
+        /* setup the industrialio driver allocated elements */
+        st->indio_dev = iio_allocate_device();
+        if (st->indio_dev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_tx;
+        }
+
+        st->indio_dev->dev.parent = dev;
+        st->indio_dev->num_interrupt_lines = 1;
+        st->indio_dev->event_attrs = &ade7854_event_attribute_group;
+        st->indio_dev->attrs = &ade7854_attribute_group;
+        st->indio_dev->dev_data = (void *)(st);
+        st->indio_dev->driver_module = THIS_MODULE;
+        st->indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = ade7854_configure_ring(st->indio_dev);
+        if (ret)
+                goto error_free_dev;
+
+        ret = iio_device_register(st->indio_dev);
+        if (ret)
+                goto error_unreg_ring_funcs;
+        regdone = 1;
+
+        ret = ade7854_initialize_ring(st->indio_dev->ring);
+        if (ret) {
+                printk(KERN_ERR "failed to initialize the ring\n");
+                goto error_unreg_ring_funcs;
+        }
+
+        if (st->irq) {
+                ret = iio_register_interrupt_line(st->irq,
+                                st->indio_dev,
+                                0,
+                                IRQF_TRIGGER_FALLING,
+                                "ade7854");
+                if (ret)
+                        goto error_uninitialize_ring;
+
+                ret = ade7854_probe_trigger(st->indio_dev);
+                if (ret)
+                        goto error_unregister_line;
+        }
+        /* Get the device into a sane initial state */
+        ret = ade7854_initial_setup(st);
+        if (ret)
+                goto error_remove_trigger;
+
+        return 0;
+
+error_remove_trigger:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                ade7854_remove_trigger(st->indio_dev);
+error_unregister_line:
+        if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
+                iio_unregister_interrupt_line(st->indio_dev, 0);
+error_uninitialize_ring:
+        ade7854_uninitialize_ring(st->indio_dev->ring);
+error_unreg_ring_funcs:
+        ade7854_unconfigure_ring(st->indio_dev);
+error_free_dev:
+        if (regdone)
+                iio_device_unregister(st->indio_dev);
+        else
+                iio_free_device(st->indio_dev);
+error_free_tx:
+        kfree(st->tx);
+error_free_rx:
+        kfree(st->rx);
+error_free_st:
+        kfree(st);
+        return ret;
+
+}
+EXPORT_SYMBOL(ade7854_probe);
+
+int ade7854_remove(struct ade7854_state *st)
+{
+        struct iio_dev *indio_dev = st->indio_dev;
+
+        flush_scheduled_work();
+
+        ade7854_remove_trigger(indio_dev);
+        if (st->irq)
+                iio_unregister_interrupt_line(indio_dev, 0);
+
+        ade7854_uninitialize_ring(indio_dev->ring);
+        ade7854_unconfigure_ring(indio_dev);
+        iio_device_unregister(indio_dev);
+        kfree(st->tx);
+        kfree(st->rx);
+        kfree(st);
+
+        return 0;
+}
+EXPORT_SYMBOL(ade7854_remove);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h
new file mode 100644
index 000000000000..47690e521ec1
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7854.h
@@ -0,0 +1,245 @@
+#ifndef _ADE7854_H
+#define _ADE7854_H
+
+#define ADE7854_AIGAIN    0x4380
+#define ADE7854_AVGAIN    0x4381
+#define ADE7854_BIGAIN    0x4382
+#define ADE7854_BVGAIN    0x4383
+#define ADE7854_CIGAIN    0x4384
+#define ADE7854_CVGAIN    0x4385
+#define ADE7854_NIGAIN    0x4386
+#define ADE7854_AIRMSOS   0x4387
+#define ADE7854_AVRMSOS   0x4388
+#define ADE7854_BIRMSOS   0x4389
+#define ADE7854_BVRMSOS   0x438A
+#define ADE7854_CIRMSOS   0x438B
+#define ADE7854_CVRMSOS   0x438C
+#define ADE7854_NIRMSOS   0x438D
+#define ADE7854_AVAGAIN   0x438E
+#define ADE7854_BVAGAIN   0x438F
+#define ADE7854_CVAGAIN   0x4390
+#define ADE7854_AWGAIN    0x4391
+#define ADE7854_AWATTOS   0x4392
+#define ADE7854_BWGAIN    0x4393
+#define ADE7854_BWATTOS   0x4394
+#define ADE7854_CWGAIN    0x4395
+#define ADE7854_CWATTOS   0x4396
+#define ADE7854_AVARGAIN  0x4397
+#define ADE7854_AVAROS    0x4398
+#define ADE7854_BVARGAIN  0x4399
+#define ADE7854_BVAROS    0x439A
+#define ADE7854_CVARGAIN  0x439B
+#define ADE7854_CVAROS    0x439C
+#define ADE7854_AFWGAIN   0x439D
+#define ADE7854_AFWATTOS  0x439E
+#define ADE7854_BFWGAIN   0x439F
+#define ADE7854_BFWATTOS  0x43A0
+#define ADE7854_CFWGAIN   0x43A1
+#define ADE7854_CFWATTOS  0x43A2
+#define ADE7854_AFVARGAIN 0x43A3
+#define ADE7854_AFVAROS   0x43A4
+#define ADE7854_BFVARGAIN 0x43A5
+#define ADE7854_BFVAROS   0x43A6
+#define ADE7854_CFVARGAIN 0x43A7
+#define ADE7854_CFVAROS   0x43A8
+#define ADE7854_VATHR1    0x43A9
+#define ADE7854_VATHR0    0x43AA
+#define ADE7854_WTHR1     0x43AB
+#define ADE7854_WTHR0     0x43AC
+#define ADE7854_VARTHR1   0x43AD
+#define ADE7854_VARTHR0   0x43AE
+#define ADE7854_RSV       0x43AF
+#define ADE7854_VANOLOAD  0x43B0
+#define ADE7854_APNOLOAD  0x43B1
+#define ADE7854_VARNOLOAD 0x43B2
+#define ADE7854_VLEVEL    0x43B3
+#define ADE7854_DICOEFF   0x43B5
+#define ADE7854_HPFDIS    0x43B6
+#define ADE7854_ISUMLVL   0x43B8
+#define ADE7854_ISUM      0x43BF
+#define ADE7854_AIRMS     0x43C0
+#define ADE7854_AVRMS     0x43C1
+#define ADE7854_BIRMS     0x43C2
+#define ADE7854_BVRMS     0x43C3
+#define ADE7854_CIRMS     0x43C4
+#define ADE7854_CVRMS     0x43C5
+#define ADE7854_NIRMS     0x43C6
+#define ADE7854_RUN       0xE228
+#define ADE7854_AWATTHR   0xE400
+#define ADE7854_BWATTHR   0xE401
+#define ADE7854_CWATTHR   0xE402
+#define ADE7854_AFWATTHR  0xE403
+#define ADE7854_BFWATTHR  0xE404
+#define ADE7854_CFWATTHR  0xE405
+#define ADE7854_AVARHR    0xE406
+#define ADE7854_BVARHR    0xE407
+#define ADE7854_CVARHR    0xE408
+#define ADE7854_AFVARHR   0xE409
+#define ADE7854_BFVARHR   0xE40A
+#define ADE7854_CFVARHR   0xE40B
+#define ADE7854_AVAHR     0xE40C
+#define ADE7854_BVAHR     0xE40D
+#define ADE7854_CVAHR     0xE40E
+#define ADE7854_IPEAK     0xE500
+#define ADE7854_VPEAK     0xE501
+#define ADE7854_STATUS0   0xE502
+#define ADE7854_STATUS1   0xE503
+#define ADE7854_OILVL     0xE507
+#define ADE7854_OVLVL     0xE508
+#define ADE7854_SAGLVL    0xE509
+#define ADE7854_MASK0     0xE50A
+#define ADE7854_MASK1     0xE50B
+#define ADE7854_IAWV      0xE50C
+#define ADE7854_IBWV      0xE50D
+#define ADE7854_ICWV      0xE50E
+#define ADE7854_VAWV      0xE510
+#define ADE7854_VBWV      0xE511
+#define ADE7854_VCWV      0xE512
+#define ADE7854_AWATT     0xE513
+#define ADE7854_BWATT     0xE514
+#define ADE7854_CWATT     0xE515
+#define ADE7854_AVA       0xE519
+#define ADE7854_BVA       0xE51A
+#define ADE7854_CVA       0xE51B
+#define ADE7854_CHECKSUM  0xE51F
+#define ADE7854_VNOM      0xE520
+#define ADE7854_PHSTATUS  0xE600
+#define ADE7854_ANGLE0    0xE601
+#define ADE7854_ANGLE1    0xE602
+#define ADE7854_ANGLE2    0xE603
+#define ADE7854_PERIOD    0xE607
+#define ADE7854_PHNOLOAD  0xE608
+#define ADE7854_LINECYC   0xE60C
+#define ADE7854_ZXTOUT    0xE60D
+#define ADE7854_COMPMODE  0xE60E
+#define ADE7854_GAIN      0xE60F
+#define ADE7854_CFMODE    0xE610
+#define ADE7854_CF1DEN    0xE611
+#define ADE7854_CF2DEN    0xE612
+#define ADE7854_CF3DEN    0xE613
+#define ADE7854_APHCAL    0xE614
+#define ADE7854_BPHCAL    0xE615
+#define ADE7854_CPHCAL    0xE616
+#define ADE7854_PHSIGN    0xE617
+#define ADE7854_CONFIG    0xE618
+#define ADE7854_MMODE     0xE700
+#define ADE7854_ACCMODE   0xE701
+#define ADE7854_LCYCMODE  0xE702
+#define ADE7854_PEAKCYC   0xE703
+#define ADE7854_SAGCYC    0xE704
+#define ADE7854_CFCYC     0xE705
+#define ADE7854_HSDC_CFG  0xE706
+#define ADE7854_CONFIG2   0xEC01
+
+#define ADE7854_READ_REG   0x1
+#define ADE7854_WRITE_REG  0x0
+
+#define ADE7854_MAX_TX    7
+#define ADE7854_MAX_RX    7
+#define ADE7854_STARTUP_DELAY 1
+
+#define ADE7854_SPI_SLOW        (u32)(300 * 1000)
+#define ADE7854_SPI_BURST       (u32)(1000 * 1000)
+#define ADE7854_SPI_FAST        (u32)(2000 * 1000)
+
+#define DRIVER_NAME             "ade7854"
+
+/**
+ * struct ade7854_state - device instance specific data
+ * @spi:                        actual spi_device
+ * @work_trigger_to_ring: bh for triggered event handling
+ * @inter:              used to check if new interrupt has been triggered
+ * @last_timestamp:     passing timestamp from th to bh of interrupt handler
+ * @indio_dev:          industrial I/O device structure
+ * @trig:               data ready trigger registered with iio
+ * @tx:                 transmit buffer
+ * @rx:                 recieve buffer
+ * @buf_lock:           mutex to protect tx and rx
+ **/
+struct ade7854_state {
+        struct spi_device               *spi;
+        struct i2c_client               *i2c;
+        struct work_struct              work_trigger_to_ring;
+        s64                             last_timestamp;
+        struct iio_dev                  *indio_dev;
+        struct iio_trigger              *trig;
+        u8                              *tx;
+        u8                              *rx;
+        int                             (*read_reg_8) (struct device *, u16, u8 *);
+        int                             (*read_reg_16) (struct device *, u16, u16 *);
+        int                             (*read_reg_24) (struct device *, u16, u32 *);
+        int                             (*read_reg_32) (struct device *, u16, u32 *);
+        int                             (*write_reg_8) (struct device *, u16, u8);
+        int                             (*write_reg_16) (struct device *, u16, u16);
+        int                             (*write_reg_24) (struct device *, u16, u32);
+        int                             (*write_reg_32) (struct device *, u16, u32);
+        int                             irq;
+        struct mutex                    buf_lock;
+};
+
+extern int ade7854_probe(struct ade7854_state *st, struct device *dev);
+extern int ade7854_remove(struct ade7854_state *st);
+
+#if defined(CONFIG_IIO_RING_BUFFER) && defined(THIS_HAS_RING_BUFFER_SUPPORT)
+/* At the moment triggers are only used for ring buffer
+ * filling. This may change!
+ */
+
+enum ade7854_scan {
+        ADE7854_SCAN_PHA_V,
+        ADE7854_SCAN_PHB_V,
+        ADE7854_SCAN_PHC_V,
+        ADE7854_SCAN_PHA_I,
+        ADE7854_SCAN_PHB_I,
+        ADE7854_SCAN_PHC_I,
+};
+
+void ade7854_remove_trigger(struct iio_dev *indio_dev);
+int ade7854_probe_trigger(struct iio_dev *indio_dev);
+
+ssize_t ade7854_read_data_from_ring(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf);
+
+
+int ade7854_configure_ring(struct iio_dev *indio_dev);
+void ade7854_unconfigure_ring(struct iio_dev *indio_dev);
+
+int ade7854_initialize_ring(struct iio_ring_buffer *ring);
+void ade7854_uninitialize_ring(struct iio_ring_buffer *ring);
+#else /* CONFIG_IIO_RING_BUFFER */
+
+static inline void ade7854_remove_trigger(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7854_probe_trigger(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline ssize_t
+ade7854_read_data_from_ring(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        return 0;
+}
+
+static inline int ade7854_configure_ring(struct iio_dev *indio_dev)
+{
+        return 0;
+}
+
+static inline void ade7854_unconfigure_ring(struct iio_dev *indio_dev)
+{
+}
+static inline int ade7854_initialize_ring(struct iio_ring_buffer *ring)
+{
+        return 0;
+}
+static inline void ade7854_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
+#endif /* CONFIG_IIO_RING_BUFFER */
+
+#endif
diff --git a/drivers/staging/iio/meter/meter.h b/drivers/staging/iio/meter/meter.h
new file mode 100644
index 000000000000..142c50d71fda
--- /dev/null
+++ b/drivers/staging/iio/meter/meter.h
@@ -0,0 +1,396 @@
+#include "../sysfs.h"
+
+/* metering ic types of attribute */
+
+#define IIO_DEV_ATTR_CURRENT_A_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(current_a_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_B_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(current_b_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_C_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(current_c_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VOLT_A_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(volt_a_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VOLT_B_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(volt_b_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VOLT_C_OFFSET(_mode, _show, _store, _addr)      \
+        IIO_DEVICE_ATTR(volt_c_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_A_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_a_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_B_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_b_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_C_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_c_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_A_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_a_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_B_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_b_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_C_OFFSET(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_c_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_A_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(current_a_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_B_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(current_b_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_C_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(current_c_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_APPARENT_POWER_A_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(apparent_power_a_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_APPARENT_POWER_B_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(apparent_power_b_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_APPARENT_POWER_C_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(apparent_power_c_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_A_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_a_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_B_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_b_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ACTIVE_POWER_C_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(active_power_c_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_A_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_a_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_B_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_b_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_REACTIVE_POWER_C_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(reactive_power_c_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_A(_show, _addr)                    \
+        IIO_DEVICE_ATTR(current_a, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_B(_show, _addr)                    \
+        IIO_DEVICE_ATTR(current_b, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CURRENT_C(_show, _addr)                    \
+        IIO_DEVICE_ATTR(current_c, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_VOLT_A(_show, _addr)                       \
+        IIO_DEVICE_ATTR(volt_a, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_VOLT_B(_show, _addr)                       \
+        IIO_DEVICE_ATTR(volt_b, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_VOLT_C(_show, _addr)                       \
+        IIO_DEVICE_ATTR(volt_c, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_AENERGY(_show, _addr)                      \
+        IIO_DEVICE_ATTR(aenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_LENERGY(_show, _addr)                      \
+        IIO_DEVICE_ATTR(lenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_RAENERGY(_show, _addr)                     \
+        IIO_DEVICE_ATTR(raenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_LAENERGY(_show, _addr)                     \
+        IIO_DEVICE_ATTR(laenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_VAENERGY(_show, _addr)                     \
+        IIO_DEVICE_ATTR(vaenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_LVAENERGY(_show, _addr)                    \
+        IIO_DEVICE_ATTR(lvaenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_RVAENERGY(_show, _addr)                    \
+        IIO_DEVICE_ATTR(rvaenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_LVARENERGY(_show, _addr)                   \
+        IIO_DEVICE_ATTR(lvarenergy, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CHKSUM(_show, _addr)                       \
+        IIO_DEVICE_ATTR(chksum, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGLE0(_show, _addr)                       \
+        IIO_DEVICE_ATTR(angle0, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGLE1(_show, _addr)                       \
+        IIO_DEVICE_ATTR(angle1, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ANGLE2(_show, _addr)                       \
+        IIO_DEVICE_ATTR(angle2, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_AWATTHR(_show, _addr)                      \
+        IIO_DEVICE_ATTR(awatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_BWATTHR(_show, _addr)                      \
+        IIO_DEVICE_ATTR(bwatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CWATTHR(_show, _addr)                      \
+        IIO_DEVICE_ATTR(cwatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_AFWATTHR(_show, _addr)                     \
+        IIO_DEVICE_ATTR(afwatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_BFWATTHR(_show, _addr)                     \
+        IIO_DEVICE_ATTR(bfwatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CFWATTHR(_show, _addr)                     \
+        IIO_DEVICE_ATTR(cfwatthr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_AVARHR(_show, _addr)                       \
+        IIO_DEVICE_ATTR(avarhr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_BVARHR(_show, _addr)                       \
+        IIO_DEVICE_ATTR(bvarhr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CVARHR(_show, _addr)                       \
+        IIO_DEVICE_ATTR(cvarhr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_AVAHR(_show, _addr)                        \
+        IIO_DEVICE_ATTR(avahr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_BVAHR(_show, _addr)                        \
+        IIO_DEVICE_ATTR(bvahr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_CVAHR(_show, _addr)                        \
+        IIO_DEVICE_ATTR(cvahr, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_IOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(ios, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_PHCAL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(phcal, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_APHCAL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(aphcal, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BPHCAL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bphcal, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CPHCAL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cphcal, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_APOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(apos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AAPOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(aapos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BAPOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bapos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CAPOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(capos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AVRMSGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(avrmsgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BVRMSGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bvrmsgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CVRMSGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cvrmsgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AIGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(aigain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BIGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bigain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CIGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cigain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_NIGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(nigain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AVGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(avgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BVGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bvgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CVGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cvgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_WGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(wgain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_WDIV(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(wdiv, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CFNUM(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cfnum, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CFDEN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cfden, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CF1DEN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cf1den, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CF2DEN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cf2den, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CF3DEN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cf3den, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_IRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(irms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vrms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AIRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(airms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BIRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(birms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CIRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cirms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_NIRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(nirms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AVRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(avrms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BVRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bvrms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CVRMS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cvrms, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_IRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(irmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vrmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AIRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(airmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BIRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(birmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CIRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cirmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_AVRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(avrmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_BVRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(bvrmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CVRMSOS(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cvrmsos, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VAGAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vagain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_PGA_GAIN(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(pga_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VADIV(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vadiv, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_LINECYC(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(linecyc, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_SAGCYC(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(sagcyc, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CFCYC(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(cfcyc, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_PEAKCYC(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(peakcyc, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_SAGLVL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(saglvl, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_IPKLVL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(ipklvl, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VPKLVL(_mode, _show, _store, _addr)                \
+        IIO_DEVICE_ATTR(vpklvl, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_IPEAK(_mode, _show, _store, _addr)                 \
+        IIO_DEVICE_ATTR(ipeak, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_RIPEAK(_mode, _show, _store, _addr)                        \
+        IIO_DEVICE_ATTR(ripeak, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VPEAK(_mode, _show, _store, _addr)                 \
+        IIO_DEVICE_ATTR(vpeak, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_RVPEAK(_mode, _show, _store, _addr)                        \
+        IIO_DEVICE_ATTR(rvpeak, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_VPERIOD(_mode, _show, _store, _addr)                       \
+        IIO_DEVICE_ATTR(vperiod, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_CH_OFF(_num, _mode, _show, _store, _addr)                  \
+  IIO_DEVICE_ATTR(choff_##_num, _mode, _show, _store, _addr)
+
+/* active energy register, AENERGY, is more than half full */
+#define IIO_EVENT_ATTR_AENERGY_HALF_FULL(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(aenergy_half_full, _evlist, _show, _store, _mask)
+
+/* a SAG on the line voltage */
+#define IIO_EVENT_ATTR_LINE_VOLT_SAG(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(line_volt_sag, _evlist, _show, _store, _mask)
+
+/*
+ * Indicates the end of energy accumulation over an integer number
+ * of half line cycles
+ */
+#define IIO_EVENT_ATTR_CYCEND(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(cycend, _evlist, _show, _store, _mask)
+
+/* on the rising and falling edge of the the voltage waveform */
+#define IIO_EVENT_ATTR_ZERO_CROSS(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(zero_cross, _evlist, _show, _store, _mask)
+
+/* the active energy register has overflowed */
+#define IIO_EVENT_ATTR_AENERGY_OVERFLOW(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(aenergy_overflow, _evlist, _show, _store, _mask)
+
+/* the apparent energy register has overflowed */
+#define IIO_EVENT_ATTR_VAENERGY_OVERFLOW(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(vaenergy_overflow, _evlist, _show, _store, _mask)
+
+/* the active energy register, VAENERGY, is more than half full */
+#define IIO_EVENT_ATTR_VAENERGY_HALF_FULL(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(vaenergy_half_full, _evlist, _show, _store, _mask)
+
+/* the power has gone from negative to positive */
+#define IIO_EVENT_ATTR_PPOS(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(ppos, _evlist, _show, _store, _mask)
+
+/* the power has gone from positive to negative */
+#define IIO_EVENT_ATTR_PNEG(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(pneg, _evlist, _show, _store, _mask)
+
+/* waveform sample from Channel 1 has exceeded the IPKLVL value */
+#define IIO_EVENT_ATTR_IPKLVL_EXC(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(ipklvl_exc, _evlist, _show, _store, _mask)
+
+/* waveform sample from Channel 2 has exceeded the VPKLVL value */
+#define IIO_EVENT_ATTR_VPKLVL_EXC(_evlist, _show, _store, _mask) \
+        IIO_EVENT_ATTR_SH(vpklvl_exc, _evlist, _show, _store, _mask)
+
diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
new file mode 100644
index 000000000000..a4a363429355
--- /dev/null
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -0,0 +1,54 @@
+#
+# Resolver/Synchro drivers
+#
+comment "Resolver to digital converters"
+
+config AD2S90
+        tristate "Analog Devices ad2s90 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices spi resolver
+          to digital converters, ad2s90, provides direct access via sysfs.
+
+config AD2S120X
+        tristate "Analog Devices ad2s120x driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices spi resolver
+          to digital converters, ad2s1200 and ad2s1205, provides direct access
+          via sysfs.
+
+config AD2S1210
+        tristate "Analog Devices ad2s1210 driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices spi resolver
+          to digital converters, ad2s1210, provides direct access via sysfs.
+
+choice
+        prompt "Resolution Control"
+        depends on AD2S1210
+        default AD2S1210_GPIO_NONE
+        help
+          In normal mode, the resolution of the digital output is selected
+          using the RES0 and RES1 input pins. In configuration mode, the
+          resolution is selected by setting the RES0 and RES1 bits in the
+          control regsiter. When switching between normal mode and configuration
+          mode, there are some schemes to keep them matchs.
+
+config AD2S1210_GPIO_INPUT
+        bool "read resolution from gpio pins"
+        help
+          GPIO pins are sampling RES0 and RES1 pins, read the resolution
+          settings from the GPIO pins.
+
+config AD2S1210_GPIO_OUTPUT
+        bool "set gpio pins to set resolution"
+        help
+          RES0 and RES1 pins are controlled by GPIOs, setting GPIO pins to
+          set the resolution.
+
+config AD2S1210_GPIO_NONE
+        bool "take the responsibility by user"
+
+endchoice
diff --git a/drivers/staging/iio/resolver/Makefile b/drivers/staging/iio/resolver/Makefile
new file mode 100644
index 000000000000..0b84a89e6cac
--- /dev/null
+++ b/drivers/staging/iio/resolver/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Resolver/Synchro drivers
+#
+
+obj-$(CONFIG_AD2S90) += ad2s90.o
+obj-$(CONFIG_AD2S120X) += ad2s120x.o
+obj-$(CONFIG_AD2S1210) += ad2s1210.o
diff --git a/drivers/staging/iio/resolver/ad2s120x.c b/drivers/staging/iio/resolver/ad2s120x.c
new file mode 100644
index 000000000000..8f497a23976c
--- /dev/null
+++ b/drivers/staging/iio/resolver/ad2s120x.c
@@ -0,0 +1,310 @@
+/*
+ * ad2s120x.c simple support for the ADI Resolver to Digital Converters: AD2S1200/1205
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad2s120x"
+
+/* input pin sample and rdvel is controlled by driver */
+#define AD2S120X_PN     2
+
+/* input clock on serial interface */
+#define AD2S120X_HZ     8192000
+/* clock period in nano second */
+#define AD2S120X_TSCLK  (1000000000/AD2S120X_HZ)
+
+struct ad2s120x_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+        unsigned short sample;
+        unsigned short rdvel;
+        u8 rx[2];
+        u8 tx[2];
+};
+
+static ssize_t ad2s120x_show_pos_vel(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret = 0;
+        ssize_t len = 0;
+        u16 pos;
+        s16 vel;
+        u8 status;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s120x_state *st = idev->dev_data;
+
+        xfer.len = 1;
+        xfer.tx_buf = st->tx;
+        xfer.rx_buf = st->rx;
+        mutex_lock(&st->lock);
+
+        gpio_set_value(st->sample, 0);
+        /* delay (6 * AD2S120X_TSCLK + 20) nano seconds */
+        udelay(1);
+        gpio_set_value(st->sample, 1);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        status = st->rx[1];
+        pos = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+        len = sprintf(buf, "%d %c%c%c%c ", pos,
+                                (status & 0x8) ? 'P' : 'V',
+                                (status & 0x4) ? 'd' : '_',
+                                (status & 0x2) ? 'l' : '_',
+                                (status & 0x1) ? '1' : '0');
+
+        /* delay 18 ns */
+        /* ndelay(18); */
+
+        gpio_set_value(st->rdvel, 0);
+        /* ndelay(5);*/
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        status = st->rx[1];
+        vel = (st->rx[0] & 0x80) ? 0xf000 : 0;
+        vel |= (((s16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+        len += sprintf(buf + len, "%d %c%c%c%c\n", vel,
+                                (status & 0x8) ? 'P' : 'V',
+                                (status & 0x4) ? 'd' : '_',
+                                (status & 0x2) ? 'l' : '_',
+                                (status & 0x1) ? '1' : '0');
+error_ret:
+        gpio_set_value(st->rdvel, 1);
+        /* delay (2 * AD2S120X_TSCLK + 20) ns for sample pulse */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad2s120x_show_pos(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret = 0;
+        ssize_t len = 0;
+        u16 pos;
+        u8 status;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s120x_state *st = idev->dev_data;
+
+        xfer.len = 1;
+        xfer.tx_buf = st->tx;
+        xfer.rx_buf = st->rx;
+        mutex_lock(&st->lock);
+
+        gpio_set_value(st->sample, 0);
+        /* delay (6 * AD2S120X_TSCLK + 20) nano seconds */
+        udelay(1);
+        gpio_set_value(st->sample, 1);
+        gpio_set_value(st->rdvel, 1);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        status = st->rx[1];
+        pos = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+        len = sprintf(buf, "%d %c%c%c%c ", pos,
+                                (status & 0x8) ? 'P' : 'V',
+                                (status & 0x4) ? 'd' : '_',
+                                (status & 0x2) ? 'l' : '_',
+                                (status & 0x1) ? '1' : '0');
+error_ret:
+        /* delay (2 * AD2S120X_TSCLK + 20) ns for sample pulse */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad2s120x_show_vel(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret = 0;
+        ssize_t len = 0;
+        s16 vel;
+        u8 status;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s120x_state *st = idev->dev_data;
+
+        xfer.len = 1;
+        xfer.tx_buf = st->tx;
+        xfer.rx_buf = st->rx;
+        mutex_lock(&st->lock);
+
+        gpio_set_value(st->sample, 0);
+        /* delay (6 * AD2S120X_TSCLK + 20) nano seconds */
+        udelay(1);
+        gpio_set_value(st->sample, 1);
+
+        gpio_set_value(st->rdvel, 0);
+        /* ndelay(5);*/
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        status = st->rx[1];
+        vel = (st->rx[0] & 0x80) ? 0xf000 : 0;
+        vel |= (((s16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+        len += sprintf(buf + len, "%d %c%c%c%c\n", vel,
+                                (status & 0x8) ? 'P' : 'V',
+                                (status & 0x4) ? 'd' : '_',
+                                (status & 0x2) ? 'l' : '_',
+                                (status & 0x1) ? '1' : '0');
+error_ret:
+        gpio_set_value(st->rdvel, 1);
+        /* delay (2 * AD2S120X_TSCLK + 20) ns for sample pulse */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_CONST_ATTR(description,
+        "12-Bit R/D Converter with Reference Oscillator");
+static IIO_DEVICE_ATTR(pos_vel, S_IRUGO, ad2s120x_show_pos_vel, NULL, 0);
+static IIO_DEVICE_ATTR(pos, S_IRUGO, ad2s120x_show_pos, NULL, 0);
+static IIO_DEVICE_ATTR(vel, S_IRUGO, ad2s120x_show_vel, NULL, 0);
+
+static struct attribute *ad2s120x_attributes[] = {
+        &iio_const_attr_description.dev_attr.attr,
+        &iio_dev_attr_pos_vel.dev_attr.attr,
+        &iio_dev_attr_pos.dev_attr.attr,
+        &iio_dev_attr_vel.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad2s120x_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad2s120x_attributes,
+};
+
+static int __devinit ad2s120x_probe(struct spi_device *spi)
+{
+        struct ad2s120x_state *st;
+        int pn, ret = 0;
+        unsigned short *pins = spi->dev.platform_data;
+
+        for (pn = 0; pn < AD2S120X_PN; pn++) {
+                if (gpio_request(pins[pn], DRV_NAME)) {
+                        pr_err("%s: request gpio pin %d failed\n",
+                                                DRV_NAME, pins[pn]);
+                        goto error_ret;
+                }
+                gpio_direction_output(pins[pn], 1);
+        }
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+        st->sample = pins[0];
+        st->rdvel = pins[1];
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad2s120x_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+
+        spi->max_speed_hz = AD2S120X_HZ;
+        spi->mode = SPI_MODE_3;
+        spi_setup(spi);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        for (--pn; pn >= 0; pn--)
+                gpio_free(pins[pn]);
+        return ret;
+}
+
+static int __devexit ad2s120x_remove(struct spi_device *spi)
+{
+        struct ad2s120x_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad2s120x_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad2s120x_probe,
+        .remove = __devexit_p(ad2s120x_remove),
+};
+
+static __init int ad2s120x_spi_init(void)
+{
+        return spi_register_driver(&ad2s120x_driver);
+}
+module_init(ad2s120x_spi_init);
+
+static __exit void ad2s120x_spi_exit(void)
+{
+        spi_unregister_driver(&ad2s120x_driver);
+}
+module_exit(ad2s120x_spi_exit);
+
+MODULE_AUTHOR("Graff Yang <graff.yang@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices AD2S1200/1205 Resolver to Digital SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
new file mode 100644
index 000000000000..c12f64cc40df
--- /dev/null
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -0,0 +1,872 @@
+/*
+ * ad2s1210.c support for the ADI Resolver to Digital Converters: AD2S1210
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad2s1210"
+
+#define DEF_CONTROL             0x7E
+
+#define MSB_IS_HIGH             0x80
+#define MSB_IS_LOW              0x7F
+#define PHASE_LOCK_RANGE_44     0x20
+#define ENABLE_HYSTERESIS       0x10
+#define SET_ENRES1              0x08
+#define SET_ENRES0              0x04
+#define SET_RES1                0x02
+#define SET_RES0                0x01
+
+#define SET_ENRESOLUTION        (SET_ENRES1 | SET_ENRES0)
+#define SET_RESOLUTION          (SET_RES1 | SET_RES0)
+
+#define REG_POSITION            0x80
+#define REG_VELOCITY            0x82
+#define REG_LOS_THRD            0x88
+#define REG_DOS_OVR_THRD        0x89
+#define REG_DOS_MIS_THRD        0x8A
+#define REG_DOS_RST_MAX_THRD    0x8B
+#define REG_DOS_RST_MIN_THRD    0x8C
+#define REG_LOT_HIGH_THRD       0x8D
+#define REG_LOT_LOW_THRD        0x8E
+#define REG_EXCIT_FREQ          0x91
+#define REG_CONTROL             0x92
+#define REG_SOFT_RESET          0xF0
+#define REG_FAULT               0xFF
+
+/* pin SAMPLE, A0, A1, RES0, RES1, is controlled by driver */
+#define AD2S1210_SAA            3
+#if defined(CONFIG_AD2S1210_GPIO_INPUT) || defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+# define AD2S1210_RES           2
+#else
+# define AD2S1210_RES           0
+#endif
+#define AD2S1210_PN             (AD2S1210_SAA + AD2S1210_RES)
+
+#define AD2S1210_MIN_CLKIN      6144000
+#define AD2S1210_MAX_CLKIN      10240000
+#define AD2S1210_MIN_EXCIT      2000
+#define AD2S1210_MAX_EXCIT      20000
+#define AD2S1210_MIN_FCW        0x4
+#define AD2S1210_MAX_FCW        0x50
+
+/* default input clock on serial interface */
+#define AD2S1210_DEF_CLKIN      8192000
+/* clock period in nano second */
+#define AD2S1210_DEF_TCK        (1000000000/AD2S1210_DEF_CLKIN)
+#define AD2S1210_DEF_EXCIT      10000
+
+enum ad2s1210_mode {
+        MOD_POS = 0,
+        MOD_VEL,
+        MOD_RESERVED,
+        MOD_CONFIG,
+};
+
+enum ad2s1210_res {
+        RES_10 = 10,
+        RES_12 = 12,
+        RES_14 = 14,
+        RES_16 = 16,
+};
+
+static unsigned int resolution_value[] = {
+                RES_10, RES_12, RES_14, RES_16};
+
+struct ad2s1210_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+        struct spi_transfer xfer;
+        unsigned int hysteresis;
+        unsigned int old_data;
+        enum ad2s1210_mode mode;
+        enum ad2s1210_res resolution;
+        unsigned int fclkin;
+        unsigned int fexcit;
+        unsigned short sample;
+        unsigned short a0;
+        unsigned short a1;
+        unsigned short res0;
+        unsigned short res1;
+        u8 rx[3];
+        u8 tx[3];
+};
+
+static inline void start_sample(struct ad2s1210_state *st)
+{
+        gpio_set_value(st->sample, 0);
+}
+
+static inline void stop_sample(struct ad2s1210_state *st)
+{
+        gpio_set_value(st->sample, 1);
+}
+
+static inline void set_mode(enum ad2s1210_mode mode, struct ad2s1210_state *st)
+{
+        switch (mode) {
+        case MOD_POS:
+                gpio_set_value(st->a0, 0);
+                gpio_set_value(st->a1, 0);
+                break;
+        case MOD_VEL:
+                gpio_set_value(st->a0, 0);
+                gpio_set_value(st->a1, 1);
+                break;
+        case MOD_CONFIG:
+                gpio_set_value(st->a0, 1);
+                gpio_set_value(st->a1, 1);
+                break;
+        default:
+                /* set to reserved mode */
+                gpio_set_value(st->a0, 1);
+                gpio_set_value(st->a1, 0);
+        }
+        st->mode = mode;
+}
+
+/* write 1 bytes (address or data) to the chip */
+static int config_write(struct ad2s1210_state *st,
+                                        unsigned char data)
+{
+        struct spi_message msg;
+        int ret = 0;
+
+        st->xfer.len = 1;
+        set_mode(MOD_CONFIG, st);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        st->tx[0] = data;
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                return ret;
+        st->old_data = 1;
+        return ret;
+}
+
+/* read value from one of the registers */
+static int config_read(struct ad2s1210_state *st,
+                                unsigned char address,
+                                        unsigned char *data)
+{
+        struct spi_message msg;
+        int ret = 0;
+
+        st->xfer.len = 2;
+        set_mode(MOD_CONFIG, st);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        st->tx[0] = address | MSB_IS_HIGH;
+        st->tx[1] = REG_FAULT;
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                return ret;
+        *data = st->rx[1];
+        st->old_data = 1;
+        return ret;
+}
+
+static inline void update_frequency_control_word(struct ad2s1210_state *st)
+{
+        unsigned char fcw;
+        fcw = (unsigned char)(st->fexcit * (1 << 15) / st->fclkin);
+        if (fcw >= AD2S1210_MIN_FCW && fcw <= AD2S1210_MAX_FCW) {
+                config_write(st, REG_EXCIT_FREQ);
+                config_write(st, fcw);
+        } else
+                pr_err("ad2s1210: FCW out of range\n");
+}
+
+#if defined(CONFIG_AD2S1210_GPIO_INPUT)
+static inline unsigned char read_resolution_pin(struct ad2s1210_state *st)
+{
+        unsigned int data;
+        data = (gpio_get_value(st->res0) << 1)  |
+                        gpio_get_value(st->res1);
+        return resolution_value[data];
+}
+#elif defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+static inline void set_resolution_pin(struct ad2s1210_state *st)
+{
+        switch (st->resolution) {
+        case RES_10:
+                gpio_set_value(st->res0, 0);
+                gpio_set_value(st->res1, 0);
+                break;
+        case RES_12:
+                gpio_set_value(st->res0, 0);
+                gpio_set_value(st->res1, 1);
+                break;
+        case RES_14:
+                gpio_set_value(st->res0, 1);
+                gpio_set_value(st->res1, 0);
+                break;
+        case RES_16:
+                gpio_set_value(st->res0, 1);
+                gpio_set_value(st->res1, 1);
+                break;
+        }
+}
+#endif
+
+static inline void soft_reset(struct ad2s1210_state *st)
+{
+        config_write(st, REG_SOFT_RESET);
+        config_write(st, 0x0);
+}
+
+
+/* return the OLD DATA since last spi bus write */
+static ssize_t ad2s1210_show_raw(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        int ret;
+
+        mutex_lock(&st->lock);
+        if (st->old_data) {
+                ret = sprintf(buf, "0x%x\n", st->rx[0]);
+                st->old_data = 0;
+        } else
+                ret = 0;
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static ssize_t ad2s1210_store_raw(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned long udata;
+        unsigned char data;
+        int ret;
+
+        ret = strict_strtoul(buf, 16, &udata);
+        if (ret)
+                return -EINVAL;
+        data = udata & 0xff;
+        mutex_lock(&st->lock);
+        config_write(st, data);
+        mutex_unlock(&st->lock);
+        return 1;
+}
+
+static ssize_t ad2s1210_store_softreset(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        mutex_lock(&st->lock);
+        soft_reset(st);
+        mutex_unlock(&st->lock);
+        return len;
+}
+
+static ssize_t ad2s1210_show_fclkin(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        return sprintf(buf, "%d\n", st->fclkin);
+}
+
+static ssize_t ad2s1210_store_fclkin(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned long fclkin;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &fclkin);
+        if (!ret && fclkin >= AD2S1210_MIN_CLKIN &&
+                                fclkin <= AD2S1210_MAX_CLKIN) {
+                mutex_lock(&st->lock);
+                st->fclkin = fclkin;
+        } else {
+                pr_err("ad2s1210: fclkin out of range\n");
+                return -EINVAL;
+        }
+        update_frequency_control_word(st);
+        soft_reset(st);
+        mutex_unlock(&st->lock);
+        return len;
+}
+
+static ssize_t ad2s1210_show_fexcit(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        return sprintf(buf, "%d\n", st->fexcit);
+}
+
+static ssize_t ad2s1210_store_fexcit(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned long fexcit;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &fexcit);
+        if (!ret && fexcit >= AD2S1210_MIN_EXCIT &&
+                                fexcit <= AD2S1210_MAX_EXCIT) {
+                mutex_lock(&st->lock);
+                st->fexcit = fexcit;
+        } else {
+                pr_err("ad2s1210: excitation frequency out of range\n");
+                return -EINVAL;
+        }
+        update_frequency_control_word(st);
+        soft_reset(st);
+        mutex_unlock(&st->lock);
+        return len;
+}
+
+static ssize_t ad2s1210_show_control(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned char data;
+        mutex_lock(&st->lock);
+        config_read(st, REG_CONTROL, &data);
+        mutex_unlock(&st->lock);
+        return sprintf(buf, "0x%x\n", data);
+}
+
+static ssize_t ad2s1210_store_control(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned long udata;
+        unsigned char data;
+        int ret;
+
+        ret = strict_strtoul(buf, 16, &udata);
+        if (ret) {
+                ret = -EINVAL;
+                goto error_ret;
+        }
+        mutex_lock(&st->lock);
+        config_write(st, REG_CONTROL);
+        data = udata & MSB_IS_LOW;
+        config_write(st, data);
+        config_read(st, REG_CONTROL, &data);
+        if (data & MSB_IS_HIGH) {
+                ret = -EIO;
+                pr_err("ad2s1210: write control register fail\n");
+                goto error_ret;
+        }
+        st->resolution = resolution_value[data & SET_RESOLUTION];
+#if defined(CONFIG_AD2S1210_GPIO_INPUT)
+        data = read_resolution_pin(st);
+        if (data != st->resolution)
+                pr_warning("ad2s1210: resolution settings not match\n");
+#elif defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+        set_resolution_pin(st);
+#endif
+        ret = len;
+        if (data & ENABLE_HYSTERESIS)
+                st->hysteresis = 1;
+        else
+                st->hysteresis = 0;
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static ssize_t ad2s1210_show_resolution(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        return sprintf(buf, "%d\n", st->resolution);
+}
+
+static ssize_t ad2s1210_store_resolution(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned char data;
+        unsigned long udata;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &udata);
+        if (ret || udata < RES_10 || udata > RES_16) {
+                pr_err("ad2s1210: resolution out of range\n");
+                return -EINVAL;
+        }
+        mutex_lock(&st->lock);
+        config_read(st, REG_CONTROL, &data);
+        data &= ~SET_RESOLUTION;
+        data |= (udata - RES_10) >> 1;
+        config_write(st, REG_CONTROL);
+        config_write(st, data & MSB_IS_LOW);
+        config_read(st, REG_CONTROL, &data);
+        if (data & MSB_IS_HIGH) {
+                ret = -EIO;
+                pr_err("ad2s1210: setting resolution fail\n");
+                goto error_ret;
+        }
+        st->resolution = resolution_value[data & SET_RESOLUTION];
+#if defined(CONFIG_AD2S1210_GPIO_INPUT)
+        data = read_resolution_pin(st);
+        if (data != st->resolution)
+                pr_warning("ad2s1210: resolution settings not match\n");
+#elif defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+        set_resolution_pin(st);
+#endif
+        ret = len;
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+/* read the fault register since last sample */
+static ssize_t ad2s1210_show_fault(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        int ret = 0;
+        ssize_t len = 0;
+        unsigned char data;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+
+        mutex_lock(&st->lock);
+        ret = config_read(st, REG_FAULT, &data);
+
+        if (ret)
+                goto error_ret;
+        len = sprintf(buf, "0x%x\n", data);
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret ? ret : len;
+}
+
+static ssize_t ad2s1210_clear_fault(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned char data;
+
+        mutex_lock(&st->lock);
+        start_sample(st);
+        /* delay (2 * tck + 20) nano seconds */
+        udelay(1);
+        stop_sample(st);
+        config_read(st, REG_FAULT, &data);
+        start_sample(st);
+        stop_sample(st);
+        mutex_unlock(&st->lock);
+
+        return 0;
+}
+
+static ssize_t ad2s1210_show_reg(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned char data;
+        struct iio_dev_attr *iattr = to_iio_dev_attr(attr);
+
+        mutex_lock(&st->lock);
+        config_read(st, iattr->address, &data);
+        mutex_unlock(&st->lock);
+        return sprintf(buf, "%d\n", data);
+}
+
+static ssize_t ad2s1210_store_reg(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t len)
+{
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+        unsigned long data;
+        int ret;
+        struct iio_dev_attr *iattr = to_iio_dev_attr(attr);
+
+        ret = strict_strtoul(buf, 10, &data);
+        if (ret)
+                return -EINVAL;
+        mutex_lock(&st->lock);
+        config_write(st, iattr->address);
+        config_write(st, data & MSB_IS_LOW);
+        mutex_unlock(&st->lock);
+        return len;
+}
+
+static ssize_t ad2s1210_show_pos(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        int ret = 0;
+        ssize_t len = 0;
+        u16 pos;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+
+        st->xfer.len = 2;
+        mutex_lock(&st->lock);
+        start_sample(st);
+        /* delay (6 * tck + 20) nano seconds */
+        udelay(1);
+
+        set_mode(MOD_POS, st);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        pos = ((((u16)(st->rx[0])) << 8) | (st->rx[1]));
+        if (st->hysteresis)
+                pos >>= 16 - st->resolution;
+        len = sprintf(buf, "%d\n", pos);
+error_ret:
+        stop_sample(st);
+        /* delay (2 * tck + 20) nano seconds */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad2s1210_show_vel(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        unsigned short negative;
+        int ret = 0;
+        ssize_t len = 0;
+        s16 vel;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+
+        st->xfer.len = 2;
+        mutex_lock(&st->lock);
+        start_sample(st);
+        /* delay (6 * tck + 20) nano seconds */
+        udelay(1);
+
+        set_mode(MOD_VEL, st);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        negative = st->rx[0] & 0x80;
+        vel = ((((s16)(st->rx[0])) << 8) | (st->rx[1]));
+        vel >>= 16 - st->resolution;
+        if (negative) {
+                negative = (0xffff >> st->resolution) << st->resolution;
+                vel |= negative;
+        }
+        len = sprintf(buf, "%d\n", vel);
+error_ret:
+        stop_sample(st);
+        /* delay (2 * tck + 20) nano seconds */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t ad2s1210_show_pos_vel(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        unsigned short negative;
+        int ret = 0;
+        ssize_t len = 0;
+        u16 pos;
+        s16 vel;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s1210_state *st = idev->dev_data;
+
+        st->xfer.len = 2;
+        mutex_lock(&st->lock);
+        start_sample(st);
+        /* delay (6 * tck + 20) nano seconds */
+        udelay(1);
+
+        set_mode(MOD_POS, st);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        pos = ((((u16)(st->rx[0])) << 8) | (st->rx[1]));
+        if (st->hysteresis)
+                pos >>= 16 - st->resolution;
+        len = sprintf(buf, "%d ", pos);
+
+        st->xfer.len = 2;
+        set_mode(MOD_VEL, st);
+        spi_message_init(&msg);
+        spi_message_add_tail(&st->xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        negative = st->rx[0] & 0x80;
+        vel = ((((s16)(st->rx[0])) << 8) | (st->rx[1]));
+        vel >>= 16 - st->resolution;
+        if (negative) {
+                negative = (0xffff >> st->resolution) << st->resolution;
+                vel |= negative;
+        }
+        len += sprintf(buf + len, "%d\n", vel);
+error_ret:
+        stop_sample(st);
+        /* delay (2 * tck + 20) nano seconds */
+        udelay(1);
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+static IIO_CONST_ATTR(description,
+        "Variable Resolution, 10-Bit to 16Bit R/D\n\
+Converter with Reference Oscillator");
+static IIO_DEVICE_ATTR(raw_io, S_IRUGO | S_IWUSR,
+                ad2s1210_show_raw, ad2s1210_store_raw, 0);
+static IIO_DEVICE_ATTR(reset, S_IWUSR,
+                NULL, ad2s1210_store_softreset, 0);
+static IIO_DEVICE_ATTR(fclkin, S_IRUGO | S_IWUSR,
+                ad2s1210_show_fclkin, ad2s1210_store_fclkin, 0);
+static IIO_DEVICE_ATTR(fexcit, S_IRUGO | S_IWUSR,
+                ad2s1210_show_fexcit,   ad2s1210_store_fexcit, 0);
+static IIO_DEVICE_ATTR(control, S_IRUGO | S_IWUSR,
+                ad2s1210_show_control, ad2s1210_store_control, 0);
+static IIO_DEVICE_ATTR(bits, S_IRUGO | S_IWUSR,
+                ad2s1210_show_resolution, ad2s1210_store_resolution, 0);
+static IIO_DEVICE_ATTR(fault, S_IRUGO | S_IWUSR,
+                ad2s1210_show_fault, ad2s1210_clear_fault, 0);
+static IIO_DEVICE_ATTR(pos, S_IRUGO,
+                ad2s1210_show_pos, NULL, 0);
+static IIO_DEVICE_ATTR(vel, S_IRUGO,
+                ad2s1210_show_vel, NULL, 0);
+static IIO_DEVICE_ATTR(pos_vel, S_IRUGO,
+                ad2s1210_show_pos_vel, NULL, 0);
+static IIO_DEVICE_ATTR(los_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_LOS_THRD);
+static IIO_DEVICE_ATTR(dos_ovr_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_DOS_OVR_THRD);
+static IIO_DEVICE_ATTR(dos_mis_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_DOS_MIS_THRD);
+static IIO_DEVICE_ATTR(dos_rst_max_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_DOS_RST_MAX_THRD);
+static IIO_DEVICE_ATTR(dos_rst_min_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_DOS_RST_MIN_THRD);
+static IIO_DEVICE_ATTR(lot_high_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_LOT_HIGH_THRD);
+static IIO_DEVICE_ATTR(lot_low_thrd, S_IRUGO | S_IWUSR,
+                ad2s1210_show_reg, ad2s1210_store_reg, REG_LOT_LOW_THRD);
+
+static struct attribute *ad2s1210_attributes[] = {
+        &iio_const_attr_description.dev_attr.attr,
+        &iio_dev_attr_raw_io.dev_attr.attr,
+        &iio_dev_attr_reset.dev_attr.attr,
+        &iio_dev_attr_fclkin.dev_attr.attr,
+        &iio_dev_attr_fexcit.dev_attr.attr,
+        &iio_dev_attr_control.dev_attr.attr,
+        &iio_dev_attr_bits.dev_attr.attr,
+        &iio_dev_attr_fault.dev_attr.attr,
+        &iio_dev_attr_pos.dev_attr.attr,
+        &iio_dev_attr_vel.dev_attr.attr,
+        &iio_dev_attr_pos_vel.dev_attr.attr,
+        &iio_dev_attr_los_thrd.dev_attr.attr,
+        &iio_dev_attr_dos_ovr_thrd.dev_attr.attr,
+        &iio_dev_attr_dos_mis_thrd.dev_attr.attr,
+        &iio_dev_attr_dos_rst_max_thrd.dev_attr.attr,
+        &iio_dev_attr_dos_rst_min_thrd.dev_attr.attr,
+        &iio_dev_attr_lot_high_thrd.dev_attr.attr,
+        &iio_dev_attr_lot_low_thrd.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad2s1210_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad2s1210_attributes,
+};
+
+static int __devinit ad2s1210_initial(struct ad2s1210_state *st)
+{
+        unsigned char data;
+        int ret;
+
+        mutex_lock(&st->lock);
+#if defined(CONFIG_AD2S1210_GPIO_INPUT)
+        st->resolution = read_resolution_pin(st);
+#elif defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+        set_resolution_pin(st);
+#endif
+
+        config_write(st, REG_CONTROL);
+        data = DEF_CONTROL & ~(SET_RESOLUTION);
+        data |= (st->resolution - RES_10) >> 1;
+        config_write(st, data);
+        ret = config_read(st, REG_CONTROL, &data);
+        if (ret)
+                goto error_ret;
+
+        if (data & MSB_IS_HIGH) {
+                ret = -EIO;
+                goto error_ret;
+        }
+
+        update_frequency_control_word(st);
+        soft_reset(st);
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static int __devinit ad2s1210_probe(struct spi_device *spi)
+{
+        struct ad2s1210_state *st;
+        int pn, ret = 0;
+        unsigned short *pins = spi->dev.platform_data;
+
+        for (pn = 0; pn < AD2S1210_PN; pn++) {
+                if (gpio_request(pins[pn], DRV_NAME)) {
+                        pr_err("%s: request gpio pin %d failed\n",
+                                                DRV_NAME, pins[pn]);
+                        goto error_ret;
+                }
+                if (pn < AD2S1210_SAA)
+                        gpio_direction_output(pins[pn], 1);
+                else {
+#if defined(CONFIG_AD2S1210_GPIO_INPUT)
+                        gpio_direction_input(pins[pn]);
+#elif defined(CONFIG_AD2S1210_GPIO_OUTPUT)
+                        gpio_direction_output(pins[pn], 1);
+#endif
+                }
+        }
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+        st->xfer.tx_buf = st->tx;
+        st->xfer.rx_buf = st->rx;
+        st->hysteresis = 1;
+        st->mode = MOD_CONFIG;
+        st->resolution = RES_12;
+        st->fclkin = AD2S1210_DEF_CLKIN;
+        st->fexcit = AD2S1210_DEF_EXCIT;
+        st->sample = pins[0];
+        st->a0 = pins[1];
+        st->a1 = pins[2];
+        st->res0 = pins[3];
+        st->res1 = pins[4];
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad2s1210_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+
+        if (spi->max_speed_hz != AD2S1210_DEF_CLKIN)
+                st->fclkin = spi->max_speed_hz;
+        spi->mode = SPI_MODE_3;
+        spi_setup(spi);
+
+        ad2s1210_initial(st);
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        for (--pn; pn >= 0; pn--)
+                gpio_free(pins[pn]);
+        return ret;
+}
+
+static int __devexit ad2s1210_remove(struct spi_device *spi)
+{
+        struct ad2s1210_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad2s1210_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad2s1210_probe,
+        .remove = __devexit_p(ad2s1210_remove),
+};
+
+static __init int ad2s1210_spi_init(void)
+{
+        return spi_register_driver(&ad2s1210_driver);
+}
+module_init(ad2s1210_spi_init);
+
+static __exit void ad2s1210_spi_exit(void)
+{
+        spi_unregister_driver(&ad2s1210_driver);
+}
+module_exit(ad2s1210_spi_exit);
+
+MODULE_AUTHOR("Graff Yang <graff.yang@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices AD2S1210 Resolver to Digital SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
new file mode 100644
index 000000000000..4143535242d9
--- /dev/null
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -0,0 +1,159 @@
+/*
+ * ad2s90.c simple support for the ADI Resolver to Digital Converters: AD2S90
+ *
+ * Copyright (c) 2010-2010 Analog Devices Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/types.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+
+#define DRV_NAME "ad2s90"
+
+struct ad2s90_state {
+        struct mutex lock;
+        struct iio_dev *idev;
+        struct spi_device *sdev;
+        u8 rx[2];
+        u8 tx[2];
+};
+
+static ssize_t ad2s90_show_angular(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct spi_message msg;
+        struct spi_transfer xfer;
+        int ret;
+        ssize_t len = 0;
+        u16 val;
+        struct iio_dev *idev = dev_get_drvdata(dev);
+        struct ad2s90_state *st = idev->dev_data;
+
+        xfer.len = 1;
+        xfer.tx_buf = st->tx;
+        xfer.rx_buf = st->rx;
+        mutex_lock(&st->lock);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+        ret = spi_sync(st->sdev, &msg);
+        if (ret)
+                goto error_ret;
+        val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+        len = sprintf(buf, "%d\n", val);
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret ? ret : len;
+}
+
+#define IIO_DEV_ATTR_SIMPLE_RESOLVER(_show) \
+        IIO_DEVICE_ATTR(angular, S_IRUGO, _show, NULL, 0)
+
+static IIO_CONST_ATTR(description,
+        "Low Cost, Complete 12-Bit Resolver-to-Digital Converter");
+static IIO_DEV_ATTR_SIMPLE_RESOLVER(ad2s90_show_angular);
+
+static struct attribute *ad2s90_attributes[] = {
+        &iio_const_attr_description.dev_attr.attr,
+        &iio_dev_attr_angular.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad2s90_attribute_group = {
+        .name = DRV_NAME,
+        .attrs = ad2s90_attributes,
+};
+
+static int __devinit ad2s90_probe(struct spi_device *spi)
+{
+        struct ad2s90_state *st;
+        int ret = 0;
+
+        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        if (st == NULL) {
+                ret = -ENOMEM;
+                goto error_ret;
+        }
+        spi_set_drvdata(spi, st);
+
+        mutex_init(&st->lock);
+        st->sdev = spi;
+
+        st->idev = iio_allocate_device();
+        if (st->idev == NULL) {
+                ret = -ENOMEM;
+                goto error_free_st;
+        }
+        st->idev->dev.parent = &spi->dev;
+        st->idev->num_interrupt_lines = 0;
+        st->idev->event_attrs = NULL;
+
+        st->idev->attrs = &ad2s90_attribute_group;
+        st->idev->dev_data = (void *)(st);
+        st->idev->driver_module = THIS_MODULE;
+        st->idev->modes = INDIO_DIRECT_MODE;
+
+        ret = iio_device_register(st->idev);
+        if (ret)
+                goto error_free_dev;
+
+        /* need 600ns between CS and the first falling edge of SCLK */
+        spi->max_speed_hz = 830000;
+        spi->mode = SPI_MODE_3;
+        spi_setup(spi);
+
+        return 0;
+
+error_free_dev:
+        iio_free_device(st->idev);
+error_free_st:
+        kfree(st);
+error_ret:
+        return ret;
+}
+
+static int __devexit ad2s90_remove(struct spi_device *spi)
+{
+        struct ad2s90_state *st = spi_get_drvdata(spi);
+
+        iio_device_unregister(st->idev);
+        kfree(st);
+
+        return 0;
+}
+
+static struct spi_driver ad2s90_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ad2s90_probe,
+        .remove = __devexit_p(ad2s90_remove),
+};
+
+static __init int ad2s90_spi_init(void)
+{
+        return spi_register_driver(&ad2s90_driver);
+}
+module_init(ad2s90_spi_init);
+
+static __exit void ad2s90_spi_exit(void)
+{
+        spi_unregister_driver(&ad2s90_driver);
+}
+module_exit(ad2s90_spi_exit);
+
+MODULE_AUTHOR("Graff Yang <graff.yang@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices AD2S90 Resolver to Digital SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index ee91a95a8b95..24b74ddcd083 100644
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -108,6 +108,12 @@ struct iio_const_attr {
         IIO_DEVICE_ATTR(name, S_IRUGO, _show, NULL, 0)
 
 /**
+ * IIO_DEV_ATTR_RESET: resets the device
+ **/
+#define IIO_DEV_ATTR_RESET(_store)                      \
+        IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, _store, 0)
+
+/**
  * IIO_CONST_ATTR_NAME - constant identifier
  * @_string: the name
  **/
diff --git a/drivers/staging/intel_sst/Kconfig b/drivers/staging/intel_sst/Kconfig
index b46bd9d1b324..82391077b384 100644
--- a/drivers/staging/intel_sst/Kconfig
+++ b/drivers/staging/intel_sst/Kconfig
@@ -8,6 +8,7 @@ config SND_INTEL_SST
 
 config SND_INTELMID
         tristate "Intel MID sound card driver"
+        depends on SOUND && SND
         select SND_PCM
         select SND_SEQUENCER
         select SND_JACK
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index 24d3928e7071..ce4a9f79ccd2 100644
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -29,11 +29,14 @@
  *  This file contains all init functions
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 #include <linux/firmware.h>
 #include <linux/miscdevice.h>
+#include <linux/pm_runtime.h>
 #include <asm/mrst.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
@@ -169,17 +172,17 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
 {
         int i, ret = 0;
 
-        pr_debug("sst: Probe for DID %x\n", pci->device);
+        pr_debug("Probe for DID %x\n", pci->device);
         mutex_lock(&drv_ctx_lock);
         if (sst_drv_ctx) {
-                pr_err("sst: Only one sst handle is supported\n");
+                pr_err("Only one sst handle is supported\n");
                 mutex_unlock(&drv_ctx_lock);
                 return -EBUSY;
         }
 
         sst_drv_ctx = kzalloc(sizeof(*sst_drv_ctx), GFP_KERNEL);
         if (!sst_drv_ctx) {
-                pr_err("sst: intel_sst malloc fail\n");
+                pr_err("malloc fail\n");
                 mutex_unlock(&drv_ctx_lock);
                 return -ENOMEM;
         }
@@ -226,7 +229,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
         spin_lock_init(&sst_drv_ctx->list_spin_lock);
 
         sst_drv_ctx->max_streams = pci_id->driver_data;
-        pr_debug("sst: Got drv data max stream %d\n",
+        pr_debug("Got drv data max stream %d\n",
                                 sst_drv_ctx->max_streams);
         for (i = 1; i <= sst_drv_ctx->max_streams; i++) {
                 struct stream_info *stream = &sst_drv_ctx->streams[i];
@@ -241,18 +244,18 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
                         sst_drv_ctx->mmap_mem =
                                 kzalloc(sst_drv_ctx->mmap_len, GFP_KERNEL);
                         if (sst_drv_ctx->mmap_mem) {
-                                pr_debug("sst: Got memory %p size 0x%x\n",
+                                pr_debug("Got memory %p size 0x%x\n",
                                         sst_drv_ctx->mmap_mem,
                                         sst_drv_ctx->mmap_len);
                                 break;
                         }
                         if (sst_drv_ctx->mmap_len < (SST_MMAP_STEP*PAGE_SIZE)) {
-                                pr_err("sst: mem alloc fail...abort!!\n");
+                                pr_err("mem alloc fail...abort!!\n");
                                 ret = -ENOMEM;
                                 goto free_process_reply_wq;
                         }
                         sst_drv_ctx->mmap_len -= (SST_MMAP_STEP * PAGE_SIZE);
-                        pr_debug("sst:mem alloc failed...trying %d\n",
+                        pr_debug("mem alloc failed...trying %d\n",
                                                 sst_drv_ctx->mmap_len);
                 }
         }
@@ -260,7 +263,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
         /* Init the device */
         ret = pci_enable_device(pci);
         if (ret) {
-                pr_err("sst: device cant be enabled\n");
+                pr_err("device cant be enabled\n");
                 goto do_free_mem;
         }
         sst_drv_ctx->pci = pci_dev_get(pci);
@@ -273,25 +276,25 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
         sst_drv_ctx->shim = pci_ioremap_bar(pci, 1);
         if (!sst_drv_ctx->shim)
                 goto do_release_regions;
-        pr_debug("sst: SST Shim Ptr %p\n", sst_drv_ctx->shim);
+        pr_debug("SST Shim Ptr %p\n", sst_drv_ctx->shim);
 
         /* Shared SRAM */
         sst_drv_ctx->mailbox = pci_ioremap_bar(pci, 2);
         if (!sst_drv_ctx->mailbox)
                 goto do_unmap_shim;
-        pr_debug("sst: SRAM Ptr %p\n", sst_drv_ctx->mailbox);
+        pr_debug("SRAM Ptr %p\n", sst_drv_ctx->mailbox);
 
         /* IRAM */
         sst_drv_ctx->iram = pci_ioremap_bar(pci, 3);
         if (!sst_drv_ctx->iram)
                 goto do_unmap_sram;
-        pr_debug("sst:IRAM Ptr %p\n", sst_drv_ctx->iram);
+        pr_debug("IRAM Ptr %p\n", sst_drv_ctx->iram);
 
         /* DRAM */
         sst_drv_ctx->dram = pci_ioremap_bar(pci, 4);
         if (!sst_drv_ctx->dram)
                 goto do_unmap_iram;
-        pr_debug("sst: DRAM Ptr %p\n", sst_drv_ctx->dram);
+        pr_debug("DRAM Ptr %p\n", sst_drv_ctx->dram);
 
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_UN_INIT;
@@ -301,26 +304,31 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
                 IRQF_SHARED, SST_DRV_NAME, sst_drv_ctx);
         if (ret)
                 goto do_unmap_dram;
-        pr_debug("sst: Registered IRQ 0x%x\n", pci->irq);
+        pr_debug("Registered IRQ 0x%x\n", pci->irq);
+
+        /*Register LPE Control as misc driver*/
+        ret = misc_register(&lpe_ctrl);
+        if (ret) {
+                pr_err("couldn't register control device\n");
+                goto do_free_irq;
+        }
 
         if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
                 ret = misc_register(&lpe_dev);
                 if (ret) {
-                        pr_err("sst: couldn't register LPE device\n");
-                        goto do_free_irq;
-                }
-
-                /*Register LPE Control as misc driver*/
-                ret = misc_register(&lpe_ctrl);
-                if (ret) {
-                        pr_err("sst: couldn't register misc driver\n");
-                        goto do_free_irq;
-                }
+                        pr_err("couldn't register misc driver\n");
+                        goto do_free_misc;
+                }
         }
         sst_drv_ctx->lpe_stalled = 0;
-        pr_debug("sst: ...successfully done!!!\n");
+        pm_runtime_set_active(&pci->dev);
+        pm_runtime_enable(&pci->dev);
+        pm_runtime_allow(&pci->dev);
+        pr_debug("...successfully done!!!\n");
         return ret;
 
+do_free_misc:
+        misc_deregister(&lpe_ctrl);
 do_free_irq:
         free_irq(pci->irq, sst_drv_ctx);
 do_unmap_dram:
@@ -347,7 +355,7 @@ free_mad_wq:
         destroy_workqueue(sst_drv_ctx->mad_wq);
 do_free_drv_ctx:
         kfree(sst_drv_ctx);
-        pr_err("sst: Probe failed with 0x%x\n", ret);
+        pr_err("Probe failed with 0x%x\n", ret);
         return ret;
 }
 
@@ -365,10 +373,9 @@ static void __devexit intel_sst_remove(struct pci_dev *pci)
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_UN_INIT;
         mutex_unlock(&sst_drv_ctx->sst_lock);
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
+        misc_deregister(&lpe_ctrl);
+        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
                 misc_deregister(&lpe_dev);
-                misc_deregister(&lpe_ctrl);
-        }
         free_irq(pci->irq, sst_drv_ctx);
         iounmap(sst_drv_ctx->dram);
         iounmap(sst_drv_ctx->iram);
@@ -404,10 +411,12 @@ int intel_sst_suspend(struct pci_dev *pci, pm_message_t state)
 {
         union config_status_reg csr;
 
-        pr_debug("sst: intel_sst_suspend called\n");
+        pr_debug("intel_sst_suspend called\n");
 
-        if (sst_drv_ctx->pb_streams != 0 || sst_drv_ctx->cp_streams != 0)
-                return -EPERM;
+        if (sst_drv_ctx->stream_cnt) {
+                pr_err("active streams,not able to suspend\n");
+                return -EBUSY;
+        }
         /*Assert RESET on LPE Processor*/
         csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
         csr.full = csr.full | 0x2;
@@ -434,17 +443,17 @@ int intel_sst_resume(struct pci_dev *pci)
 {
         int ret = 0;
 
-        pr_debug("sst: intel_sst_resume called\n");
+        pr_debug("intel_sst_resume called\n");
         if (sst_drv_ctx->sst_state != SST_SUSPENDED) {
-                pr_err("sst: SST is not in suspended state\n");
-                return -EPERM;
+                pr_err("SST is not in suspended state\n");
+                return 0;
         }
         sst_drv_ctx = pci_get_drvdata(pci);
         pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
         ret = pci_enable_device(pci);
         if (ret)
-                pr_err("sst: device cant be enabled\n");
+                pr_err("device cant be enabled\n");
 
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_UN_INIT;
@@ -452,6 +461,34 @@ int intel_sst_resume(struct pci_dev *pci)
         return 0;
 }
 
+static int intel_sst_runtime_suspend(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        pr_debug("runtime_suspend called\n");
+        return intel_sst_suspend(pci_dev, PMSG_SUSPEND);
+}
+
+static int intel_sst_runtime_resume(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        pr_debug("runtime_resume called\n");
+        return intel_sst_resume(pci_dev);
+}
+
+static int intel_sst_runtime_idle(struct device *dev)
+{
+        pr_debug("runtime_idle called\n");
+        if (sst_drv_ctx->stream_cnt == 0 && sst_drv_ctx->am_cnt == 0)
+                pm_schedule_suspend(dev, SST_SUSPEND_DELAY);
+        return -EBUSY;
+}
+
+static const struct dev_pm_ops intel_sst_pm = {
+        .runtime_suspend = intel_sst_runtime_suspend,
+        .runtime_resume = intel_sst_runtime_resume,
+        .runtime_idle = intel_sst_runtime_idle,
+};
+
 /* PCI Routines */
 static struct pci_device_id intel_sst_ids[] = {
         { PCI_VDEVICE(INTEL, SST_MRST_PCI_ID), 3},
@@ -468,6 +505,9 @@ static struct pci_driver driver = {
 #ifdef CONFIG_PM
         .suspend = intel_sst_suspend,
         .resume = intel_sst_resume,
+        .driver = {
+                .pm = &intel_sst_pm,
+        },
 #endif
 };
 
@@ -482,14 +522,14 @@ static int __init intel_sst_init(void)
 {
         /* Init all variables, data structure etc....*/
         int ret = 0;
-        pr_debug("sst: INFO: ******** SST DRIVER loading.. Ver: %s\n",
+        pr_debug("INFO: ******** SST DRIVER loading.. Ver: %s\n",
                                        SST_DRIVER_VERSION);
 
         mutex_init(&drv_ctx_lock);
         /* Register with PCI */
         ret = pci_register_driver(&driver);
         if (ret)
-                pr_err("sst: PCI register failed\n");
+                pr_err("PCI register failed\n");
         return ret;
 }
 
@@ -504,7 +544,7 @@ static void __exit intel_sst_exit(void)
 {
         pci_unregister_driver(&driver);
 
-        pr_debug("sst: driver unloaded\n");
+        pr_debug("driver unloaded\n");
         return;
 }
 
diff --git a/drivers/staging/intel_sst/intel_sst.h b/drivers/staging/intel_sst/intel_sst.h
index 1f19f0d1d316..cb03ff7d1a21 100644
--- a/drivers/staging/intel_sst/intel_sst.h
+++ b/drivers/staging/intel_sst/intel_sst.h
@@ -29,6 +29,7 @@
  *      and middleware.
  *  This file is shared between the SST and MAD drivers
  */
+#include "intel_sst_ioctl.h"
 
 #define SST_CARD_NAMES "intel_mid_card"
 
@@ -107,10 +108,15 @@ struct snd_pmic_ops {
         int (*power_down_pmic) (void);
 };
 
+struct intel_sst_pcm_control {
+        int (*open) (struct snd_sst_params *str_param);
+        int (*device_control) (int cmd, void *arg);
+        int (*close) (unsigned int str_id);
+};
 struct intel_sst_card_ops {
         char *module_name;
         unsigned int  vendor_id;
-        int (*control_set) (int control_element, void *value);
+        struct intel_sst_pcm_control *pcm_control;
         struct snd_pmic_ops *scard_ops;
 };
 
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
index 991440015e92..a367991d5600 100644
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_app_interface.c
@@ -27,12 +27,15 @@
  *  Upper layer interfaces (MAD driver, MMF) to SST driver
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/uio.h>
 #include <linux/aio.h>
 #include <linux/uaccess.h>
 #include <linux/firmware.h>
+#include <linux/pm_runtime.h>
 #include <linux/ioctl.h>
 #ifdef CONFIG_MRST_RAR_HANDLER
 #include <linux/rar_register.h>
@@ -58,14 +61,14 @@ static int intel_sst_check_device(void)
 {
         int retval = 0;
         if (sst_drv_ctx->pmic_state != SND_MAD_INIT_DONE) {
-                pr_warn("sst: Sound card not availble\n ");
+                pr_warn("Sound card not available\n");
                 return -EIO;
         }
         if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
-                pr_debug("sst: Resuming from Suspended state\n");
+                pr_debug("Resuming from Suspended state\n");
                 retval = intel_sst_resume(sst_drv_ctx->pci);
                 if (retval) {
-                        pr_debug("sst: Resume Failed= %#x,abort\n", retval);
+                        pr_debug("Resume Failed= %#x,abort\n", retval);
                         return retval;
                 }
         }
@@ -97,15 +100,22 @@ static int intel_sst_check_device(void)
  */
 int intel_sst_open(struct inode *i_node, struct file *file_ptr)
 {
-        int retval = intel_sst_check_device();
-        if (retval)
-                return retval;
+        unsigned int retval;
 
         mutex_lock(&sst_drv_ctx->stream_lock);
+        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
+        retval = intel_sst_check_device();
+        if (retval) {
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
+                mutex_unlock(&sst_drv_ctx->stream_lock);
+                return retval;
+        }
+
         if (sst_drv_ctx->encoded_cnt < MAX_ENC_STREAM) {
                 struct ioctl_pvt_data *data =
                         kzalloc(sizeof(struct ioctl_pvt_data), GFP_KERNEL);
                 if (!data) {
+                        pm_runtime_put(&sst_drv_ctx->pci->dev);
                         mutex_unlock(&sst_drv_ctx->stream_lock);
                         return -ENOMEM;
                 }
@@ -115,9 +125,10 @@ int intel_sst_open(struct inode *i_node, struct file *file_ptr)
                 data->pvt_id = sst_assign_pvt_id(sst_drv_ctx);
                 data->str_id = 0;
                 file_ptr->private_data = (void *)data;
-                pr_debug("sst: pvt_id handle = %d!\n", data->pvt_id);
+                pr_debug("pvt_id handle = %d!\n", data->pvt_id);
         } else {
                 retval = -EUSERS;
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
                 mutex_unlock(&sst_drv_ctx->stream_lock);
         }
         return retval;
@@ -136,18 +147,26 @@ int intel_sst_open(struct inode *i_node, struct file *file_ptr)
  */
 int intel_sst_open_cntrl(struct inode *i_node, struct file *file_ptr)
 {
-        int retval = intel_sst_check_device();
-        if (retval)
-                return retval;
+        unsigned int retval;
 
         /* audio manager open */
         mutex_lock(&sst_drv_ctx->stream_lock);
+        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
+        retval = intel_sst_check_device();
+        if (retval) {
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
+                mutex_unlock(&sst_drv_ctx->stream_lock);
+                return retval;
+        }
+
         if (sst_drv_ctx->am_cnt < MAX_AM_HANDLES) {
                 sst_drv_ctx->am_cnt++;
-                pr_debug("sst: AM handle opened...\n");
+                pr_debug("AM handle opened...\n");
                 file_ptr->private_data = NULL;
-        } else
+        } else {
                 retval = -EACCES;
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
+        }
 
         mutex_unlock(&sst_drv_ctx->stream_lock);
         return retval;
@@ -166,10 +185,11 @@ int intel_sst_release(struct inode *i_node, struct file *file_ptr)
 {
         struct ioctl_pvt_data *data = file_ptr->private_data;
 
-        pr_debug("sst: Release called, closing app handle\n");
+        pr_debug("Release called, closing app handle\n");
         mutex_lock(&sst_drv_ctx->stream_lock);
         sst_drv_ctx->encoded_cnt--;
         sst_drv_ctx->stream_cnt--;
+        pm_runtime_put(&sst_drv_ctx->pci->dev);
         mutex_unlock(&sst_drv_ctx->stream_lock);
         free_stream_context(data->str_id);
         kfree(data);
@@ -181,8 +201,9 @@ int intel_sst_release_cntrl(struct inode *i_node, struct file *file_ptr)
         /* audio manager close */
         mutex_lock(&sst_drv_ctx->stream_lock);
         sst_drv_ctx->am_cnt--;
+        pm_runtime_put(&sst_drv_ctx->pci->dev);
         mutex_unlock(&sst_drv_ctx->stream_lock);
-        pr_debug("sst: AM handle closed\n");
+        pr_debug("AM handle closed\n");
         return 0;
 }
 
@@ -208,7 +229,7 @@ int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma)
                 return -EINVAL;
 
         length = vma->vm_end - vma->vm_start;
-        pr_debug("sst: called for stream %d length 0x%x\n", str_id, length);
+        pr_debug("called for stream %d length 0x%x\n", str_id, length);
 
         if (length > sst_drv_ctx->mmap_len)
                 return -ENOMEM;
@@ -231,7 +252,7 @@ int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma)
         else
                 sst_drv_ctx->streams[str_id].mmapped = true;
 
-        pr_debug("sst: mmap ret 0x%x\n", retval);
+        pr_debug("mmap ret 0x%x\n", retval);
         return retval;
 }
 
@@ -245,7 +266,7 @@ static int intel_sst_mmap_play_capture(u32 str_id,
         struct snd_sst_mmap_buff_entry *buf_entry;
         struct snd_sst_mmap_buff_entry *tmp_buf;
 
-        pr_debug("sst:called for str_id %d\n", str_id);
+        pr_debug("called for str_id %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return -EINVAL;
@@ -270,7 +291,7 @@ static int intel_sst_mmap_play_capture(u32 str_id,
                 goto out_free;
         }
 
-        pr_debug("sst:new buffers count %d status %d\n",
+        pr_debug("new buffers count %d status %d\n",
                         mmap_buf->entries, stream->status);
         buf_entry = tmp_buf;
         for (i = 0; i < mmap_buf->entries; i++) {
@@ -300,14 +321,14 @@ static int intel_sst_mmap_play_capture(u32 str_id,
                 stream->status = STREAM_RUNNING;
                 if (stream->ops == STREAM_OPS_PLAYBACK) {
                         if (sst_play_frame(str_id) < 0) {
-                                pr_warn("sst: play frames fail\n");
+                                pr_warn("play frames fail\n");
                                 mutex_unlock(&stream->lock);
                                 retval = -EIO;
                                 goto out_free;
                         }
                 } else if (stream->ops == STREAM_OPS_CAPTURE) {
                         if (sst_capture_frame(str_id) < 0) {
-                                pr_warn("sst: capture frame fail\n");
+                                pr_warn("capture frame fail\n");
                                 mutex_unlock(&stream->lock);
                                 retval = -EIO;
                                 goto out_free;
@@ -324,7 +345,7 @@ static int intel_sst_mmap_play_capture(u32 str_id,
 
         if (retval >= 0)
                 retval = stream->cumm_bytes;
-        pr_debug("sst:end of play/rec ioctl bytes = %d!!\n", retval);
+        pr_debug("end of play/rec ioctl bytes = %d!!\n", retval);
 
 out_free:
         kfree(tmp_buf);
@@ -349,7 +370,7 @@ static int intel_sst_play_capture(struct stream_info *stream, int str_id)
 
         if (stream->status == STREAM_INIT && stream->prev == STREAM_UN_INIT) {
                 /* stream is not started yet */
-                pr_debug("sst: Stream isn't in started state %d, prev %d\n",
+                pr_debug("Stream isn't in started state %d, prev %d\n",
                         stream->status, stream->prev);
         } else if ((stream->status == STREAM_RUNNING ||
                         stream->status == STREAM_PAUSED) &&
@@ -358,13 +379,13 @@ static int intel_sst_play_capture(struct stream_info *stream, int str_id)
                 if (stream->ops == STREAM_OPS_PLAYBACK ||
                                 stream->ops == STREAM_OPS_PLAYBACK_DRM) {
                         if (sst_play_frame(str_id) < 0) {
-                                pr_warn("sst: play frames failed\n");
+                                pr_warn("play frames failed\n");
                                 mutex_unlock(&stream->lock);
                                 return -EIO;
                         }
                 } else if (stream->ops == STREAM_OPS_CAPTURE) {
                         if (sst_capture_frame(str_id) < 0) {
-                                pr_warn("sst: capture frames failed\n ");
+                                pr_warn("capture frames failed\n");
                                 mutex_unlock(&stream->lock);
                                 return -EIO;
                         }
@@ -379,7 +400,7 @@ static int intel_sst_play_capture(struct stream_info *stream, int str_id)
         retval = sst_wait_interruptible(sst_drv_ctx, &stream->data_blk);
         if (retval) {
                 stream->status = STREAM_INIT;
-                pr_debug("sst: wait returned error...\n");
+                pr_debug("wait returned error...\n");
         }
         return retval;
 }
@@ -477,7 +498,7 @@ static int snd_sst_fill_kernel_list(struct stream_info *stream,
                 if (((unsigned long)iovec[index].iov_base
                                 + iovec[index].iov_len) <
                                 ((unsigned long)iovec[index].iov_base)) {
-                        pr_debug("sst: Buffer overflows");
+                        pr_debug("Buffer overflows\n");
                         kfree(stream_bufs);
                         return -EINVAL;
                 }
@@ -490,7 +511,7 @@ static int snd_sst_fill_kernel_list(struct stream_info *stream,
                 }
 
                 copied_size += size;
-                pr_debug("sst: copied_size - %lx\n", copied_size);
+                pr_debug("copied_size - %lx\n", copied_size);
                 if ((copied_size >= mmap_len) ||
                                 (stream->sg_index == nr_segs)) {
                         add_to_list = 1;
@@ -520,7 +541,7 @@ static int snd_sst_copy_userbuf_capture(struct stream_info *stream,
         int retval = 0;
 
         /* copy sent buffers */
-        pr_debug("sst: capture stream copying to user now...\n");
+        pr_debug("capture stream copying to user now...\n");
         list_for_each_entry_safe(kbufs, _kbufs, &stream->bufs, node) {
                 if (kbufs->in_use == true) {
                         /* copy to user */
@@ -538,7 +559,7 @@ static int snd_sst_copy_userbuf_capture(struct stream_info *stream,
                         }
                 }
         }
-        pr_debug("sst: end of cap copy\n");
+        pr_debug("end of cap copy\n");
         return retval;
 }
 
@@ -590,7 +611,7 @@ static int intel_sst_read_write(unsigned int str_id, char __user *buf,
                 return -EINVAL;
         stream = &sst_drv_ctx->streams[str_id];
         if (stream->mmapped == true) {
-                pr_warn("sst: user write and stream is mapped");
+                pr_warn("user write and stream is mapped\n");
                 return -EIO;
         }
         if (!count)
@@ -598,7 +619,7 @@ static int intel_sst_read_write(unsigned int str_id, char __user *buf,
         stream->curr_bytes = 0;
         stream->cumm_bytes = 0;
         /* copy user buf details */
-        pr_debug("sst: new buffers %p, copy size %d, status %d\n" ,
+        pr_debug("new buffers %p, copy size %d, status %d\n" ,
                         buf, (int) count, (int) stream->status);
 
         stream->buf_type = SST_BUF_USER_STATIC;
@@ -618,7 +639,7 @@ static int intel_sst_read_write(unsigned int str_id, char __user *buf,
         stream->cur_ptr = NULL;
         if (retval >= 0)
                 retval = stream->cumm_bytes;
-        pr_debug("sst: end of play/rec bytes = %d!!\n", retval);
+        pr_debug("end of play/rec bytes = %d!!\n", retval);
         return retval;
 }
 
@@ -639,7 +660,7 @@ int intel_sst_write(struct file *file_ptr, const char __user *buf,
         int str_id = data->str_id;
         struct stream_info *stream = &sst_drv_ctx->streams[str_id];
 
-        pr_debug("sst: called for %d\n", str_id);
+        pr_debug("called for %d\n", str_id);
         if (stream->status == STREAM_UN_INIT ||
                 stream->status == STREAM_DECODE) {
                 return -EBADRQC;
@@ -665,12 +686,12 @@ ssize_t intel_sst_aio_write(struct kiocb *kiocb, const struct iovec *iov,
         int str_id = data->str_id;
         struct stream_info *stream;
 
-        pr_debug("sst: entry - %ld\n", nr_segs);
+        pr_debug("entry - %ld\n", nr_segs);
 
         if (is_sync_kiocb(kiocb) == false)
                 return -EINVAL;
 
-        pr_debug("sst: called for str_id %d\n", str_id);
+        pr_debug("called for str_id %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return -EINVAL;
@@ -683,7 +704,7 @@ ssize_t intel_sst_aio_write(struct kiocb *kiocb, const struct iovec *iov,
         }
         stream->curr_bytes = 0;
         stream->cumm_bytes = 0;
-        pr_debug("sst: new segs %ld, offset %d, status %d\n" ,
+        pr_debug("new segs %ld, offset %d, status %d\n" ,
                         nr_segs, (int) offset, (int) stream->status);
         stream->buf_type = SST_BUF_USER_STATIC;
         do {
@@ -698,7 +719,7 @@ ssize_t intel_sst_aio_write(struct kiocb *kiocb, const struct iovec *iov,
         stream->cur_ptr = NULL;
         if (retval >= 0)
                 retval = stream->cumm_bytes;
-        pr_debug("sst: end of play/rec bytes = %d!!\n", retval);
+        pr_debug("end of play/rec bytes = %d!!\n", retval);
         return retval;
 }
 
@@ -719,7 +740,7 @@ int intel_sst_read(struct file *file_ptr, char __user *buf,
         int str_id = data->str_id;
         struct stream_info *stream = &sst_drv_ctx->streams[str_id];
 
-        pr_debug("sst: called for %d\n", str_id);
+        pr_debug("called for %d\n", str_id);
         if (stream->status == STREAM_UN_INIT ||
                         stream->status == STREAM_DECODE)
                 return -EBADRQC;
@@ -744,14 +765,14 @@ ssize_t intel_sst_aio_read(struct kiocb *kiocb, const struct iovec *iov,
         int str_id = data->str_id;
         struct stream_info *stream;
 
-        pr_debug("sst: entry - %ld\n", nr_segs);
+        pr_debug("entry - %ld\n", nr_segs);
 
         if (is_sync_kiocb(kiocb) == false) {
-                pr_debug("sst: aio_read from user space is not allowed\n");
+                pr_debug("aio_read from user space is not allowed\n");
                 return -EINVAL;
         }
 
-        pr_debug("sst: called for str_id %d\n", str_id);
+        pr_debug("called for str_id %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return -EINVAL;
@@ -764,7 +785,7 @@ ssize_t intel_sst_aio_read(struct kiocb *kiocb, const struct iovec *iov,
         stream->curr_bytes = 0;
         stream->cumm_bytes = 0;
 
-        pr_debug("sst: new segs %ld, offset %d, status %d\n" ,
+        pr_debug("new segs %ld, offset %d, status %d\n" ,
                         nr_segs, (int) offset, (int) stream->status);
         stream->buf_type = SST_BUF_USER_STATIC;
         do {
@@ -779,34 +800,169 @@ ssize_t intel_sst_aio_read(struct kiocb *kiocb, const struct iovec *iov,
         stream->cur_ptr = NULL;
         if (retval >= 0)
                 retval = stream->cumm_bytes;
-        pr_debug("sst: end of play/rec bytes = %d!!\n", retval);
+        pr_debug("end of play/rec bytes = %d!!\n", retval);
         return retval;
 }
 
 /* sst_print_stream_params - prints the stream parameters (debug fn)*/
 static void sst_print_stream_params(struct snd_sst_get_stream_params *get_prm)
 {
-        pr_debug("sst: codec params:result =%d\n",
+        pr_debug("codec params:result = %d\n",
                                 get_prm->codec_params.result);
-        pr_debug("sst: codec params:stream = %d\n",
+        pr_debug("codec params:stream = %d\n",
                                 get_prm->codec_params.stream_id);
-        pr_debug("sst: codec params:codec = %d\n",
+        pr_debug("codec params:codec = %d\n",
                                 get_prm->codec_params.codec);
-        pr_debug("sst: codec params:ops = %d\n",
+        pr_debug("codec params:ops = %d\n",
                                 get_prm->codec_params.ops);
-        pr_debug("sst: codec params:stream_type= %d\n",
+        pr_debug("codec params:stream_type = %d\n",
                                 get_prm->codec_params.stream_type);
-        pr_debug("sst: pcmparams:sfreq= %d\n",
+        pr_debug("pcmparams:sfreq = %d\n",
                                 get_prm->pcm_params.sfreq);
-        pr_debug("sst: pcmparams:num_chan= %d\n",
+        pr_debug("pcmparams:num_chan = %d\n",
                                 get_prm->pcm_params.num_chan);
-        pr_debug("sst: pcmparams:pcm_wd_sz= %d\n",
+        pr_debug("pcmparams:pcm_wd_sz = %d\n",
                                 get_prm->pcm_params.pcm_wd_sz);
         return;
 }
 
 /**
- * intel_sst_ioctl - recieves the device ioctl's
+ * sst_create_algo_ipc - create ipc msg for algorithm parameters
+ *
+ * @algo_params: Algorithm parameters
+ * @msg: post msg pointer
+ *
+ * This function is called to create ipc msg
+ */
+int sst_create_algo_ipc(struct snd_ppp_params *algo_params,
+                                        struct ipc_post **msg)
+{
+        if (sst_create_large_msg(msg))
+                return -ENOMEM;
+        sst_fill_header(&(*msg)->header,
+                        IPC_IA_ALG_PARAMS, 1, algo_params->str_id);
+        (*msg)->header.part.data = sizeof(u32) +
+                        sizeof(*algo_params) + algo_params->size;
+        memcpy((*msg)->mailbox_data, &(*msg)->header, sizeof(u32));
+        memcpy((*msg)->mailbox_data + sizeof(u32),
+                                algo_params, sizeof(*algo_params));
+        return 0;
+}
+
+/**
+ * sst_send_algo_ipc - send ipc msg for algorithm parameters
+ *
+ * @msg: post msg pointer
+ *
+ * This function is called to send ipc msg
+ */
+int sst_send_algo_ipc(struct ipc_post **msg)
+{
+        sst_drv_ctx->ppp_params_blk.condition = false;
+        sst_drv_ctx->ppp_params_blk.ret_code = 0;
+        sst_drv_ctx->ppp_params_blk.on = true;
+        sst_drv_ctx->ppp_params_blk.data = NULL;
+        spin_lock(&sst_drv_ctx->list_spin_lock);
+        list_add_tail(&(*msg)->node, &sst_drv_ctx->ipc_dispatch_list);
+        spin_unlock(&sst_drv_ctx->list_spin_lock);
+        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
+        return sst_wait_interruptible_timeout(sst_drv_ctx,
+                        &sst_drv_ctx->ppp_params_blk, SST_BLOCK_TIMEOUT);
+}
+
+/**
+ * intel_sst_ioctl_dsp - recieves the device ioctl's
+ *
+ * @cmd:Ioctl cmd
+ * @arg:data
+ *
+ * This function is called when a user space component
+ * sends a DSP Ioctl to SST driver
+ */
+long intel_sst_ioctl_dsp(unsigned int cmd, unsigned long arg)
+{
+        int retval = 0;
+        struct snd_ppp_params algo_params;
+        struct snd_ppp_params *algo_params_copied;
+        struct ipc_post *msg;
+
+        switch (_IOC_NR(cmd)) {
+        case _IOC_NR(SNDRV_SST_SET_ALGO):
+                if (copy_from_user(&algo_params, (void __user *)arg,
+                                                        sizeof(algo_params)))
+                        return -EFAULT;
+                if (algo_params.size > SST_MAILBOX_SIZE)
+                        return -EMSGSIZE;
+
+                pr_debug("Algo ID %d Str id %d Enable %d Size %d\n",
+                        algo_params.algo_id, algo_params.str_id,
+                        algo_params.enable, algo_params.size);
+                retval = sst_create_algo_ipc(&algo_params, &msg);
+                if (retval)
+                        break;
+                algo_params.reserved = 0;
+                if (copy_from_user(msg->mailbox_data + sizeof(algo_params),
+                                algo_params.params, algo_params.size))
+                        return -EFAULT;
+
+                retval = sst_send_algo_ipc(&msg);
+                if (retval) {
+                        pr_debug("Error in sst_set_algo = %d\n", retval);
+                        retval = -EIO;
+                }
+                break;
+
+        case _IOC_NR(SNDRV_SST_GET_ALGO):
+                if (copy_from_user(&algo_params, (void __user *)arg,
+                                                        sizeof(algo_params)))
+                        return -EFAULT;
+                pr_debug("Algo ID %d Str id %d Enable %d Size %d\n",
+                        algo_params.algo_id, algo_params.str_id,
+                        algo_params.enable, algo_params.size);
+                retval = sst_create_algo_ipc(&algo_params, &msg);
+                if (retval)
+                        break;
+                algo_params.reserved = 1;
+                retval = sst_send_algo_ipc(&msg);
+                if (retval) {
+                        pr_debug("Error in sst_get_algo = %d\n", retval);
+                        retval = -EIO;
+                        break;
+                }
+                algo_params_copied = (struct snd_ppp_params *)
+                                        sst_drv_ctx->ppp_params_blk.data;
+                if (algo_params_copied->size > algo_params.size) {
+                        pr_debug("mem insufficient to copy\n");
+                        retval = -EMSGSIZE;
+                        goto free_mem;
+                } else {
+                        char __user *tmp;
+
+                        if (copy_to_user(algo_params.params,
+                                        algo_params_copied->params,
+                                        algo_params_copied->size)) {
+                                retval = -EFAULT;
+                                goto free_mem;
+                        }
+                        tmp = (char __user *)arg + offsetof(
+                                        struct snd_ppp_params, size);
+                        if (copy_to_user(tmp, &algo_params_copied->size,
+                                                 sizeof(__u32))) {
+                                retval = -EFAULT;
+                                goto free_mem;
+                        }
+
+                }
+free_mem:
+                kfree(algo_params_copied->params);
+                kfree(algo_params_copied);
+                break;
+        }
+        return retval;
+}
+
+/**
+ * intel_sst_ioctl - receives the device ioctl's
  * @file_ptr:pointer to file
  * @cmd:Ioctl cmd
  * @arg:data
@@ -832,7 +988,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
 
         switch (_IOC_NR(cmd)) {
         case _IOC_NR(SNDRV_SST_STREAM_PAUSE):
-                pr_debug("sst: IOCTL_PAUSE recieved for %d!\n", str_id);
+                pr_debug("IOCTL_PAUSE received for %d!\n", str_id);
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -841,7 +997,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                 break;
 
         case _IOC_NR(SNDRV_SST_STREAM_RESUME):
-                pr_debug("sst: SNDRV_SST_IOCTL_RESUME recieved!\n");
+                pr_debug("SNDRV_SST_IOCTL_RESUME received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -852,7 +1008,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_STREAM_SET_PARAMS): {
                 struct snd_sst_params str_param;
 
-                pr_debug("sst: IOCTL_SET_PARAMS recieved!\n");
+                pr_debug("IOCTL_SET_PARAMS received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -884,7 +1040,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                                         retval = -EINVAL;
                         }
                 } else {
-                        pr_debug("sst: SET_STREAM_PARAMS recieved!\n");
+                        pr_debug("SET_STREAM_PARAMS received!\n");
                         /* allocated set params only */
                         retval = sst_set_stream_param(str_id, &str_param);
                         /* Block the call for reply */
@@ -907,14 +1063,14 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
 
                 if (copy_from_user(&set_vol, (void __user *)arg,
                                 sizeof(set_vol))) {
-                        pr_debug("sst: copy failed\n");
+                        pr_debug("copy failed\n");
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("sst: SET_VOLUME recieved for %d!\n",
+                pr_debug("SET_VOLUME recieved for %d!\n",
                                 set_vol.stream_id);
                 if (minor == STREAM_MODULE && set_vol.stream_id == 0) {
-                        pr_debug("sst: invalid operation!\n");
+                        pr_debug("invalid operation!\n");
                         retval = -EPERM;
                         break;
                 }
@@ -929,10 +1085,10 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("sst: IOCTL_GET_VOLUME recieved for stream = %d!\n",
+                pr_debug("IOCTL_GET_VOLUME recieved for stream = %d!\n",
                                 get_vol.stream_id);
                 if (minor == STREAM_MODULE && get_vol.stream_id == 0) {
-                        pr_debug("sst: invalid operation!\n");
+                        pr_debug("invalid operation!\n");
                         retval = -EPERM;
                         break;
                 }
@@ -941,7 +1097,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EIO;
                         break;
                 }
-                pr_debug("sst: id:%d\n, vol:%d, ramp_dur:%d, ramp_type:%d\n",
+                pr_debug("id:%d\n, vol:%d, ramp_dur:%d, ramp_type:%d\n",
                                 get_vol.stream_id, get_vol.volume,
                                 get_vol.ramp_duration, get_vol.ramp_type);
                 if (copy_to_user((struct snd_sst_vol __user *)arg,
@@ -961,7 +1117,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                         retval = -EFAULT;
                         break;
                 }
-                pr_debug("sst: SNDRV_SST_SET_VOLUME recieved for %d!\n",
+                pr_debug("SNDRV_SST_SET_VOLUME recieved for %d!\n",
                         set_mute.stream_id);
                 if (minor == STREAM_MODULE && set_mute.stream_id == 0) {
                         retval = -EPERM;
@@ -973,7 +1129,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_STREAM_GET_PARAMS): {
                 struct snd_sst_get_stream_params get_params;
 
-                pr_debug("sst: IOCTL_GET_PARAMS recieved!\n");
+                pr_debug("IOCTL_GET_PARAMS received!\n");
                 if (minor != 0) {
                         retval = -EBADRQC;
                         break;
@@ -997,7 +1153,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): {
                 struct snd_sst_mmap_buffs mmap_buf;
 
-                pr_debug("sst: SNDRV_SST_MMAP_PLAY/CAPTURE recieved!\n");
+                pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE recieved!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -1011,7 +1167,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                 break;
         }
         case _IOC_NR(SNDRV_SST_STREAM_DROP):
-                pr_debug("sst: SNDRV_SST_IOCTL_DROP recieved!\n");
+                pr_debug("SNDRV_SST_IOCTL_DROP received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EINVAL;
                         break;
@@ -1023,7 +1179,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                 struct snd_sst_tstamp tstamp = {0};
                 unsigned long long time, freq, mod;
 
-                pr_debug("sst: SNDRV_SST_STREAM_GET_TSTAMP recieved!\n");
+                pr_debug("SNDRV_SST_STREAM_GET_TSTAMP received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -1044,7 +1200,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_STREAM_START):{
                 struct stream_info *stream;
 
-                pr_debug("sst: SNDRV_SST_STREAM_START recieved!\n");
+                pr_debug("SNDRV_SST_STREAM_START received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EINVAL;
                         break;
@@ -1083,7 +1239,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): {
                 struct snd_sst_target_device target_device;
 
-                pr_debug("sst: SET_TARGET_DEVICE recieved!\n");
+                pr_debug("SET_TARGET_DEVICE recieved!\n");
                 if (copy_from_user(&target_device, (void __user *)arg,
                                 sizeof(target_device))) {
                         retval = -EFAULT;
@@ -1100,7 +1256,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
         case _IOC_NR(SNDRV_SST_DRIVER_INFO): {
                 struct snd_sst_driver_info info;
 
-                pr_debug("sst: SNDRV_SST_DRIVER_INFO recived\n");
+                pr_debug("SNDRV_SST_DRIVER_INFO recived\n");
                 info.version = SST_VERSION_NUM;
                 /* hard coding, shud get sumhow later */
                 info.active_pcm_streams = sst_drv_ctx->stream_cnt -
@@ -1122,7 +1278,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
                 struct snd_sst_buff_entry *ibuf_tmp, *obuf_tmp;
                 char __user *dest;
 
-                pr_debug("sst: SNDRV_SST_STREAM_DECODE recived\n");
+                pr_debug("SNDRV_SST_STREAM_DECODE received\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EBADRQC;
                         break;
@@ -1197,7 +1353,7 @@ free_iobufs:
         }
 
         case _IOC_NR(SNDRV_SST_STREAM_DRAIN):
-                pr_debug("sst: SNDRV_SST_STREAM_DRAIN recived\n");
+                pr_debug("SNDRV_SST_STREAM_DRAIN received\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EINVAL;
                         break;
@@ -1209,7 +1365,7 @@ free_iobufs:
                 unsigned long long __user *bytes = (unsigned long long __user *)arg;
                 struct snd_sst_tstamp tstamp = {0};
 
-                pr_debug("sst: STREAM_BYTES_DECODED recieved!\n");
+                pr_debug("STREAM_BYTES_DECODED received!\n");
                 if (minor != STREAM_MODULE) {
                         retval = -EINVAL;
                         break;
@@ -1225,7 +1381,7 @@ free_iobufs:
         case _IOC_NR(SNDRV_SST_FW_INFO): {
                 struct snd_sst_fw_info *fw_info;
 
-                pr_debug("sst: SNDRV_SST_FW_INFO recived\n");
+                pr_debug("SNDRV_SST_FW_INFO received\n");
 
                 fw_info = kzalloc(sizeof(*fw_info), GFP_ATOMIC);
                 if (!fw_info) {
@@ -1248,10 +1404,18 @@ free_iobufs:
                 kfree(fw_info);
                 break;
         }
+        case _IOC_NR(SNDRV_SST_GET_ALGO):
+        case _IOC_NR(SNDRV_SST_SET_ALGO):
+                if (minor != AM_MODULE) {
+                        retval = -EBADRQC;
+                        break;
+                }
+                retval = intel_sst_ioctl_dsp(cmd, arg);
+                break;
         default:
                 retval = -EINVAL;
         }
-        pr_debug("sst: intel_sst_ioctl:complete ret code = %d\n", retval);
+        pr_debug("intel_sst_ioctl:complete ret code = %d\n", retval);
         return retval;
 }
 
diff --git a/drivers/staging/intel_sst/intel_sst_common.h b/drivers/staging/intel_sst/intel_sst_common.h
index bf0ead78bfae..0a60e865b696 100644
--- a/drivers/staging/intel_sst/intel_sst_common.h
+++ b/drivers/staging/intel_sst/intel_sst_common.h
@@ -28,15 +28,15 @@
  *  Common private declarations for SST
  */
 
-#define SST_DRIVER_VERSION "1.2.05"
-#define SST_VERSION_NUM 0x1205
+#define SST_DRIVER_VERSION "1.2.09"
+#define SST_VERSION_NUM 0x1209
 
 /* driver names */
 #define SST_DRV_NAME "intel_sst_driver"
-#define SST_FW_FILENAME_MRST "fw_sst_080a.bin"
-#define SST_FW_FILENAME_MFLD "fw_sst_082f.bin"
 #define SST_MRST_PCI_ID 0x080A
 #define SST_MFLD_PCI_ID 0x082F
+#define PCI_ID_LENGTH 4
+#define SST_SUSPEND_DELAY 2000
 
 enum sst_states {
         SST_FW_LOADED = 1,
@@ -392,7 +392,7 @@ struct intel_sst_drv {
 
         struct stream_info      streams[MAX_NUM_STREAMS];
         struct stream_alloc_block alloc_block[MAX_ACTIVE_STREAM];
-        struct sst_block        tgt_dev_blk, fw_info_blk,
+        struct sst_block        tgt_dev_blk, fw_info_blk, ppp_params_blk,
                                 vol_info_blk, mute_info_blk, hs_info_blk;
         struct mutex            list_lock;/* mutex for IPC list locking */
         spinlock_t      list_spin_lock; /* mutex for IPC list locking */
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index 669e298016f2..ea8e251b5099 100644
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -26,10 +26,13 @@
  *  Upper layer interfaces (MAD driver, MMF) to SST driver
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/firmware.h>
+#include <linux/pm_runtime.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
 #include "intel_sst_fw_ipc.h"
@@ -45,17 +48,18 @@ int sst_download_fw(void)
 {
         int retval;
         const struct firmware *fw_sst;
-        const char *name;
+        char name[20];
+
         if (sst_drv_ctx->sst_state != SST_UN_INIT)
                 return -EPERM;
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                name = SST_FW_FILENAME_MRST;
-        else
-                name = SST_FW_FILENAME_MFLD;
-        pr_debug("sst: Downloading %s FW now...\n", name);
+
+        snprintf(name, sizeof(name), "%s%04x%s", "fw_sst_",
+                                        sst_drv_ctx->pci_id, ".bin");
+
+        pr_debug("Downloading %s FW now...\n", name);
         retval = request_firmware(&fw_sst, name, &sst_drv_ctx->pci->dev);
         if (retval) {
-                pr_err("sst: request fw failed %d\n", retval);
+                pr_err("request fw failed %d\n", retval);
                 return retval;
         }
         sst_drv_ctx->alloc_block[0].sst_id = FW_DWNL_ID;
@@ -66,7 +70,7 @@ int sst_download_fw(void)
 
         retval = sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[0]);
         if (retval)
-                pr_err("sst: fw download failed %d\n" , retval);
+                pr_err("fw download failed %d\n" , retval);
 end_restore:
         release_firmware(fw_sst);
         sst_drv_ctx->alloc_block[0].sst_id = BLOCK_UNINIT;
@@ -90,7 +94,7 @@ int sst_stalled(void)
 
                 retry--;
         }
-        pr_debug("sst: in Stalled State\n");
+        pr_debug("in Stalled State\n");
         return retval;
 }
 
@@ -138,23 +142,23 @@ int sst_get_stream_allocated(struct snd_sst_params *str_param,
         retval = sst_alloc_stream((char *) &str_param->sparams, str_param->ops,
                                 str_param->codec, str_param->device_type);
         if (retval < 0) {
-                pr_err("sst: sst_alloc_stream failed %d\n", retval);
+                pr_err("sst_alloc_stream failed %d\n", retval);
                 return retval;
         }
-        pr_debug("sst: Stream allocated %d\n", retval);
+        pr_debug("Stream allocated %d\n", retval);
         str_id = retval;
         str_info = &sst_drv_ctx->streams[str_id];
         /* Block the call for reply */
         retval = sst_wait_interruptible_timeout(sst_drv_ctx,
                         &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
         if ((retval != 0) || (str_info->ctrl_blk.ret_code != 0)) {
-                pr_debug("sst: FW alloc failed retval %d, ret_code %d\n",
+                pr_debug("FW alloc failed retval %d, ret_code %d\n",
                                 retval, str_info->ctrl_blk.ret_code);
                 str_id = -str_info->ctrl_blk.ret_code; /*return error*/
                 *lib_dnld = str_info->ctrl_blk.data;
                 sst_clean_stream(str_info);
         } else
-                pr_debug("sst: FW Stream allocated sucess\n");
+                pr_debug("FW Stream allocated success\n");
         return str_id; /*will ret either error (in above if) or correct str id*/
 }
 
@@ -171,9 +175,9 @@ static int sst_get_sfreq(struct snd_sst_params *str_param)
         case SST_CODEC_TYPE_MP3:
                 return str_param->sparams.uc.mp3_params.sfreq;
         case SST_CODEC_TYPE_AAC:
-                return str_param->sparams.uc.aac_params.sfreq;;
+                return str_param->sparams.uc.aac_params.sfreq;
         case SST_CODEC_TYPE_WMA9:
-                return str_param->sparams.uc.wma_params.sfreq;;
+                return str_param->sparams.uc.wma_params.sfreq;
         default:
                 return 0;
         }
@@ -196,14 +200,14 @@ int sst_get_stream(struct snd_sst_params *str_param)
                 /* codec download is required */
                 struct snd_sst_alloc_response *response;
 
-                pr_debug("sst: Codec is required.... trying that\n");
+                pr_debug("Codec is required.... trying that\n");
                 if (lib_dnld == NULL) {
-                        pr_err("sst: lib download null!!! abort\n");
+                        pr_err("lib download null!!! abort\n");
                         return -EIO;
                 }
                 i = sst_get_block_stream(sst_drv_ctx);
                 response = sst_drv_ctx->alloc_block[i].ops_block.data;
-                pr_debug("sst: alloc block allocated = %d\n", i);
+                pr_debug("alloc block allocated = %d\n", i);
                 if (i < 0) {
                         kfree(lib_dnld);
                         return -ENOMEM;
@@ -213,15 +217,15 @@ int sst_get_stream(struct snd_sst_params *str_param)
 
                 sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
                 if (!retval) {
-                        pr_debug("sst: codec was downloaded sucesfully\n");
+                        pr_debug("codec was downloaded successfully\n");
 
                         retval = sst_get_stream_allocated(str_param, &lib_dnld);
                         if (retval <= 0)
                                 goto err;
 
-                        pr_debug("sst: Alloc done stream id %d\n", retval);
+                        pr_debug("Alloc done stream id %d\n", retval);
                 } else {
-                        pr_debug("sst: codec download failed\n");
+                        pr_debug("codec download failed\n");
                         retval = -EIO;
                         goto err;
                 }
@@ -279,97 +283,138 @@ void sst_process_mad_ops(struct work_struct *work)
                 retval = sst_start_stream(mad_ops->stream_id);
                 break;
         case SST_SND_STREAM_PROCESS:
-                pr_debug("sst: play/capt frames...\n");
+                pr_debug("play/capt frames...\n");
                 break;
         default:
-                pr_err("sst:  wrong control_ops reported\n");
+                pr_err(" wrong control_ops reported\n");
         }
         return;
 }
+
+void send_intial_rx_timeslot(void)
+{
+        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID &&
+                        sst_drv_ctx->rx_time_slot_status != RX_TIMESLOT_UNINIT
+                        && sst_drv_ctx->pmic_vendor != SND_NC)
+                sst_enable_rx_timeslot(sst_drv_ctx->rx_time_slot_status);
+}
+
 /*
- * sst_control_set - Set Control params
+ * sst_open_pcm_stream - Open PCM interface
  *
- * @control_list: list of controls to be set
+ * @str_param: parameters of pcm stream
  *
- * This function is called by MID sound card driver to set
- * SST/Sound card controls. This is registered with MID driver
+ * This function is called by MID sound card driver to open
+ * a new pcm interface
  */
-int sst_control_set(int control_element, void *value)
+int sst_open_pcm_stream(struct snd_sst_params *str_param)
 {
-        int retval = 0, str_id = 0;
-        struct stream_info *stream;
+        struct stream_info *str_info;
+        int retval;
+
+        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
 
         if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
-                /*LPE is suspended, resume it before proceding*/
-                pr_debug("sst: Resuming from Suspended state\n");
+                /* LPE is suspended, resume it before proceding*/
+                pr_debug("Resuming from Suspended state\n");
                 retval = intel_sst_resume(sst_drv_ctx->pci);
                 if (retval) {
-                        pr_err("sst: Resume Failed = %#x, abort\n", retval);
+                        pr_err("Resume Failed = %#x, abort\n", retval);
+                        pm_runtime_put(&sst_drv_ctx->pci->dev);
                         return retval;
                 }
         }
         if (sst_drv_ctx->sst_state == SST_UN_INIT) {
                 /* FW is not downloaded */
-                pr_debug("sst: DSP Downloading FW now...\n");
+                pr_debug("DSP Downloading FW now...\n");
                 retval = sst_download_fw();
                 if (retval) {
-                        pr_err("sst: FW download fail %x, abort\n", retval);
+                        pr_err("FW download fail %x, abort\n", retval);
+                        pm_runtime_put(&sst_drv_ctx->pci->dev);
                         return retval;
                 }
-                if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID &&
-                        sst_drv_ctx->rx_time_slot_status != RX_TIMESLOT_UNINIT
-                                && sst_drv_ctx->pmic_vendor != SND_NC)
-                        sst_enable_rx_timeslot(
-                                        sst_drv_ctx->rx_time_slot_status);
+                send_intial_rx_timeslot();
         }
 
-        switch (control_element) {
-        case SST_SND_ALLOC: {
-                struct snd_sst_params *str_param;
-                struct stream_info *str_info;
+        if (!str_param) {
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
+                return -EINVAL;
+        }
 
-                str_param = (struct snd_sst_params *)value;
-                BUG_ON(!str_param);
-                retval = sst_get_stream(str_param);
-                if (retval >= 0)
-                        sst_drv_ctx->stream_cnt++;
+        retval = sst_get_stream(str_param);
+        if (retval > 0) {
+                sst_drv_ctx->stream_cnt++;
                 str_info = &sst_drv_ctx->streams[retval];
                 str_info->src = MAD_DRV;
-                break;
-        }
+        } else
+                pm_runtime_put(&sst_drv_ctx->pci->dev);
+
+        return retval;
+}
 
+/*
+ * sst_close_pcm_stream - Close PCM interface
+ *
+ * @str_id: stream id to be closed
+ *
+ * This function is called by MID sound card driver to close
+ * an existing pcm interface
+ */
+int sst_close_pcm_stream(unsigned int str_id)
+{
+        struct stream_info *stream;
+
+        pr_debug("sst: stream free called\n");
+        if (sst_validate_strid(str_id))
+                return -EINVAL;
+        stream = &sst_drv_ctx->streams[str_id];
+        free_stream_context(str_id);
+        stream->pcm_substream = NULL;
+        stream->status = STREAM_UN_INIT;
+        stream->period_elapsed = NULL;
+        sst_drv_ctx->stream_cnt--;
+        pr_debug("sst: will call runtime put now\n");
+        pm_runtime_put(&sst_drv_ctx->pci->dev);
+        return 0;
+}
+
+/*
+ * sst_device_control - Set Control params
+ *
+ * @cmd: control cmd to be set
+ * @arg: command argument
+ *
+ * This function is called by MID sound card driver to set
+ * SST/Sound card controls for an opened stream.
+ * This is registered with MID driver
+ */
+int sst_device_control(int cmd, void *arg)
+{
+        int retval = 0, str_id = 0;
+
+        switch (cmd) {
         case SST_SND_PAUSE:
         case SST_SND_RESUME:
         case SST_SND_DROP:
         case SST_SND_START:
-                sst_drv_ctx->mad_ops.control_op = control_element;
-                sst_drv_ctx->mad_ops.stream_id = *(int *)value;
+                sst_drv_ctx->mad_ops.control_op = cmd;
+                sst_drv_ctx->mad_ops.stream_id = *(int *)arg;
                 queue_work(sst_drv_ctx->mad_wq, &sst_drv_ctx->mad_ops.wq);
                 break;
 
-        case SST_SND_FREE:
-                str_id = *(int *)value;
-                stream = &sst_drv_ctx->streams[str_id];
-                free_stream_context(str_id);
-                stream->pcm_substream = NULL;
-                stream->status = STREAM_UN_INIT;
-                stream->period_elapsed = NULL;
-                sst_drv_ctx->stream_cnt--;
-                break;
-
         case SST_SND_STREAM_INIT: {
                 struct pcm_stream_info *str_info;
                 struct stream_info *stream;
 
-                pr_debug("sst: stream init called\n");
-                str_info = (struct pcm_stream_info *)value;
+                pr_debug("stream init called\n");
+                str_info = (struct pcm_stream_info *)arg;
                 str_id = str_info->str_id;
                 retval = sst_validate_strid(str_id);
                 if (retval)
                         break;
 
                 stream = &sst_drv_ctx->streams[str_id];
-                pr_debug("sst: setting the period ptrs\n");
+                pr_debug("setting the period ptrs\n");
                 stream->pcm_substream = str_info->mad_substream;
                 stream->period_elapsed = str_info->period_elapsed;
                 stream->sfreq = str_info->sfreq;
@@ -384,7 +429,7 @@ int sst_control_set(int control_element, void *value)
                 struct stream_info *stream;
 
 
-                stream_info = (struct pcm_stream_info *)value;
+                stream_info = (struct pcm_stream_info *)arg;
                 str_id = stream_info->str_id;
                 retval = sst_validate_strid(str_id);
                 if (retval)
@@ -398,26 +443,26 @@ int sst_control_set(int control_element, void *value)
                         +(str_id * sizeof(fw_tstamp))),
                         sizeof(fw_tstamp));
 
-                pr_debug("sst: Pointer Query on strid = %d ops %d\n",
+                pr_debug("Pointer Query on strid = %d ops %d\n",
                                                 str_id, stream->ops);
 
                 if (stream->ops == STREAM_OPS_PLAYBACK)
                         stream_info->buffer_ptr = fw_tstamp.samples_rendered;
                 else
                         stream_info->buffer_ptr = fw_tstamp.samples_processed;
-                pr_debug("sst: Samples rendered = %llu, buffer ptr %llu\n",
+                pr_debug("Samples rendered = %llu, buffer ptr %llu\n",
                         fw_tstamp.samples_rendered, stream_info->buffer_ptr);
                 break;
         }
         case SST_ENABLE_RX_TIME_SLOT: {
-                int status = *(int *)value;
+                int status = *(int *)arg;
                 sst_drv_ctx->rx_time_slot_status = status ;
                 sst_enable_rx_timeslot(status);
                 break;
         }
         default:
                 /* Illegal case */
-                pr_warn("sst: illegal req\n");
+                pr_warn("illegal req\n");
                 return -EINVAL;
         }
 
@@ -425,8 +470,14 @@ int sst_control_set(int control_element, void *value)
 }
 
 
+struct intel_sst_pcm_control pcm_ops = {
+        .open = sst_open_pcm_stream,
+        .device_control = sst_device_control,
+        .close = sst_close_pcm_stream,
+};
+
 struct intel_sst_card_ops sst_pmic_ops = {
-        .control_set = sst_control_set,
+        .pcm_control = &pcm_ops,
 };
 
 /*
@@ -439,12 +490,12 @@ struct intel_sst_card_ops sst_pmic_ops = {
 int register_sst_card(struct intel_sst_card_ops *card)
 {
         if (!sst_drv_ctx) {
-                pr_err("sst: No SST driver register card reject\n");
+                pr_err("No SST driver register card reject\n");
                 return -ENODEV;
         }
 
         if (!card || !card->module_name) {
-                pr_err("sst: Null Pointer Passed\n");
+                pr_err("Null Pointer Passed\n");
                 return -EINVAL;
         }
         if (sst_drv_ctx->pmic_state == SND_MAD_UN_INIT) {
@@ -456,17 +507,17 @@ int register_sst_card(struct intel_sst_card_ops *card)
                         sst_pmic_ops.module_name = card->module_name;
                         sst_drv_ctx->pmic_state = SND_MAD_INIT_DONE;
                         sst_drv_ctx->rx_time_slot_status = 0; /*default AMIC*/
-                        card->control_set = sst_pmic_ops.control_set;
+                        card->pcm_control = sst_pmic_ops.pcm_control;
                         sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
                         return 0;
                 } else {
-                        pr_err("sst: strcmp fail %s\n", card->module_name);
+                        pr_err("strcmp fail %s\n", card->module_name);
                         return -EINVAL;
                 }
 
         } else {
                 /* already registered a driver */
-                pr_err("sst: Repeat for registeration..denied\n");
+                pr_err("Repeat for registration..denied\n");
                 return -EBADRQC;
         }
         return 0;
@@ -482,11 +533,11 @@ EXPORT_SYMBOL_GPL(register_sst_card);
  */
 void unregister_sst_card(struct intel_sst_card_ops *card)
 {
-        if (sst_pmic_ops.control_set == card->control_set) {
+        if (sst_pmic_ops.pcm_control == card->pcm_control) {
                 /* unreg */
                 sst_pmic_ops.module_name = "";
                 sst_drv_ctx->pmic_state = SND_MAD_UN_INIT;
-                pr_debug("sst: Unregistered %s\n", card->module_name);
+                pr_debug("Unregistered %s\n", card->module_name);
         }
         return;
 }
diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c
index d80a6ee2deb8..6e5c9152da9f 100644
--- a/drivers/staging/intel_sst/intel_sst_dsp.c
+++ b/drivers/staging/intel_sst/intel_sst_dsp.c
@@ -29,6 +29,9 @@
  *  This file contains all dsp controlling functions like firmware download,
  * setting/resetting dsp cores, etc
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/firmware.h>
@@ -47,8 +50,9 @@ static int intel_sst_reset_dsp_mrst(void)
 {
         union config_status_reg csr;
 
-        pr_debug("sst: Resetting the DSP in mrst\n");
-        csr.full = 0x3a2;
+        pr_debug("Resetting the DSP in mrst\n");
+        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
+        csr.full |= 0x382;
         sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
         csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
         csr.part.strb_cntr_rst = 0;
@@ -68,7 +72,7 @@ static int intel_sst_reset_dsp_medfield(void)
 {
         union config_status_reg csr;
 
-        pr_debug("sst: Resetting the DSP in medfield\n");
+        pr_debug("Resetting the DSP in medfield\n");
         csr.full = 0x048303E2;
         sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
 
@@ -90,7 +94,7 @@ static int sst_start_mrst(void)
         csr.part.run_stall = 0;
         csr.part.sst_reset = 0;
         csr.part.strb_cntr_rst = 1;
-        pr_debug("sst: Setting SST to execute_mrst 0x%x\n", csr.full);
+        pr_debug("Setting SST to execute_mrst 0x%x\n", csr.full);
         sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
 
         return 0;
@@ -111,7 +115,7 @@ static int sst_start_medfield(void)
         sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
         csr.full = 0x04830061;
         sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        pr_debug("sst: Starting the DSP_medfld\n");
+        pr_debug("Starting the DSP_medfld\n");
 
         return 0;
 }
@@ -130,16 +134,16 @@ static int sst_parse_module(struct fw_module_header *module)
         u32 count;
         void __iomem *ram;
 
-        pr_debug("sst: module sign %s size %x blocks %x type %x\n",
+        pr_debug("module sign %s size %x blocks %x type %x\n",
                         module->signature, module->mod_size,
                         module->blocks, module->type);
-        pr_debug("sst: module entrypoint 0x%x\n", module->entry_point);
+        pr_debug("module entrypoint 0x%x\n", module->entry_point);
 
         block = (void *)module + sizeof(*module);
 
         for (count = 0; count < module->blocks; count++) {
                 if (block->size <= 0) {
-                        pr_err("sst: block size invalid\n");
+                        pr_err("block size invalid\n");
                         return -EINVAL;
                 }
                 switch (block->type) {
@@ -150,7 +154,7 @@ static int sst_parse_module(struct fw_module_header *module)
                         ram = sst_drv_ctx->dram;
                         break;
                 default:
-                        pr_err("sst: wrong ram type0x%x in block0x%x\n",
+                        pr_err("wrong ram type0x%x in block0x%x\n",
                                         block->type, count);
                         return -EINVAL;
                 }
@@ -184,10 +188,10 @@ static int sst_parse_fw_image(const struct firmware *sst_fw)
         if ((strncmp(header->signature, SST_FW_SIGN, 4) != 0) ||
                         (sst_fw->size != header->file_size + sizeof(*header))) {
                 /* Invalid FW signature */
-                pr_err("sst: InvalidFW sign/filesize mismatch\n");
+                pr_err("Invalid FW sign/filesize mismatch\n");
                 return -EINVAL;
         }
-        pr_debug("sst: header sign=%s size=%x modules=%x fmt=%x size=%x\n",
+        pr_debug("header sign=%s size=%x modules=%x fmt=%x size=%x\n",
                         header->signature, header->file_size, header->modules,
                         header->file_format, sizeof(*header));
         module = (void *)sst_fw->data + sizeof(*header);
@@ -214,7 +218,7 @@ int sst_load_fw(const struct firmware *fw, void *context)
 {
         int ret_val;
 
-        pr_debug("sst: load_fw called\n");
+        pr_debug("load_fw called\n");
         BUG_ON(!fw);
 
         if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
@@ -239,7 +243,7 @@ int sst_load_fw(const struct firmware *fw, void *context)
         if (ret_val)
                 return ret_val;
 
-        pr_debug("sst: fw loaded successful!!!\n");
+        pr_debug("fw loaded successful!!!\n");
         return ret_val;
 }
 
@@ -261,7 +265,7 @@ static int sst_download_library(const struct firmware *fw_lib,
 
         pvt_id = sst_assign_pvt_id(sst_drv_ctx);
         i = sst_get_block_stream(sst_drv_ctx);
-        pr_debug("sst: alloc block allocated = %d, pvt_id %d\n", i, pvt_id);
+        pr_debug("alloc block allocated = %d, pvt_id %d\n", i, pvt_id);
         if (i < 0) {
                 kfree(msg);
                 return -ENOMEM;
@@ -281,11 +285,11 @@ static int sst_download_library(const struct firmware *fw_lib,
         if (retval) {
                 /* error */
                 sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                pr_err("sst: Prep codec downloaded failed %d\n",
+                pr_err("Prep codec downloaded failed %d\n",
                                 retval);
                 return -EIO;
         }
-        pr_debug("sst: FW responded, ready for download now...\n");
+        pr_debug("FW responded, ready for download now...\n");
         /* downloading on success */
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_FW_LOADED;
@@ -325,7 +329,7 @@ static int sst_download_library(const struct firmware *fw_lib,
         list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
         spin_unlock(&sst_drv_ctx->list_spin_lock);
         sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        pr_debug("sst: Waiting for FW response Download complete\n");
+        pr_debug("Waiting for FW response Download complete\n");
         sst_drv_ctx->alloc_block[i].ops_block.condition = false;
         retval = sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[i]);
         if (retval) {
@@ -337,7 +341,7 @@ static int sst_download_library(const struct firmware *fw_lib,
                 return -EIO;
         }
 
-        pr_debug("sst: FW sucess on Download complete\n");
+        pr_debug("FW success on Download complete\n");
         sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_FW_RUNNING;
@@ -360,14 +364,14 @@ static int sst_validate_library(const struct firmware *fw_lib,
 
         header = (struct fw_header *)fw_lib->data;
         if (header->modules != 1) {
-                pr_err("sst: Module no mismatch found\n ");
+                pr_err("Module no mismatch found\n");
                 err = -EINVAL;
                 goto exit;
         }
         module = (void *)fw_lib->data + sizeof(*header);
         *entry_point = module->entry_point;
-        pr_debug("sst: Module entry point 0x%x\n", *entry_point);
-        pr_debug("sst: Module Sign %s, Size 0x%x, Blocks 0x%x Type 0x%x\n",
+        pr_debug("Module entry point 0x%x\n", *entry_point);
+        pr_debug("Module Sign %s, Size 0x%x, Blocks 0x%x Type 0x%x\n",
                         module->signature, module->mod_size,
                         module->blocks, module->type);
 
@@ -381,20 +385,20 @@ static int sst_validate_library(const struct firmware *fw_lib,
                         dsize += block->size;
                         break;
                 default:
-                        pr_err("sst: Invalid block type for 0x%x\n", n_blk);
+                        pr_err("Invalid block type for 0x%x\n", n_blk);
                         err = -EINVAL;
                         goto exit;
                 }
                 block = (void *)block + sizeof(*block) + block->size;
         }
         if (isize > slot->iram_size || dsize > slot->dram_size) {
-                pr_err("sst: library exceeds size allocated\n");
+                pr_err("library exceeds size allocated\n");
                 err = -EINVAL;
                 goto exit;
         } else
-                pr_debug("sst: Library is safe for download...\n");
+                pr_debug("Library is safe for download...\n");
 
-        pr_debug("sst: iram 0x%x, dram 0x%x, iram 0x%x, dram 0x%x\n",
+        pr_debug("iram 0x%x, dram 0x%x, iram 0x%x, dram 0x%x\n",
                         isize, dsize, slot->iram_size, slot->dram_size);
 exit:
         return err;
@@ -414,15 +418,15 @@ int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
 
         memset(buf, 0, sizeof(buf));
 
-        pr_debug("sst: Lib Type 0x%x, Slot 0x%x, ops 0x%x\n",
+        pr_debug("Lib Type 0x%x, Slot 0x%x, ops 0x%x\n",
                         lib->lib_info.lib_type, lib->slot_info.slot_num, ops);
-        pr_debug("sst: Version 0x%x, name %s, caps 0x%x media type 0x%x\n",
+        pr_debug("Version 0x%x, name %s, caps 0x%x media type 0x%x\n",
                 lib->lib_info.lib_version, lib->lib_info.lib_name,
                 lib->lib_info.lib_caps, lib->lib_info.media_type);
 
-        pr_debug("sst: IRAM Size 0x%x, offset 0x%x\n",
+        pr_debug("IRAM Size 0x%x, offset 0x%x\n",
                 lib->slot_info.iram_size, lib->slot_info.iram_offset);
-        pr_debug("sst: DRAM Size 0x%x, offset 0x%x\n",
+        pr_debug("DRAM Size 0x%x, offset 0x%x\n",
                 lib->slot_info.dram_size, lib->slot_info.dram_offset);
 
         switch (lib->lib_info.lib_type) {
@@ -442,7 +446,7 @@ int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
                 type = "wma9_";
                 break;
         default:
-                pr_err("sst: Invalid codec type\n");
+                pr_err("Invalid codec type\n");
                 error = -EINVAL;
                 goto wake;
         }
@@ -458,11 +462,11 @@ int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
                         lib->slot_info.slot_num);
         len += snprintf(buf + len, sizeof(buf) - len, ".bin");
 
-        pr_debug("sst: Requesting %s\n", buf);
+        pr_debug("Requesting %s\n", buf);
 
         error = request_firmware(&fw_lib, buf, &sst_drv_ctx->pci->dev);
         if (error) {
-                pr_err("sst: library load failed %d\n", error);
+                pr_err("library load failed %d\n", error);
                 goto wake;
         }
         error = sst_validate_library(fw_lib, &lib->slot_info, &entry_point);
@@ -476,7 +480,7 @@ int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
                 goto wake_free;
 
         /* lib is downloaded and init send alloc again */
-        pr_debug("sst: Library is downloaded now...\n");
+        pr_debug("Library is downloaded now...\n");
 wake_free:
         /* sst_wake_up_alloc_block(sst_drv_ctx, pvt_id, error, NULL); */
         release_firmware(fw_lib);
diff --git a/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
index 9d3c36807e07..8df313d10d2a 100644
--- a/drivers/staging/intel_sst/intel_sst_fw_ipc.h
+++ b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
@@ -31,6 +31,7 @@
 */
 
 #define MAX_NUM_STREAMS_MRST 3
+#define MAX_NUM_STREAMS_MFLD 6
 #define MAX_NUM_STREAMS 6
 #define MAX_DBG_RW_BYTES 80
 #define MAX_NUM_SCATTER_BUFFERS 8
@@ -67,6 +68,8 @@
 #define IPC_IA_CAPT_VOICE 0x17
 #define IPC_IA_DECODE_FRAMES 0x18
 
+#define IPC_IA_ALG_PARAMS 0x1A
+
 /* I2L Stream config/control msgs */
 #define IPC_IA_ALLOC_STREAM 0x20 /* Allocate a stream ID */
 #define IPC_IA_FREE_STREAM 0x21 /* Free the stream ID */
@@ -141,73 +144,87 @@ enum sst_error_codes {
         /* Error code,response to msgId: Description */
         /* Common error codes */
         SST_SUCCESS = 0,        /* Success */
-        SST_ERR_INVALID_STREAM_ID, /* Invalid stream ID */
-        SST_ERR_INVALID_MSG_ID, /* Invalid message ID */
-        SST_ERR_INVALID_STREAM_OP, /* Invalid stream operation request */
-        SST_ERR_INVALID_PARAMS, /* Invalid params */
-        SST_ERR_INVALID_CODEC,  /* Invalid codec type */
-        SST_ERR_INVALID_MEDIA_TYPE, /* Invalid media type */
-        SST_ERR_STREAM_ERR,  /* ANY: Stream control or config or
-                                        processing error */
+        SST_ERR_INVALID_STREAM_ID = 1,
+        SST_ERR_INVALID_MSG_ID = 2,
+        SST_ERR_INVALID_STREAM_OP = 3,
+        SST_ERR_INVALID_PARAMS = 4,
+        SST_ERR_INVALID_CODEC = 5,
+        SST_ERR_INVALID_MEDIA_TYPE = 6,
+        SST_ERR_STREAM_ERR = 7,
 
         /* IPC specific error codes */
-        SST_IPC_ERR_CALL_BACK_NOT_REGD, /* Call back for msg not regd */
-        SST_IPC_ERR_STREAM_NOT_ALLOCATED, /* Stream is not allocated  */
-        SST_IPC_ERR_STREAM_ALLOC_FAILED, /* ALLOC:Stream alloc failed */
-        SST_IPC_ERR_GET_STREAM_FAILED, /* ALLOC:Get stream id failed*/
-        SST_ERR_MOD_NOT_AVAIL, /* SET/GET: Mod(AEC/AGC/ALC) not available */
-        SST_ERR_MOD_DNLD_RQD, /* SET/GET: Mod(AEC/AGC/ALC) download required */
-        SST_ERR_STREAM_STOPPED,         /* ANY: Stream is in stopped state */
-        SST_ERR_STREAM_IN_USE, /* ANY: Stream is already in use */
+        SST_IPC_ERR_CALL_BACK_NOT_REGD = 8,
+        SST_IPC_ERR_STREAM_NOT_ALLOCATED = 9,
+        SST_IPC_ERR_STREAM_ALLOC_FAILED = 10,
+        SST_IPC_ERR_GET_STREAM_FAILED = 11,
+        SST_ERR_MOD_NOT_AVAIL = 12,
+        SST_ERR_MOD_DNLD_RQD = 13,
+        SST_ERR_STREAM_STOPPED = 14,
+        SST_ERR_STREAM_IN_USE = 15,
 
         /* Capture specific error codes */
-        SST_CAP_ERR_INCMPLTE_CAPTURE_MSG,/* ANY:Incomplete message */
-        SST_CAP_ERR_CAPTURE_FAIL, /* ANY:Capture op failed */
-        SST_CAP_ERR_GET_DDR_NEW_SGLIST,
-        SST_CAP_ERR_UNDER_RUN,  /* lack of input data */
-        SST_CAP_ERR_OVERFLOW,   /* lack of output space */
+        SST_CAP_ERR_INCMPLTE_CAPTURE_MSG = 16,
+        SST_CAP_ERR_CAPTURE_FAIL = 17,
+        SST_CAP_ERR_GET_DDR_NEW_SGLIST = 18,
+        SST_CAP_ERR_UNDER_RUN = 19,
+        SST_CAP_ERR_OVERFLOW = 20,
 
         /* Playback specific error codes*/
-        SST_PB_ERR_INCMPLTE_PLAY_MSG, /* ANY: Incomplete message */
-        SST_PB_ERR_PLAY_FAIL, /* ANY: Playback operation failed */
-        SST_PB_ERR_GET_DDR_NEW_SGLIST,
+        SST_PB_ERR_INCMPLTE_PLAY_MSG = 21,
+        SST_PB_ERR_PLAY_FAIL = 22,
+        SST_PB_ERR_GET_DDR_NEW_SGLIST = 23,
 
         /* Codec manager specific error codes */
-        SST_LIB_ERR_LIB_DNLD_REQUIRED, /* ALLOC: Codec download required */
-        SST_LIB_ERR_LIB_NOT_SUPPORTED, /* Library is not supported */
+        SST_LIB_ERR_LIB_DNLD_REQUIRED = 24,
+        SST_LIB_ERR_LIB_NOT_SUPPORTED = 25,
 
         /* Library manager specific error codes */
-        SST_SCC_ERR_PREP_DNLD_FAILED, /* Failed to prepare for codec download */
-        SST_SCC_ERR_LIB_DNLD_RES_FAILED, /* Lib download resume failed */
+        SST_SCC_ERR_PREP_DNLD_FAILED = 26,
+        SST_SCC_ERR_LIB_DNLD_RES_FAILED = 27,
         /* Scheduler specific error codes */
-        SST_SCH_ERR_FAIL, /* REPORT: */
+        SST_SCH_ERR_FAIL = 28,
 
         /* DMA specific error codes */
-        SST_DMA_ERR_NO_CHNL_AVAILABLE, /* DMA Ch not available */
-        SST_DMA_ERR_INVALID_INPUT_PARAMS, /* Invalid input params */
-        SST_DMA_ERR_CHNL_ALREADY_SUSPENDED, /* Ch is suspended */
-        SST_DMA_ERR_CHNL_ALREADY_STARTED, /* Ch already started */
-        SST_DMA_ERR_CHNL_NOT_ENABLED, /* Ch not enabled */
-        SST_DMA_ERR_TRANSFER_FAILED, /* Transfer failed */
-        SST_SSP_ERR_ALREADY_ENABLED, /* REPORT: SSP already enabled */
-        SST_SSP_ERR_ALREADY_DISABLED, /* REPORT: SSP already disabled */
-        SST_SSP_ERR_NOT_INITIALIZED,
+        SST_DMA_ERR_NO_CHNL_AVAILABLE = 29,
+        SST_DMA_ERR_INVALID_INPUT_PARAMS = 30,
+        SST_DMA_ERR_CHNL_ALREADY_SUSPENDED = 31,
+        SST_DMA_ERR_CHNL_ALREADY_STARTED = 32,
+        SST_DMA_ERR_CHNL_NOT_ENABLED = 33,
+        SST_DMA_ERR_TRANSFER_FAILED = 34,
+
+        SST_SSP_ERR_ALREADY_ENABLED = 35,
+        SST_SSP_ERR_ALREADY_DISABLED = 36,
+        SST_SSP_ERR_NOT_INITIALIZED = 37,
+        SST_SSP_ERR_SRAM_NO_DMA_DATA = 38,
 
         /* Other error codes */
-        SST_ERR_MOD_INIT_FAIL,  /* Firmware Module init failed */
+        SST_ERR_MOD_INIT_FAIL = 39,
 
         /* FW init error codes */
-        SST_RDR_ERR_IO_DEV_SEL_NOT_ALLOWED,
-        SST_RDR_ERR_ROUTE_ALREADY_STARTED,
-        SST_RDR_PREP_CODEC_DNLD_FAILED,
+        SST_RDR_ERR_IO_DEV_SEL_NOT_ALLOWED = 40,
+        SST_RDR_ERR_ROUTE_ALREADY_STARTED = 41,
+        SST_RDR_ERR_IO_DEV_SEL_FAILED = 42,
+        SST_RDR_PREP_CODEC_DNLD_FAILED = 43,
 
         /* Memory debug error codes */
-        SST_ERR_DBG_MEM_READ_FAIL,
-        SST_ERR_DBG_MEM_WRITE_FAIL,
-
-        /* Decode error codes */
-        SST_ERR_DEC_NEED_INPUT_BUF,
-
+        SST_ERR_DBG_MEM_READ_FAIL = 44,
+        SST_ERR_DBG_MEM_WRITE_FAIL = 45,
+        SST_ERR_INSUFFICIENT_INPUT_SG_LIST = 46,
+        SST_ERR_INSUFFICIENT_OUTPUT_SG_LIST = 47,
+
+        SST_ERR_BUFFER_NOT_AVAILABLE = 48,
+        SST_ERR_BUFFER_NOT_ALLOCATED = 49,
+        SST_ERR_INVALID_REGION_TYPE = 50,
+        SST_ERR_NULL_PTR = 51,
+        SST_ERR_INVALID_BUFFER_SIZE = 52,
+        SST_ERR_INVALID_BUFFER_INDEX = 53,
+
+        /*IIPC specific error codes */
+        SST_IIPC_QUEUE_FULL = 54,
+        SST_IIPC_ERR_MSG_SND_FAILED = 55,
+        SST_PB_ERR_UNDERRUN_OCCURED = 56,
+        SST_RDR_INSUFFICIENT_MIXER_BUFFER = 57,
+        SST_INVALID_TIME_SLOTS = 58,
 };
 
 enum dbg_mem_data_type {
diff --git a/drivers/staging/intel_sst/intel_sst_ioctl.h b/drivers/staging/intel_sst/intel_sst_ioctl.h
index 03b931619a3e..bebc395a3c1f 100644
--- a/drivers/staging/intel_sst/intel_sst_ioctl.h
+++ b/drivers/staging/intel_sst/intel_sst_ioctl.h
@@ -190,21 +190,15 @@ struct snd_prp_params {
         __u32 reserved; /* No pre-processing defined yet */
 };
 
-struct snd_params_block {
-        __u32 type;             /*Type of the parameter*/
-        __u32 size;             /*size of the parameters in the block*/
-        __u8 params[0]; /*Parameters of the algorithm*/
-};
-
 /* Pre and post processing params structure */
 struct snd_ppp_params {
-        enum sst_algo_types     algo_id;/* Post/Pre processing algorithm ID  */
+        __u8                    algo_id;/* Post/Pre processing algorithm ID  */
         __u8                    str_id; /*Only 5 bits used 0 - 31 are valid*/
         __u8                    enable; /* 0= disable, 1= enable*/
         __u8                    reserved;
         __u32                   size;   /*Size of parameters for all blocks*/
-        struct snd_params_block params[0];
-};
+        void                    *params;
+} __attribute__ ((packed));
 
 struct snd_sst_postproc_info {
         __u32 src_min;          /* Supported SRC Min sampling freq */
@@ -431,5 +425,8 @@ struct snd_sst_dbufs  {
 #define SNDRV_SST_FW_INFO       _IOR('L', 0x20,  struct snd_sst_fw_info *)
 #define SNDRV_SST_SET_TARGET_DEVICE _IOW('L', 0x21, \
                                         struct snd_sst_target_device *)
+/*DSP Ioctls on /dev/intel_sst_ctrl only*/
+#define SNDRV_SST_SET_ALGO      _IOW('L', 0x30,  struct snd_ppp_params *)
+#define SNDRV_SST_GET_ALGO      _IOWR('L', 0x31,  struct snd_ppp_params *)
 
 #endif /* __INTEL_SST_IOCTL_H__ */
diff --git a/drivers/staging/intel_sst/intel_sst_ipc.c b/drivers/staging/intel_sst/intel_sst_ipc.c
index 39c67fa0bd0c..0742dde2685d 100644
--- a/drivers/staging/intel_sst/intel_sst_ipc.c
+++ b/drivers/staging/intel_sst/intel_sst_ipc.c
@@ -26,6 +26,8 @@
  *  This file defines all ipc functions
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/firmware.h>
 #include <linux/sched.h>
@@ -75,16 +77,16 @@ void sst_post_message(struct work_struct *work)
         /*To check if LPE is in stalled state.*/
         retval = sst_stalled();
         if (retval < 0) {
-                pr_err("sst: in stalled state\n");
+                pr_err("in stalled state\n");
                 return;
         }
-        pr_debug("sst: post message called\n");
+        pr_debug("post message called\n");
         spin_lock(&sst_drv_ctx->list_spin_lock);
 
         /* check list */
         if (list_empty(&sst_drv_ctx->ipc_dispatch_list)) {
                 /* list is empty, mask imr */
-                pr_debug("sst: Empty msg queue... masking\n");
+                pr_debug("Empty msg queue... masking\n");
                 imr.full = readl(sst_drv_ctx->shim + SST_IMRX);
                 imr.part.done_interrupt = 1;
                 /* dummy register for shim workaround */
@@ -97,7 +99,7 @@ void sst_post_message(struct work_struct *work)
         header.full = sst_shim_read(sst_drv_ctx->shim, SST_IPCX);
         if (header.part.busy) {
                 /* busy, unmask */
-                pr_debug("sst: Busy not free... unmasking\n");
+                pr_debug("Busy not free... unmasking\n");
                 imr.full = readl(sst_drv_ctx->shim + SST_IMRX);
                 imr.part.done_interrupt = 0;
                 /* dummy register for shim workaround */
@@ -109,8 +111,8 @@ void sst_post_message(struct work_struct *work)
         msg = list_entry(sst_drv_ctx->ipc_dispatch_list.next,
                         struct ipc_post, node);
         list_del(&msg->node);
-        pr_debug("sst: Post message: header = %x\n", msg->header.full);
-        pr_debug("sst: size: = %x\n", msg->header.part.data);
+        pr_debug("Post message: header = %x\n", msg->header.full);
+        pr_debug("size: = %x\n", msg->header.part.data);
         if (msg->header.part.large)
                 memcpy_toio(sst_drv_ctx->mailbox + SST_MAILBOX_SEND,
                         msg->mailbox_data, msg->header.part.data);
@@ -166,13 +168,13 @@ int process_fw_init(struct sst_ipc_msg_wq *msg)
                 (struct ipc_header_fw_init *)msg->mailbox;
         int retval = 0;
 
-        pr_debug("sst: *** FW Init msg came***\n");
+        pr_debug("*** FW Init msg came***\n");
         if (init->result) {
                 mutex_lock(&sst_drv_ctx->sst_lock);
                 sst_drv_ctx->sst_state = SST_ERROR;
                 mutex_unlock(&sst_drv_ctx->sst_lock);
-                pr_debug("sst: FW Init failed, Error %x\n", init->result);
-                pr_err("sst: FW Init failed, Error %x\n", init->result);
+                pr_debug("FW Init failed, Error %x\n", init->result);
+                pr_err("FW Init failed, Error %x\n", init->result);
                 retval = -init->result;
                 return retval;
         }
@@ -180,12 +182,13 @@ int process_fw_init(struct sst_ipc_msg_wq *msg)
                 sst_send_sound_card_type();
         mutex_lock(&sst_drv_ctx->sst_lock);
         sst_drv_ctx->sst_state = SST_FW_RUNNING;
+        sst_drv_ctx->lpe_stalled = 0;
         mutex_unlock(&sst_drv_ctx->sst_lock);
-        pr_debug("sst: FW Version %x.%x\n",
+        pr_debug("FW Version %x.%x\n",
                         init->fw_version.major, init->fw_version.minor);
-        pr_debug("sst: Build No %x Type %x\n",
+        pr_debug("Build No %x Type %x\n",
                         init->fw_version.build, init->fw_version.type);
-        pr_debug("sst:  Build date %s Time %s\n",
+        pr_debug(" Build date %s Time %s\n",
                         init->build_info.date, init->build_info.time);
         sst_wake_up_alloc_block(sst_drv_ctx, FW_DWNL_ID, retval, NULL);
         return retval;
@@ -204,19 +207,19 @@ void sst_process_message(struct work_struct *work)
                         container_of(work, struct sst_ipc_msg_wq, wq);
         int str_id = msg->header.part.str_id;
 
-        pr_debug("sst: IPC process for %x\n", msg->header.full);
+        pr_debug("IPC process for %x\n", msg->header.full);
 
         /* based on msg in list call respective handler */
         switch (msg->header.part.msg_id) {
         case IPC_SST_BUF_UNDER_RUN:
         case IPC_SST_BUF_OVER_RUN:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst:  stream id %d invalid\n", str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
-                pr_err("sst: Buffer under/overrun for%d\n",
+                pr_err("Buffer under/overrun for %d\n",
                                 msg->header.part.str_id);
-                pr_err("sst: Got Underrun & not to send data...ignore\n");
+                pr_err("Got Underrun & not to send data...ignore\n");
                 break;
 
         case IPC_SST_GET_PLAY_FRAMES:
@@ -224,35 +227,35 @@ void sst_process_message(struct work_struct *work)
                         struct stream_info *stream ;
 
                         if (sst_validate_strid(str_id)) {
-                                pr_err("sst: strid %d invalid\n", str_id);
+                                pr_err("strid %d invalid\n", str_id);
                                 break;
                         }
                         /* call sst_play_frame */
                         stream = &sst_drv_ctx->streams[str_id];
-                        pr_debug("sst: sst_play_frames for %d\n",
+                        pr_debug("sst_play_frames for %d\n",
                                         msg->header.part.str_id);
                         mutex_lock(&sst_drv_ctx->streams[str_id].lock);
                         sst_play_frame(msg->header.part.str_id);
                         mutex_unlock(&sst_drv_ctx->streams[str_id].lock);
                         break;
                 } else
-                        pr_err("sst: sst_play_frames for Penwell!!\n");
+                        pr_err("sst_play_frames for Penwell!!\n");
 
         case IPC_SST_GET_CAPT_FRAMES:
                 if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
                         struct stream_info *stream;
                         /* call sst_capture_frame */
                         if (sst_validate_strid(str_id)) {
-                                pr_err("sst: str id %d invalid\n", str_id);
+                                pr_err("str id %d invalid\n", str_id);
                                 break;
                         }
                         stream = &sst_drv_ctx->streams[str_id];
-                        pr_debug("sst: sst_capture_frames for %d\n",
+                        pr_debug("sst_capture_frames for %d\n",
                                         msg->header.part.str_id);
                         mutex_lock(&stream->lock);
                         if (stream->mmapped == false &&
                                         stream->src == SST_DRV) {
-                                pr_debug("sst: waking up block for copy.\n");
+                                pr_debug("waking up block for copy.\n");
                                 stream->data_blk.ret_code = 0;
                                 stream->data_blk.condition = true;
                                 stream->data_blk.on = false;
@@ -261,11 +264,11 @@ void sst_process_message(struct work_struct *work)
                                 sst_capture_frame(msg->header.part.str_id);
                         mutex_unlock(&stream->lock);
                 } else
-                        pr_err("sst: sst_play_frames for Penwell!!\n");
+                        pr_err("sst_play_frames for Penwell!!\n");
                 break;
 
         case IPC_IA_PRINT_STRING:
-                pr_debug("sst: been asked to print something by fw\n");
+                pr_debug("been asked to print something by fw\n");
                 /* TBD */
                 break;
 
@@ -277,12 +280,12 @@ void sst_process_message(struct work_struct *work)
 
         case IPC_SST_STREAM_PROCESS_FATAL_ERR:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: stream id %d invalid\n", str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
-                pr_err("sst: codec fatal error %x stream %d...\n",
+                pr_err("codec fatal error %x stream %d...\n",
                                 msg->header.full, msg->header.part.str_id);
-                pr_err("sst: Dropping the stream\n");
+                pr_err("Dropping the stream\n");
                 sst_drop_stream(msg->header.part.str_id);
                 break;
         case IPC_IA_LPE_GETTING_STALLED:
@@ -293,7 +296,7 @@ void sst_process_message(struct work_struct *work)
                 break;
         default:
                 /* Illegal case */
-                pr_err("sst: Unhandled msg %x header %x\n",
+                pr_err("Unhandled msg %x header %x\n",
                 msg->header.part.msg_id, msg->header.full);
         }
         sst_clear_interrupt();
@@ -322,7 +325,7 @@ void sst_process_reply(struct work_struct *work)
                 if (!msg->header.part.data) {
                         sst_drv_ctx->tgt_dev_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                         msg->header.part.msg_id, msg->header.part.data);
                         sst_drv_ctx->tgt_dev_blk.ret_code =
                                         -msg->header.part.data;
@@ -333,6 +336,55 @@ void sst_process_reply(struct work_struct *work)
                                 wake_up(&sst_drv_ctx->wait_queue);
                 }
                 break;
+        case IPC_IA_ALG_PARAMS: {
+                pr_debug("sst:IPC_ALG_PARAMS response %x\n", msg->header.full);
+                pr_debug("sst: data value %x\n", msg->header.part.data);
+                pr_debug("sst: large value %x\n", msg->header.part.large);
+
+                if (!msg->header.part.large) {
+                        if (!msg->header.part.data) {
+                                pr_debug("sst: alg set success\n");
+                                sst_drv_ctx->ppp_params_blk.ret_code = 0;
+                        } else {
+                                pr_debug("sst: alg set failed\n");
+                                sst_drv_ctx->ppp_params_blk.ret_code =
+                                                        -msg->header.part.data;
+                        }
+
+                } else if (msg->header.part.data) {
+                        struct snd_ppp_params *mailbox_params, *get_params;
+                        char *params;
+
+                        pr_debug("sst: alg get success\n");
+                        mailbox_params = (struct snd_ppp_params *)msg->mailbox;
+                        get_params = kzalloc(sizeof(*get_params), GFP_KERNEL);
+                        if (get_params == NULL) {
+                                pr_err("sst: out of memory for ALG PARAMS");
+                                break;
+                        }
+                        memcpy_fromio(get_params, mailbox_params,
+                                                        sizeof(*get_params));
+                        get_params->params = kzalloc(mailbox_params->size,
+                                                        GFP_KERNEL);
+                        if (get_params->params == NULL) {
+                                kfree(get_params);
+                                pr_err("sst: out of memory for ALG PARAMS block");
+                                break;
+                        }
+                        params = msg->mailbox;
+                        params = params + sizeof(*mailbox_params) - sizeof(u32);
+                        memcpy_fromio(get_params->params, params,
+                                                        get_params->size);
+                        sst_drv_ctx->ppp_params_blk.ret_code = 0;
+                        sst_drv_ctx->ppp_params_blk.data = get_params;
+                }
+
+                if (sst_drv_ctx->ppp_params_blk.on == true) {
+                        sst_drv_ctx->ppp_params_blk.condition = true;
+                        wake_up(&sst_drv_ctx->wait_queue);
+                }
+                break;
+        }
         case IPC_IA_GET_FW_INFO: {
                 struct snd_sst_fw_info *fw_info =
                         (struct snd_sst_fw_info *)msg->mailbox;
@@ -340,7 +392,7 @@ void sst_process_reply(struct work_struct *work)
                         int major = fw_info->fw_version.major;
                         int minor = fw_info->fw_version.minor;
                         int build = fw_info->fw_version.build;
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                        msg->header.part.msg_id);
                         pr_debug("INFO: ***FW*** = %02d.%02d.%02d\n",
                                         major, minor, build);
@@ -349,13 +401,13 @@ void sst_process_reply(struct work_struct *work)
                                 sizeof(struct snd_sst_fw_info));
                         sst_drv_ctx->fw_info_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                         msg->header.part.msg_id, msg->header.part.data);
                         sst_drv_ctx->fw_info_blk.ret_code =
                                         -msg->header.part.data;
                 }
                 if (sst_drv_ctx->fw_info_blk.on == true) {
-                        pr_debug("sst: Memcopy succedded\n");
+                        pr_debug("Memcopy succeeded\n");
                         sst_drv_ctx->fw_info_blk.on = false;
                         sst_drv_ctx->fw_info_blk.condition = true;
                         wake_up(&sst_drv_ctx->wait_queue);
@@ -364,11 +416,11 @@ void sst_process_reply(struct work_struct *work)
         }
         case IPC_IA_SET_STREAM_MUTE:
                 if (!msg->header.part.data) {
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                        msg->header.part.msg_id);
                         sst_drv_ctx->mute_info_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                         msg->header.part.msg_id, msg->header.part.data);
                         sst_drv_ctx->mute_info_blk.ret_code =
                                         -msg->header.part.data;
@@ -382,11 +434,11 @@ void sst_process_reply(struct work_struct *work)
                 break;
         case IPC_IA_SET_STREAM_VOL:
                 if (!msg->header.part.data) {
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                        msg->header.part.msg_id);
                         sst_drv_ctx->vol_info_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                                         msg->header.part.msg_id,
                         msg->header.part.data);
                         sst_drv_ctx->vol_info_blk.ret_code =
@@ -402,15 +454,15 @@ void sst_process_reply(struct work_struct *work)
                 break;
         case IPC_IA_GET_STREAM_VOL:
                 if (msg->header.part.large) {
-                        pr_debug("sst: Large Msg Received Successfully\n");
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Large Msg Received Successfully\n");
+                        pr_debug("Msg succeeded %x\n",
                                        msg->header.part.msg_id);
                         memcpy_fromio(sst_drv_ctx->vol_info_blk.data,
                                 (void *) msg->mailbox,
                                 sizeof(struct snd_sst_vol));
                         sst_drv_ctx->vol_info_blk.ret_code = 0;
                 } else {
-                        pr_err("sst: Msg %x reply error %x\n",
+                        pr_err("Msg %x reply error %x\n",
                         msg->header.part.msg_id, msg->header.part.data);
                         sst_drv_ctx->vol_info_blk.ret_code =
                                         -msg->header.part.data;
@@ -424,18 +476,18 @@ void sst_process_reply(struct work_struct *work)
 
         case IPC_IA_GET_STREAM_PARAMS:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: stream id %d invalid\n", str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
                 str_info = &sst_drv_ctx->streams[str_id];
                 if (msg->header.part.large) {
-                        pr_debug("sst: Get stream large success\n");
+                        pr_debug("Get stream large success\n");
                         memcpy_fromio(str_info->ctrl_blk.data,
                                 ((void *)(msg->mailbox)),
                                 sizeof(struct snd_sst_fw_get_stream_params));
                         str_info->ctrl_blk.ret_code = 0;
                 } else {
-                        pr_err("sst: Msg %x reply error %x\n",
+                        pr_err("Msg %x reply error %x\n",
                                 msg->header.part.msg_id, msg->header.part.data);
                         str_info->ctrl_blk.ret_code = -msg->header.part.data;
                 }
@@ -447,19 +499,19 @@ void sst_process_reply(struct work_struct *work)
                 break;
         case IPC_IA_DECODE_FRAMES:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: stream id %d invalid\n", str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
                 str_info = &sst_drv_ctx->streams[str_id];
                 if (msg->header.part.large) {
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                        msg->header.part.msg_id);
                         memcpy_fromio(str_info->data_blk.data,
                                         ((void *)(msg->mailbox)),
                                         sizeof(struct snd_sst_decode_info));
                         str_info->data_blk.ret_code = 0;
                 } else {
-                        pr_err("sst: Msg %x reply error %x\n",
+                        pr_err("Msg %x reply error %x\n",
                                 msg->header.part.msg_id, msg->header.part.data);
                         str_info->data_blk.ret_code = -msg->header.part.data;
                 }
@@ -471,17 +523,17 @@ void sst_process_reply(struct work_struct *work)
                 break;
         case IPC_IA_DRAIN_STREAM:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: stream id %d invalid\n", str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
                 str_info = &sst_drv_ctx->streams[str_id];
                 if (!msg->header.part.data) {
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                         msg->header.part.msg_id);
                         str_info->ctrl_blk.ret_code = 0;
 
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                                 msg->header.part.msg_id, msg->header.part.data);
                         str_info->ctrl_blk.ret_code = -msg->header.part.data;
 
@@ -496,7 +548,7 @@ void sst_process_reply(struct work_struct *work)
 
         case IPC_IA_DROP_STREAM:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: str id %d invalid\n", str_id);
+                        pr_err("str id %d invalid\n", str_id);
                         break;
                 }
                 str_info = &sst_drv_ctx->streams[str_id];
@@ -504,12 +556,12 @@ void sst_process_reply(struct work_struct *work)
                         struct snd_sst_drop_response *drop_resp =
                                 (struct snd_sst_drop_response *)msg->mailbox;
 
-                        pr_debug("sst: Drop ret bytes %x\n", drop_resp->bytes);
+                        pr_debug("Drop ret bytes %x\n", drop_resp->bytes);
 
                         str_info->curr_bytes = drop_resp->bytes;
                         str_info->ctrl_blk.ret_code =  0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                                 msg->header.part.msg_id, msg->header.part.data);
                         str_info->ctrl_blk.ret_code = -msg->header.part.data;
                 }
@@ -521,10 +573,10 @@ void sst_process_reply(struct work_struct *work)
                 break;
         case IPC_IA_ENABLE_RX_TIME_SLOT:
                 if (!msg->header.part.data) {
-                        pr_debug("sst: RX_TIME_SLOT success\n");
+                        pr_debug("RX_TIME_SLOT success\n");
                         sst_drv_ctx->hs_info_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                                 msg->header.part.msg_id,
                                 msg->header.part.data);
                         sst_drv_ctx->hs_info_blk.ret_code =
@@ -541,17 +593,17 @@ void sst_process_reply(struct work_struct *work)
         case IPC_IA_SET_STREAM_PARAMS:
                 str_info = &sst_drv_ctx->streams[str_id];
                 if (!msg->header.part.data) {
-                        pr_debug("sst: Msg succedded %x\n",
+                        pr_debug("Msg succeeded %x\n",
                                         msg->header.part.msg_id);
                         str_info->ctrl_blk.ret_code = 0;
                 } else {
-                        pr_err("sst:  Msg %x reply error %x\n",
+                        pr_err(" Msg %x reply error %x\n",
                                         msg->header.part.msg_id,
                                         msg->header.part.data);
                         str_info->ctrl_blk.ret_code = -msg->header.part.data;
                 }
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst:  stream id %d invalid\n", str_id);
+                        pr_err(" stream id %d invalid\n", str_id);
                         break;
                 }
 
@@ -564,9 +616,9 @@ void sst_process_reply(struct work_struct *work)
 
         case IPC_IA_FREE_STREAM:
                 if (!msg->header.part.data) {
-                        pr_debug("sst: Stream %d freed\n", str_id);
+                        pr_debug("Stream %d freed\n", str_id);
                 } else {
-                        pr_err("sst: Free for %d ret error %x\n",
+                        pr_err("Free for %d ret error %x\n",
                                        str_id, msg->header.part.data);
                 }
                 break;
@@ -575,7 +627,7 @@ void sst_process_reply(struct work_struct *work)
                 struct snd_sst_alloc_response *resp =
                                 (struct snd_sst_alloc_response *)msg->mailbox;
                 if (resp->str_type.result)
-                        pr_err("sst: error alloc stream = %x\n",
+                        pr_err("error alloc stream = %x\n",
                                        resp->str_type.result);
                 sst_alloc_stream_response(str_id, resp);
                 break;
@@ -584,21 +636,21 @@ void sst_process_reply(struct work_struct *work)
         case IPC_IA_PLAY_FRAMES:
         case IPC_IA_CAPT_FRAMES:
                 if (sst_validate_strid(str_id)) {
-                        pr_err("sst: stream id %d invalid\n" , str_id);
+                        pr_err("stream id %d invalid\n", str_id);
                         break;
                 }
-                pr_debug("sst: Ack for play/capt frames recived\n");
+                pr_debug("Ack for play/capt frames received\n");
                 break;
 
         case IPC_IA_PREP_LIB_DNLD: {
                 struct snd_sst_str_type *str_type =
                         (struct snd_sst_str_type *)msg->mailbox;
-                pr_debug("sst: Prep Lib download %x\n",
+                pr_debug("Prep Lib download %x\n",
                                 msg->header.part.msg_id);
                 if (str_type->result)
-                        pr_err("sst: Prep lib download %x\n", str_type->result);
+                        pr_err("Prep lib download %x\n", str_type->result);
                 else
-                        pr_debug("sst: Can download codec now...\n");
+                        pr_debug("Can download codec now...\n");
                 sst_wake_up_alloc_block(sst_drv_ctx, str_id,
                                 str_type->result, NULL);
                 break;
@@ -609,12 +661,12 @@ void sst_process_reply(struct work_struct *work)
                         (struct snd_sst_lib_download_info *)msg->mailbox;
                 int retval = resp->result;
 
-                pr_debug("sst: Lib downloaded %x\n", msg->header.part.msg_id);
+                pr_debug("Lib downloaded %x\n", msg->header.part.msg_id);
                 if (resp->result) {
-                        pr_err("sst: err in lib dload %x\n", resp->result);
+                        pr_err("err in lib dload %x\n", resp->result);
                 } else {
-                        pr_debug("sst: Codec download complete...\n");
-                        pr_debug("sst: codec Type %d Ver %d Built %s: %s\n",
+                        pr_debug("Codec download complete...\n");
+                        pr_debug("codec Type %d Ver %d Built %s: %s\n",
                                 resp->dload_lib.lib_info.lib_type,
                                 resp->dload_lib.lib_info.lib_version,
                                 resp->dload_lib.lib_info.b_date,
@@ -639,17 +691,17 @@ void sst_process_reply(struct work_struct *work)
         case IPC_IA_GET_FW_BUILD_INF: {
                 struct sst_fw_build_info *build =
                         (struct sst_fw_build_info *)msg->mailbox;
-                pr_debug("sst: Build date:%sTime:%s", build->date, build->time);
+                pr_debug("Build date:%sTime:%s", build->date, build->time);
                 break;
         }
         case IPC_IA_SET_PMIC_TYPE:
                 break;
         case IPC_IA_START_STREAM:
-                pr_debug("sst: reply for START STREAM %x\n", msg->header.full);
+                pr_debug("reply for START STREAM %x\n", msg->header.full);
                 break;
         default:
                 /* Illegal case */
-                pr_err("sst: process reply:default = %x\n", msg->header.full);
+                pr_err("process reply:default = %x\n", msg->header.full);
         }
         sst_clear_interrupt();
         return;
diff --git a/drivers/staging/intel_sst/intel_sst_pvt.c b/drivers/staging/intel_sst/intel_sst_pvt.c
index 6487e192bf93..01f8c3b1cf74 100644
--- a/drivers/staging/intel_sst/intel_sst_pvt.c
+++ b/drivers/staging/intel_sst/intel_sst_pvt.c
@@ -29,6 +29,8 @@
  *  This file contains all private functions
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/firmware.h>
@@ -60,7 +62,7 @@ int sst_get_block_stream(struct intel_sst_drv *sst_drv_ctx)
                 }
         }
         if (i == MAX_ACTIVE_STREAM) {
-                pr_err("sst: max alloc_stream reached");
+                pr_err("max alloc_stream reached\n");
                 i = -EBUSY; /* active stream limit reached */
         }
         return i;
@@ -84,14 +86,14 @@ int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx,
                                 block->condition)) {
                 /* event wake */
                 if (block->ret_code < 0) {
-                        pr_err("sst: stream failed %d\n", block->ret_code);
+                        pr_err("stream failed %d\n", block->ret_code);
                         retval = -EBUSY;
                 } else {
-                        pr_debug("sst: event up\n");
+                        pr_debug("event up\n");
                         retval = 0;
                 }
         } else {
-                pr_err("sst: signal interrupted\n");
+                pr_err("signal interrupted\n");
                 retval = -EINTR;
         }
         return retval;
@@ -115,18 +117,18 @@ int sst_wait_interruptible_timeout(
 {
         int retval = 0;
 
-        pr_debug("sst: sst_wait_interruptible_timeout - waiting....\n");
+        pr_debug("sst_wait_interruptible_timeout - waiting....\n");
         if (wait_event_interruptible_timeout(sst_drv_ctx->wait_queue,
                                                 block->condition,
                                                 msecs_to_jiffies(timeout))) {
                 if (block->ret_code < 0)
-                        pr_err("sst: stream failed %d\n", block->ret_code);
+                        pr_err("stream failed %d\n", block->ret_code);
                 else
-                        pr_debug("sst: event up\n");
+                        pr_debug("event up\n");
                 retval = block->ret_code;
         } else {
                 block->on = false;
-                pr_err("sst: timeout occured...\n");
+                pr_err("timeout occurred...\n");
                 /*setting firmware state as uninit so that the
                 firmware will get re-downloaded on next request
                 this is because firmare not responding for 5 sec
@@ -156,18 +158,18 @@ int sst_wait_timeout(struct intel_sst_drv *sst_drv_ctx,
         /* NOTE:
         Observed that FW processes the alloc msg and replies even
         before the alloc thread has finished execution */
-        pr_debug("sst: waiting for %x, condition %x\n",
+        pr_debug("waiting for %x, condition %x\n",
                        block->sst_id, block->ops_block.condition);
         if (wait_event_interruptible_timeout(sst_drv_ctx->wait_queue,
                                 block->ops_block.condition,
                                 msecs_to_jiffies(SST_BLOCK_TIMEOUT))) {
                 /* event wake */
-                pr_debug("sst: Event wake %x\n", block->ops_block.condition);
-                pr_debug("sst: message ret: %d\n", block->ops_block.ret_code);
+                pr_debug("Event wake %x\n", block->ops_block.condition);
+                pr_debug("message ret: %d\n", block->ops_block.ret_code);
                 retval = block->ops_block.ret_code;
         } else {
                 block->ops_block.on = false;
-                pr_err("sst: Wait timed-out %x\n", block->ops_block.condition);
+                pr_err("Wait timed-out %x\n", block->ops_block.condition);
                 /* settign firmware state as uninit so that the
                 firmware will get redownloaded on next request
                 this is because firmare not responding for 5 sec
@@ -192,14 +194,14 @@ int sst_create_large_msg(struct ipc_post **arg)
 
         msg = kzalloc(sizeof(struct ipc_post), GFP_ATOMIC);
         if (!msg) {
-                pr_err("sst: kzalloc msg failed\n");
+                pr_err("kzalloc msg failed\n");
                 return -ENOMEM;
         }
 
         msg->mailbox_data = kzalloc(SST_MAILBOX_SIZE, GFP_ATOMIC);
         if (!msg->mailbox_data) {
                 kfree(msg);
-                pr_err("sst: kzalloc mailbox_data failed");
+                pr_err("kzalloc mailbox_data failed");
                 return -ENOMEM;
         };
         *arg = msg;
@@ -219,7 +221,7 @@ int sst_create_short_msg(struct ipc_post **arg)
 
         msg = kzalloc(sizeof(*msg), GFP_ATOMIC);
         if (!msg) {
-                pr_err("sst: kzalloc msg failed\n");
+                pr_err("kzalloc msg failed\n");
                 return -ENOMEM;
         }
         msg->mailbox_data = NULL;
@@ -290,10 +292,10 @@ int sst_enable_rx_timeslot(int status)
         struct ipc_post *msg = NULL;
 
         if (sst_create_short_msg(&msg)) {
-                pr_err("sst: mem allocation failed\n");
+                pr_err("mem allocation failed\n");
                         return -ENOMEM;
         }
-        pr_debug("sst: ipc message sending: ENABLE_RX_TIME_SLOT\n");
+        pr_debug("ipc message sending: ENABLE_RX_TIME_SLOT\n");
         sst_fill_header(&msg->header, IPC_IA_ENABLE_RX_TIME_SLOT, 0, 0);
         msg->header.part.data = status;
         sst_drv_ctx->hs_info_blk.condition = false;
diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c
index b2c4b7067da0..795e42ab7360 100644
--- a/drivers/staging/intel_sst/intel_sst_stream.c
+++ b/drivers/staging/intel_sst/intel_sst_stream.c
@@ -26,6 +26,8 @@
  *  This file contains the stream operations of SST driver
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/firmware.h>
 #include <linux/sched.h>
@@ -45,8 +47,8 @@
  */
 int sst_check_device_type(u32 device, u32 num_chan, u32 *pcm_slot)
 {
-        if (device >= MAX_NUM_STREAMS) {
-                pr_debug("sst: device type invalid %d\n", device);
+        if (device > MAX_NUM_STREAMS_MFLD) {
+                pr_debug("device type invalid %d\n", device);
                 return -EINVAL;
         }
         if (sst_drv_ctx->streams[device].status == STREAM_UN_INIT) {
@@ -71,15 +73,15 @@ int sst_check_device_type(u32 device, u32 num_chan, u32 *pcm_slot)
                 else if (device == SND_SST_DEVICE_CAPTURE && num_chan == 4)
                         *pcm_slot = 0x0F;
                 else {
-                        pr_debug("sst: No condition satisfied.. ret err\n");
+                        pr_debug("No condition satisfied.. ret err\n");
                         return -EINVAL;
                 }
         } else {
-                pr_debug("sst: this stream state is not uni-init, is %d\n",
+                pr_debug("this stream state is not uni-init, is %d\n",
                                 sst_drv_ctx->streams[device].status);
                 return -EBADRQC;
         }
-        pr_debug("sst: returning slot %x\n", *pcm_slot);
+        pr_debug("returning slot %x\n", *pcm_slot);
         return 0;
 }
 /**
@@ -96,7 +98,7 @@ static unsigned int get_mrst_stream_id(void)
                 if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT)
                         return i;
         }
-        pr_debug("sst: Didnt find empty stream for mrst\n");
+        pr_debug("Didnt find empty stream for mrst\n");
         return -EBUSY;
 }
 
@@ -305,7 +307,7 @@ int sst_pause_stream(int str_id)
                 if (str_info->prev == STREAM_UN_INIT)
                         return -EBADRQC;
                 if (str_info->ctrl_blk.on == true) {
-                        pr_err("SST ERR: control path is in use\n ");
+                        pr_err("SST ERR: control path is in use\n");
                         return -EINVAL;
                 }
                 if (sst_create_short_msg(&msg))
@@ -333,7 +335,7 @@ int sst_pause_stream(int str_id)
                 }
         } else {
                 retval = -EBADRQC;
-                pr_err("SST ERR:BADQRC for stream\n ");
+                pr_err("SST ERR: BADQRC for stream\n");
         }
 
         return retval;
@@ -468,7 +470,7 @@ int sst_drop_stream(int str_id)
                 }
         } else {
                 retval = -EBADRQC;
-                pr_err("SST ERR:BADQRC for stream\n");
+                pr_err("SST ERR: BADQRC for stream\n");
         }
         return retval;
 }
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
index 5c455608b024..85789ba65186 100644
--- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c
+++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
@@ -26,13 +26,15 @@
  *  This file contains the stream operations of SST driver
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/syscalls.h>
 #include <linux/firmware.h>
 #include <linux/sched.h>
-#include <linux/rar_register.h>
 #ifdef CONFIG_MRST_RAR_HANDLER
-#include "../../../drivers/staging/memrar/memrar.h"
+#include <linux/rar_register.h>
+#include "../memrar/memrar.h"
 #endif
 #include "intel_sst_ioctl.h"
 #include "intel_sst.h"
@@ -53,7 +55,7 @@ int sst_get_stream_params(int str_id,
         struct stream_info *str_info;
         struct snd_sst_fw_get_stream_params *fw_params;
 
-        pr_debug("sst: get_stream for %d\n", str_id);
+        pr_debug("get_stream for %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return retval;
@@ -61,16 +63,16 @@ int sst_get_stream_params(int str_id,
         str_info = &sst_drv_ctx->streams[str_id];
         if (str_info->status != STREAM_UN_INIT) {
                 if (str_info->ctrl_blk.on == true) {
-                        pr_err("sst: control path in use\n");
+                        pr_err("control path in use\n");
                         return -EINVAL;
                 }
                 if (sst_create_short_msg(&msg)) {
-                        pr_err("sst: message creation failed\n");
+                        pr_err("message creation failed\n");
                         return -ENOMEM;
                 }
                 fw_params = kzalloc(sizeof(*fw_params), GFP_ATOMIC);
                 if (!fw_params) {
-                        pr_err("sst: mem allcoation failed\n ");
+                        pr_err("mem allocation failed\n");
                         kfree(msg);
                         return -ENOMEM;
                 }
@@ -104,7 +106,7 @@ int sst_get_stream_params(int str_id,
                 get_params->codec_params.stream_type = str_info->str_type;
                 kfree(fw_params);
         } else {
-                pr_debug("sst: Stream is not in the init state\n");
+                pr_debug("Stream is not in the init state\n");
         }
         return retval;
 }
@@ -125,17 +127,17 @@ int sst_set_stream_param(int str_id, struct snd_sst_params *str_param)
 
         BUG_ON(!str_param);
         if (sst_drv_ctx->streams[str_id].ops != str_param->ops) {
-                pr_err("sst: Invalid operation\n");
+                pr_err("Invalid operation\n");
                 return -EINVAL;
         }
         retval = sst_validate_strid(str_id);
         if (retval)
                 return retval;
-        pr_debug("sst: set_stream for %d\n", str_id);
+        pr_debug("set_stream for %d\n", str_id);
         str_info =  &sst_drv_ctx->streams[str_id];
         if (sst_drv_ctx->streams[str_id].status == STREAM_INIT) {
                 if (str_info->ctrl_blk.on == true) {
-                        pr_err("sst: control path in use\n");
+                        pr_err("control path in use\n");
                         return -EAGAIN;
                 }
                 if (sst_create_large_msg(&msg))
@@ -163,7 +165,7 @@ int sst_set_stream_param(int str_id, struct snd_sst_params *str_param)
                 }
         } else {
                 retval = -EBADRQC;
-                pr_err("sst: BADQRC for stream\n");
+                pr_err("BADQRC for stream\n");
         }
         return retval;
 }
@@ -183,7 +185,7 @@ int sst_get_vol(struct snd_sst_vol *get_vol)
         struct snd_sst_vol *fw_get_vol;
         int str_id = get_vol->stream_id;
 
-        pr_debug("sst: get vol called\n");
+        pr_debug("get vol called\n");
 
         if (sst_create_short_msg(&msg))
                 return -ENOMEM;
@@ -195,7 +197,7 @@ int sst_get_vol(struct snd_sst_vol *get_vol)
         sst_drv_ctx->vol_info_blk.on = true;
         fw_get_vol = kzalloc(sizeof(*fw_get_vol), GFP_ATOMIC);
         if (!fw_get_vol) {
-                pr_err("sst: mem allocation failed\n");
+                pr_err("mem allocation failed\n");
                 kfree(msg);
                 return -ENOMEM;
         }
@@ -209,10 +211,10 @@ int sst_get_vol(struct snd_sst_vol *get_vol)
         if (retval)
                 retval = -EIO;
         else {
-                pr_debug("sst: stream id %d\n", fw_get_vol->stream_id);
-                pr_debug("sst: volume %d\n", fw_get_vol->volume);
-                pr_debug("sst: ramp duration %d\n", fw_get_vol->ramp_duration);
-                pr_debug("sst: ramp_type %d\n", fw_get_vol->ramp_type);
+                pr_debug("stream id %d\n", fw_get_vol->stream_id);
+                pr_debug("volume %d\n", fw_get_vol->volume);
+                pr_debug("ramp duration %d\n", fw_get_vol->ramp_duration);
+                pr_debug("ramp_type %d\n", fw_get_vol->ramp_type);
                 memcpy(get_vol, fw_get_vol, sizeof(*fw_get_vol));
         }
         return retval;
@@ -231,10 +233,10 @@ int sst_set_vol(struct snd_sst_vol *set_vol)
         int retval = 0;
         struct ipc_post *msg = NULL;
 
-        pr_debug("sst: set vol called\n");
+        pr_debug("set vol called\n");
 
         if (sst_create_large_msg(&msg)) {
-                pr_err("sst: message creation failed\n");
+                pr_err("message creation failed\n");
                 return -ENOMEM;
         }
         sst_fill_header(&msg->header, IPC_IA_SET_STREAM_VOL, 1,
@@ -254,7 +256,7 @@ int sst_set_vol(struct snd_sst_vol *set_vol)
         retval = sst_wait_interruptible_timeout(sst_drv_ctx,
                         &sst_drv_ctx->vol_info_blk, SST_BLOCK_TIMEOUT);
         if (retval) {
-                pr_err("sst: error in set_vol = %d\n", retval);
+                pr_err("error in set_vol = %d\n", retval);
                 retval = -EIO;
         }
         return retval;
@@ -273,10 +275,10 @@ int sst_set_mute(struct snd_sst_mute *set_mute)
         int retval = 0;
         struct ipc_post *msg = NULL;
 
-        pr_debug("sst: set mute called\n");
+        pr_debug("set mute called\n");
 
         if (sst_create_large_msg(&msg)) {
-                pr_err("sst: message creation failed\n");
+                pr_err("message creation failed\n");
                 return -ENOMEM;
         }
         sst_fill_header(&msg->header, IPC_IA_SET_STREAM_MUTE, 1,
@@ -297,7 +299,7 @@ int sst_set_mute(struct snd_sst_mute *set_mute)
         retval = sst_wait_interruptible_timeout(sst_drv_ctx,
                         &sst_drv_ctx->mute_info_blk, SST_BLOCK_TIMEOUT);
         if (retval) {
-                pr_err("sst: error in set_mute = %d\n", retval);
+                pr_err("error in set_mute = %d\n", retval);
                 retval = -EIO;
         }
         return retval;
@@ -358,20 +360,20 @@ int sst_parse_target(struct snd_sst_slot_info *slot)
                 slot->device_type == SND_SST_DEVICE_PCM) {
                         retval = sst_activate_target(slot);
                         if (retval)
-                                pr_err("sst: SST_Activate_target_fail\n");
+                                pr_err("SST_Activate_target_fail\n");
                         else
-                                pr_err("sst: SST_Activate_target_pass\n");
+                                pr_err("SST_Activate_target_pass\n");
                 return retval;
         } else if (slot->action == SND_SST_PORT_PREPARE &&
                         slot->device_type == SND_SST_DEVICE_PCM) {
                                 retval = sst_prepare_target(slot);
                         if (retval)
-                                pr_err("sst: SST_prepare_target_fail\n");
+                                pr_err("SST_prepare_target_fail\n");
                         else
-                                pr_err("sst: SST_prepare_target_pass\n");
+                                pr_err("SST_prepare_target_pass\n");
                         return retval;
         } else {
-                pr_err("sst: slot_action : %d, device_type: %d\n",
+                pr_err("slot_action : %d, device_type: %d\n",
                                 slot->action, slot->device_type);
                 return retval;
         }
@@ -383,7 +385,7 @@ int sst_send_target(struct snd_sst_target_device *target)
         struct ipc_post *msg;
 
         if (sst_create_large_msg(&msg)) {
-                pr_err("sst: message creation failed\n");
+                pr_err("message creation failed\n");
                 return -ENOMEM;
         }
         sst_fill_header(&msg->header, IPC_IA_TARGET_DEV_SELECT, 1, 0);
@@ -399,11 +401,11 @@ int sst_send_target(struct snd_sst_target_device *target)
         list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
         spin_unlock(&sst_drv_ctx->list_spin_lock);
         sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        pr_debug("sst: message sent- waiting\n");
+        pr_debug("message sent- waiting\n");
         retval = sst_wait_interruptible_timeout(sst_drv_ctx,
                         &sst_drv_ctx->tgt_dev_blk, TARGET_DEV_BLOCK_TIMEOUT);
         if (retval)
-                pr_err("sst: target device ipc failed = 0x%x\n", retval);
+                pr_err("target device ipc failed = 0x%x\n", retval);
         return retval;
 
 }
@@ -439,7 +441,7 @@ int sst_target_device_validate(struct snd_sst_target_device *target)
                                         goto err;
                         } else {
 err:
-                                pr_err("sst: i/p params incorrect\n");
+                                pr_err("i/p params incorrect\n");
                                 return -EINVAL;
                         }
                 }
@@ -460,15 +462,15 @@ int sst_target_device_select(struct snd_sst_target_device *target)
 {
         int retval, i, prepare_count = 0;
 
-        pr_debug("sst: Target Device Select\n");
+        pr_debug("Target Device Select\n");
 
         if (target->device_route < 0 || target->device_route > 2) {
-                pr_err("sst: device route is invalid\n");
+                pr_err("device route is invalid\n");
                 return -EINVAL;
         }
 
         if (target->device_route != 0) {
-                pr_err("sst: Unsupported config\n");
+                pr_err("Unsupported config\n");
                 return -EIO;
         }
         retval = sst_target_device_validate(target);
@@ -480,18 +482,18 @@ int sst_target_device_select(struct snd_sst_target_device *target)
                 return retval;
         for (i = 0; i < SST_MAX_TARGET_DEVICES; i++) {
                 if (target->devices[i].action == SND_SST_PORT_ACTIVATE) {
-                        pr_debug("sst: activate called in %d\n", i);
+                        pr_debug("activate called in %d\n", i);
                         retval = sst_parse_target(&target->devices[i]);
                         if (retval)
                                 return retval;
                 } else if (target->devices[i].action == SND_SST_PORT_PREPARE) {
-                        pr_debug("sst: PREPARE in %d, Forwading\n", i);
+                        pr_debug("PREPARE in %d, Forwarding\n", i);
                         retval = sst_parse_target(&target->devices[i]);
                         if (retval) {
-                                pr_err("sst: Parse Target fail %d", retval);
+                                pr_err("Parse Target fail %d\n", retval);
                                 return retval;
                         }
-                        pr_debug("sst: Parse Target successful %d", retval);
+                        pr_debug("Parse Target successful %d\n", retval);
                         if (target->devices[i].device_type ==
                                                 SND_SST_DEVICE_PCM)
                                 prepare_count++;
@@ -512,11 +514,11 @@ static inline int sst_get_RAR(struct RAR_buffer *buffers, int count)
         rar_status = rar_handle_to_bus(buffers, count);
 
         if (count != rar_status) {
-                pr_err("sst: The rar CALL Failed");
+                pr_err("The rar CALL Failed");
                 retval = -EIO;
         }
         if (buffers->info.type != RAR_TYPE_AUDIO) {
-                pr_err("sst: Invalid RAR type\n");
+                pr_err("Invalid RAR type\n");
                 return -EINVAL;
         }
         return retval;
@@ -539,10 +541,10 @@ static int sst_create_sg_list(struct stream_info *stream,
                 if (kbufs->in_use == false) {
 #ifdef CONFIG_MRST_RAR_HANDLER
                         if (stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                                pr_debug("sst: DRM playback handling\n");
+                                pr_debug("DRM playback handling\n");
                                 rar_buffers.info.handle = (__u32)kbufs->addr;
                                 rar_buffers.info.size = kbufs->size;
-                                pr_debug("sst: rar handle 0x%x size=0x%x",
+                                pr_debug("rar handle 0x%x size=0x%x\n",
                                         rar_buffers.info.handle,
                                         rar_buffers.info.size);
                                 retval =  sst_get_RAR(&rar_buffers, 1);
@@ -552,7 +554,7 @@ static int sst_create_sg_list(struct stream_info *stream,
                                 sg_list->addr[i].addr = rar_buffers.bus_address;
                                 /* rar_buffers.info.size; */
                                 sg_list->addr[i].size = (__u32)kbufs->size;
-                                pr_debug("sst: phyaddr[%d] 0x%x Size:0x%x\n"
+                                pr_debug("phyaddr[%d] 0x%x Size:0x%x\n"
                                         , i, sg_list->addr[i].addr,
                                         sg_list->addr[i].size);
                         }
@@ -562,7 +564,7 @@ static int sst_create_sg_list(struct stream_info *stream,
                                         virt_to_phys((void *)
                                                 kbufs->addr + kbufs->offset);
                                 sg_list->addr[i].size = kbufs->size;
-                                pr_debug("sst: phyaddr[%d]:0x%x Size:0x%x\n"
+                                pr_debug("phyaddr[%d]:0x%x Size:0x%x\n"
                                 , i , sg_list->addr[i].addr, kbufs->size);
                         }
                         stream->curr_bytes += sg_list->addr[i].size;
@@ -574,7 +576,7 @@ static int sst_create_sg_list(struct stream_info *stream,
         }
 
         sg_list->num_entries = i;
-        pr_debug("sst:sg list entries = %d\n", sg_list->num_entries);
+        pr_debug("sg list entries = %d\n", sg_list->num_entries);
         return i;
 }
 
@@ -595,7 +597,7 @@ int sst_play_frame(int str_id)
         struct sst_stream_bufs *kbufs = NULL, *_kbufs;
         struct stream_info *stream;
 
-        pr_debug("sst: play frame for %d\n", str_id);
+        pr_debug("play frame for %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return retval;
@@ -615,14 +617,14 @@ int sst_play_frame(int str_id)
         stream->curr_bytes = 0;
         if (list_empty(&stream->bufs)) {
                 /* no user buffer available */
-                pr_debug("sst: Null buffer stream status %d\n", stream->status);
+                pr_debug("Null buffer stream status %d\n", stream->status);
                 stream->prev = stream->status;
                 stream->status = STREAM_INIT;
-                pr_debug("sst:new stream status = %d\n", stream->status);
+                pr_debug("new stream status = %d\n", stream->status);
                 if (stream->need_draining == true) {
-                        pr_debug("sst:draining stream\n");
+                        pr_debug("draining stream\n");
                         if (sst_create_short_msg(&msg)) {
-                                pr_err("sst: mem alloc failed\n");
+                                pr_err("mem allocation failed\n");
                                 return -ENOMEM;
                         }
                         sst_fill_header(&msg->header, IPC_IA_DRAIN_STREAM,
@@ -633,7 +635,7 @@ int sst_play_frame(int str_id)
                         spin_unlock(&sst_drv_ctx->list_spin_lock);
                         sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
                 } else if (stream->data_blk.on == true) {
-                        pr_debug("sst:user list empty.. wake\n");
+                        pr_debug("user list empty.. wake\n");
                         /* unblock */
                         stream->data_blk.ret_code = 0;
                         stream->data_blk.condition = true;
@@ -678,7 +680,7 @@ int sst_capture_frame(int str_id)
         struct stream_info *stream;
 
 
-        pr_debug("sst:capture frame for %d\n", str_id);
+        pr_debug("capture frame for %d\n", str_id);
         retval = sst_validate_strid(str_id);
         if (retval)
                 return retval;
@@ -688,19 +690,19 @@ int sst_capture_frame(int str_id)
                 if (kbufs->in_use == true) {
                         list_del(&kbufs->node);
                         kfree(kbufs);
-                        pr_debug("sst:del node\n");
+                        pr_debug("del node\n");
                 }
         }
         if (list_empty(&stream->bufs)) {
                 /* no user buffer available */
-                pr_debug("sst:Null buffer!!!!stream status %d\n",
+                pr_debug("Null buffer!!!!stream status %d\n",
                                stream->status);
                 stream->prev = stream->status;
                 stream->status = STREAM_INIT;
-                pr_debug("sst:new stream status = %d\n",
+                pr_debug("new stream status = %d\n",
                                stream->status);
                 if (stream->data_blk.on == true) {
-                        pr_debug("sst:user list empty.. wake\n");
+                        pr_debug("user list empty.. wake\n");
                         /* unblock */
                         stream->data_blk.ret_code = 0;
                         stream->data_blk.condition = true;
@@ -731,7 +733,7 @@ int sst_capture_frame(int str_id)
         stream->cumm_bytes += stream->curr_bytes;
         stream->curr_bytes = 0;
 
-    pr_debug("sst:Cum bytes  = %d\n", stream->cumm_bytes);
+    pr_debug("Cum bytes  = %d\n", stream->cumm_bytes);
         return 0;
 }
 
@@ -743,7 +745,7 @@ static unsigned int calculate_min_size(struct snd_sst_buffs *bufs)
                 if (bufs->buff_entry[i].size < min_val)
                         min_val = bufs->buff_entry[i].size;
         }
-        pr_debug("sst:min_val = %d\n", min_val);
+        pr_debug("min_val = %d\n", min_val);
         return min_val;
 }
 
@@ -754,7 +756,7 @@ static unsigned int calculate_max_size(struct snd_sst_buffs *bufs)
                 if (bufs->buff_entry[i].size > max_val)
                         max_val = bufs->buff_entry[i].size;
         }
-        pr_debug("sst:max_val = %d\n", max_val);
+        pr_debug("max_val = %d\n", max_val);
         return max_val;
 }
 
@@ -773,7 +775,7 @@ static int sst_allocate_decode_buf(struct stream_info *str_info,
                         if (dbufs->ibufs->entries == dbufs->obufs->entries)
                                 return 0;
                         else {
-                                pr_err("sst: RAR entries dont match\n");
+                                pr_err("RAR entries dont match\n");
                                  return -EINVAL;
                         }
                 } else
@@ -783,26 +785,26 @@ static int sst_allocate_decode_buf(struct stream_info *str_info,
         }
 #endif
         if (!str_info->decode_ibuf) {
-                pr_debug("sst:no i/p buffers, trying full size\n");
+                pr_debug("no i/p buffers, trying full size\n");
                 str_info->decode_isize = cum_input_given;
                 str_info->decode_ibuf = kzalloc(str_info->decode_isize,
                                                 GFP_KERNEL);
                 str_info->idecode_alloc = str_info->decode_isize;
         }
         if (!str_info->decode_ibuf) {
-                pr_debug("sst:buff alloc failed, try max size\n");
+                pr_debug("buff alloc failed, try max size\n");
                 str_info->decode_isize = calculate_max_size(dbufs->ibufs);
                 str_info->decode_ibuf = kzalloc(
                                 str_info->decode_isize, GFP_KERNEL);
                 str_info->idecode_alloc = str_info->decode_isize;
         }
         if (!str_info->decode_ibuf) {
-                pr_debug("sst:buff alloc failed, try min size\n");
+                pr_debug("buff alloc failed, try min size\n");
                 str_info->decode_isize = calculate_min_size(dbufs->ibufs);
                 str_info->decode_ibuf = kzalloc(str_info->decode_isize,
                                                 GFP_KERNEL);
                 if (!str_info->decode_ibuf) {
-                        pr_err("sst: mem allocation failed\n");
+                        pr_err("mem allocation failed\n");
                         return -ENOMEM;
                 }
                 str_info->idecode_alloc = str_info->decode_isize;
@@ -820,7 +822,7 @@ static int sst_send_decode_mess(int str_id, struct stream_info *str_info,
         struct ipc_post *msg = NULL;
         int retval = 0;
 
-        pr_debug("SST DBGsst_set_mute:called\n");
+        pr_debug("SST DBG:sst_set_mute:called\n");
 
         if (str_info->decode_ibuf_type == SST_BUF_RAR) {
 #ifdef CONFIG_MRST_RAR_HANDLER
@@ -857,7 +859,7 @@ static int sst_send_decode_mess(int str_id, struct stream_info *str_info,
         dec_info->input_bytes_consumed = 0;
         dec_info->output_bytes_produced = 0;
         if (sst_create_large_msg(&msg)) {
-                pr_err("sst: message creation failed\n");
+                pr_err("message creation failed\n");
                 return -ENOMEM;
         }
 
@@ -878,13 +880,13 @@ static int sst_send_decode_mess(int str_id, struct stream_info *str_info,
         return retval;
 }
 
+#ifdef CONFIG_MRST_RAR_HANDLER
 static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
                         struct snd_sst_dbufs *dbufs,
                         int *input_index, int *in_copied,
                         int *input_index_valid_size, int *new_entry_flag)
 {
         int retval = 0;
-#ifdef CONFIG_MRST_RAR_HANDLER
         int i;
 
         if (str_info->ops == STREAM_OPS_PLAYBACK_DRM) {
@@ -894,7 +896,7 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
                                 dbufs->ibufs->buff_entry[i].buffer,
                                 sizeof(__u32));
                 if (retval) {
-                        pr_err("sst:cpy from user fail\n");
+                        pr_err("cpy from user fail\n");
                         return -EAGAIN;
                 }
                 rar_buffers.info.type = dbufs->ibufs->type;
@@ -919,9 +921,10 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
                 str_info->decode_ibuf_type = dbufs->ibufs->type;
                 *in_copied = str_info->decode_isize;
         }
-#endif
         return retval;
 }
+#endif
+
 /*This function is used to prepare the kernel input buffers with contents
 before sending for decode*/
 static int sst_prepare_input_buffers(struct stream_info *str_info,
@@ -931,7 +934,7 @@ static int sst_prepare_input_buffers(struct stream_info *str_info,
 {
         int i, cpy_size, retval = 0;
 
-        pr_debug("sst:input_index = %d, input entries = %d\n",
+        pr_debug("input_index = %d, input entries = %d\n",
                          *input_index, dbufs->ibufs->entries);
         for (i = *input_index; i < dbufs->ibufs->entries; i++) {
 #ifdef CONFIG_MRST_RAR_HANDLER
@@ -939,7 +942,7 @@ static int sst_prepare_input_buffers(struct stream_info *str_info,
                         dbufs, input_index, in_copied,
                                 input_index_valid_size, new_entry_flag);
                 if (retval) {
-                        pr_err("sst: In prepare input buffers for RAR\n");
+                        pr_err("In prepare input buffers for RAR\n");
                         return -EIO;
                 }
 #endif
@@ -947,10 +950,10 @@ static int sst_prepare_input_buffers(struct stream_info *str_info,
                 if (*input_index_valid_size == 0)
                         *input_index_valid_size =
                                 dbufs->ibufs->buff_entry[i].size;
-                pr_debug("sst:inout addr = %p, size = %d\n",
+                pr_debug("inout addr = %p, size = %d\n",
                         dbufs->ibufs->buff_entry[i].buffer,
                         *input_index_valid_size);
-                pr_debug("sst:decode_isize = %d, in_copied %d\n",
+                pr_debug("decode_isize = %d, in_copied %d\n",
                         str_info->decode_isize, *in_copied);
                 if (*input_index_valid_size <=
                                         (str_info->decode_isize - *in_copied))
@@ -958,12 +961,12 @@ static int sst_prepare_input_buffers(struct stream_info *str_info,
                 else
                         cpy_size = str_info->decode_isize - *in_copied;
 
-                pr_debug("sst:cpy size = %d\n", cpy_size);
+                pr_debug("cpy size = %d\n", cpy_size);
                 if (!dbufs->ibufs->buff_entry[i].buffer) {
-                        pr_err("sst: i/p buffer is null\n");
+                        pr_err("i/p buffer is null\n");
                         return -EINVAL;
                 }
-                pr_debug("sst:Try copy To %p, From %p, size %d\n",
+                pr_debug("Try copy To %p, From %p, size %d\n",
                                 str_info->decode_ibuf + *in_copied,
                                 dbufs->ibufs->buff_entry[i].buffer, cpy_size);
 
@@ -972,22 +975,22 @@ static int sst_prepare_input_buffers(struct stream_info *str_info,
                                 (void *) dbufs->ibufs->buff_entry[i].buffer,
                                 cpy_size);
                 if (retval) {
-                        pr_err("sst: copy from user failed\n");
+                        pr_err("copy from user failed\n");
                         return -EIO;
                 }
                 *in_copied += cpy_size;
                 *input_index_valid_size -= cpy_size;
-                pr_debug("sst:in buff size = %d, in_copied = %d\n",
+                pr_debug("in buff size = %d, in_copied = %d\n",
                         *input_index_valid_size, *in_copied);
                 if (*input_index_valid_size != 0) {
-                        pr_debug("sst:more input buffers left\n");
+                        pr_debug("more input buffers left\n");
                         dbufs->ibufs->buff_entry[i].buffer += cpy_size;
                         break;
                 }
                 if (*in_copied == str_info->decode_isize &&
                         *input_index_valid_size == 0 &&
                         (i+1) <= dbufs->ibufs->entries) {
-                        pr_debug("sst:all input buffers copied\n");
+                        pr_debug("all input buffers copied\n");
                         *new_entry_flag = true;
                         *input_index = i + 1;
                         break;
@@ -1005,23 +1008,23 @@ static int sst_prepare_output_buffers(struct stream_info *str_info,
 
 {
         int i, cpy_size, retval = 0;
-        pr_debug("sst:output_index = %d, output entries = %d\n",
+        pr_debug("output_index = %d, output entries = %d\n",
                                 *output_index,
                                 dbufs->obufs->entries);
         for (i = *output_index; i < dbufs->obufs->entries; i++) {
                 *output_index = i;
-                pr_debug("sst:output addr = %p, size = %d\n",
+                pr_debug("output addr = %p, size = %d\n",
                         dbufs->obufs->buff_entry[i].buffer,
                         dbufs->obufs->buff_entry[i].size);
-                pr_debug("sst:output_size = %d, out_copied = %d\n",
+                pr_debug("output_size = %d, out_copied = %d\n",
                                 output_size, *out_copied);
                 if (dbufs->obufs->buff_entry[i].size <
                                 (output_size - *out_copied))
                         cpy_size = dbufs->obufs->buff_entry[i].size;
                 else
                         cpy_size = output_size - *out_copied;
-                pr_debug("sst:cpy size = %d\n", cpy_size);
-                pr_debug("sst:Try copy To: %p, From %p, size %d\n",
+                pr_debug("cpy size = %d\n", cpy_size);
+                pr_debug("Try copy To: %p, From %p, size %d\n",
                                 dbufs->obufs->buff_entry[i].buffer,
                                 sst_drv_ctx->mmap_mem + *out_copied,
                                 cpy_size);
@@ -1029,13 +1032,13 @@ static int sst_prepare_output_buffers(struct stream_info *str_info,
                                         sst_drv_ctx->mmap_mem + *out_copied,
                                         cpy_size);
                 if (retval) {
-                        pr_err("sst: copy to user failed\n");
+                        pr_err("copy to user failed\n");
                         return -EIO;
                 } else
-                        pr_debug("sst:copy to user passed\n");
+                        pr_debug("copy to user passed\n");
                 *out_copied += cpy_size;
                 dbufs->obufs->buff_entry[i].size -= cpy_size;
-                pr_debug("sst:o/p buff size %d, out_copied %d\n",
+                pr_debug("o/p buff size %d, out_copied %d\n",
                         dbufs->obufs->buff_entry[i].size, *out_copied);
                 if (dbufs->obufs->buff_entry[i].size != 0) {
                         *output_index = i;
@@ -1073,7 +1076,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
         unsigned long long input_bytes, output_bytes;
 
         sst_drv_ctx->scard_ops->power_down_pmic();
-        pr_debug("sst: Powering_down_PMIC...\n");
+        pr_debug("Powering_down_PMIC...\n");
 
         retval = sst_validate_strid(str_id);
         if (retval)
@@ -1081,7 +1084,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
 
         str_info = &sst_drv_ctx->streams[str_id];
         if (str_info->status != STREAM_INIT) {
-                pr_err("sst: invalid stream state = %d\n",
+                pr_err("invalid stream state = %d\n",
                                str_info->status);
                 return -EINVAL;
         }
@@ -1098,7 +1101,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
         retval =  sst_allocate_decode_buf(str_info, dbufs,
                                 cum_input_given, cum_output_given);
         if (retval) {
-                pr_err("sst: mem allocation failed, abort!!!\n");
+                pr_err("mem allocation failed, abort!!!\n");
                 retval = -ENOMEM;
                 goto finish;
         }
@@ -1114,7 +1117,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                         dbufs, &input_index, &in_copied,
                         &input_index_valid_size, &new_entry_flag);
                 if (retval) {
-                        pr_err("sst: prepare in buffers failed\n");
+                        pr_err("prepare in buffers failed\n");
                         goto finish;
                 }
 
@@ -1145,8 +1148,8 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                                 str_info->decode_osize = dbufs->obufs->
                                         buff_entry[output_index].size;
                                 str_info->decode_obuf_type = dbufs->obufs->type;
-                                pr_debug("sst:DRM handling\n");
-                                pr_debug("o/p_add=0x%lu Size=0x%x",
+                                pr_debug("DRM handling\n");
+                                pr_debug("o/p_add=0x%lu Size=0x%x\n",
                                         (unsigned long) str_info->decode_obuf,
                                         str_info->decode_osize);
                         } else {
@@ -1160,7 +1163,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                 if (str_info->ops != STREAM_OPS_PLAYBACK_DRM) {
                         if (str_info->decode_isize > in_copied) {
                                 str_info->decode_isize = in_copied;
-                                pr_debug("sst:i/p size = %d\n",
+                                pr_debug("i/p size = %d\n",
                                                 str_info->decode_isize);
                         }
                 }
@@ -1168,20 +1171,19 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
 
                 retval = sst_send_decode_mess(str_id, str_info, &dec_info);
                 if (retval || dec_info.input_bytes_consumed == 0) {
-                        pr_err(
-                                "SST ERR: mess failed or no input consumed\n");
+                        pr_err("SST ERR: mess failed or no input consumed\n");
                         goto finish;
                 }
                 input_bytes = dec_info.input_bytes_consumed;
                 output_bytes = dec_info.output_bytes_produced;
 
-                pr_debug("sst:in_copied=%d, con=%lld, prod=%lld\n",
+                pr_debug("in_copied=%d, con=%lld, prod=%lld\n",
                         in_copied, input_bytes, output_bytes);
                 if (dbufs->obufs->type == SST_BUF_RAR) {
                         output_index += 1;
                         if (output_index == dbufs->obufs->entries) {
                                 copy_in_done = true;
-                                pr_debug("sst:all i/p cpy done\n");
+                                pr_debug("all i/p cpy done\n");
                         }
                         total_output += output_bytes;
                 } else {
@@ -1190,14 +1192,14 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                         retval = sst_prepare_output_buffers(str_info, dbufs,
                                 &output_index, output_size, &out_copied);
                         if (retval) {
-                                pr_err("sst:prep out buff fail\n");
+                                pr_err("prep out buff fail\n");
                                 goto finish;
                         }
                         if (str_info->ops != STREAM_OPS_PLAYBACK_DRM) {
                                 if (in_copied != input_bytes) {
                                         int bytes_left = in_copied -
                                                                 input_bytes;
-                                        pr_debug("sst:bytes %d\n",
+                                        pr_debug("bytes %d\n",
                                                         bytes_left);
                                         if (new_entry_flag == true)
                                                 input_index--;
@@ -1237,7 +1239,7 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                         total_output += out_copied;
                         if (str_info->decode_osize != out_copied) {
                                 str_info->decode_osize -= out_copied;
-                                pr_debug("sst:output size modified = %d\n",
+                                pr_debug("output size modified = %d\n",
                                                 str_info->decode_osize);
                         }
                 }
@@ -1251,16 +1253,16 @@ int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
                 } else {
                         if (total_output == cum_output_given) {
                                 copy_out_done = true;
-                                pr_debug("sst:all o/p cpy done\n");
+                                pr_debug("all o/p cpy done\n");
                         }
 
                         if (total_input == cum_input_given) {
                                 copy_in_done = true;
-                                pr_debug("sst:all i/p cpy done\n");
+                                pr_debug("all i/p cpy done\n");
                         }
                 }
 
-                pr_debug("sst:copy_out = %d, copy_in = %d\n",
+                pr_debug("copy_out = %d, copy_in = %d\n",
                                 copy_out_done, copy_in_done);
         }
 
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 4c0264ceaa88..fb2292186703 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -24,6 +24,9 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * ALSA driver for Intel MID sound card chipset
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
@@ -101,12 +104,10 @@ static struct snd_pcm_hardware snd_intelmad_stream = {
 static int snd_intelmad_pcm_trigger(struct snd_pcm_substream *substream,
                                         int cmd)
 {
-        int ret_val = 0;
+        int ret_val = 0, str_id;
         struct snd_intelmad *intelmaddata;
         struct mad_stream_pvt *stream;
-        /*struct stream_buffer buffer_to_sst;*/
-
-
+        struct intel_sst_pcm_control *sst_ops;
 
         WARN_ON(!substream);
 
@@ -115,38 +116,35 @@ static int snd_intelmad_pcm_trigger(struct snd_pcm_substream *substream,
 
         WARN_ON(!intelmaddata->sstdrv_ops);
         WARN_ON(!intelmaddata->sstdrv_ops->scard_ops);
+        sst_ops  = intelmaddata->sstdrv_ops->pcm_control;
+        str_id = stream->stream_info.str_id;
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                pr_debug("sst: Trigger Start\n");
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_START,
-                                &stream->stream_info.str_id);
+                pr_debug("Trigger Start\n");
+                ret_val = sst_ops->device_control(SST_SND_START, &str_id);
                 if (ret_val)
                         return ret_val;
                 stream->stream_status = RUNNING;
                 stream->substream = substream;
-                stream->stream_status = RUNNING;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
-                pr_debug("sst: in stop\n");
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_DROP,
-                                &stream->stream_info.str_id);
+                pr_debug("in stop\n");
+                ret_val = sst_ops->device_control(SST_SND_DROP, &str_id);
                 if (ret_val)
                         return ret_val;
                 stream->stream_status = DROPPED;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                pr_debug("sst: in pause\n");
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_PAUSE,
-                                &stream->stream_info.str_id);
+                pr_debug("in pause\n");
+                ret_val = sst_ops->device_control(SST_SND_PAUSE, &str_id);
                 if (ret_val)
                         return ret_val;
                 stream->stream_status = PAUSED;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                pr_debug("sst: in pause release\n");
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_RESUME,
-                                                &stream->stream_info.str_id);
+                pr_debug("in pause release\n");
+                ret_val = sst_ops->device_control(SST_SND_RESUME, &str_id);
                 if (ret_val)
                         return ret_val;
                 stream->stream_status = RUNNING;
@@ -170,19 +168,19 @@ static int snd_intelmad_pcm_prepare(struct snd_pcm_substream *substream)
         int ret_val = 0;
         struct snd_intelmad *intelmaddata;
 
-        pr_debug("sst: pcm_prepare called\n");
+        pr_debug("pcm_prepare called\n");
 
         WARN_ON(!substream);
         stream = substream->runtime->private_data;
         intelmaddata = snd_pcm_substream_chip(substream);
-        pr_debug("sst: pb cnt = %d cap cnt = %d\n",\
+        pr_debug("pb cnt = %d cap cnt = %d\n",\
                 intelmaddata->playback_cnt,
                 intelmaddata->capture_cnt);
 
         if (stream->stream_info.str_id) {
-                pr_debug("sst: Prepare called for already set stream\n");
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_DROP,
-                                        &stream->stream_info.str_id);
+                pr_debug("Prepare called for already set stream\n");
+                ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
+                                SST_SND_DROP, &stream->stream_info.str_id);
                 return ret_val;
         }
 
@@ -197,7 +195,7 @@ static int snd_intelmad_pcm_prepare(struct snd_pcm_substream *substream)
         /* return back the stream id */
         snprintf(substream->pcm->id, sizeof(substream->pcm->id),
                         "%d", stream->stream_info.str_id);
-        pr_debug("sst: stream id to user = %s\n",
+        pr_debug("stream id to user = %s\n",
                         substream->pcm->id);
 
         ret_val = snd_intelmad_init_stream(substream);
@@ -212,7 +210,7 @@ static int snd_intelmad_hw_params(struct snd_pcm_substream *substream,
 {
         int ret_val;
 
-        pr_debug("sst: snd_intelmad_hw_params called\n");
+        pr_debug("snd_intelmad_hw_params called\n");
         ret_val = snd_pcm_lib_malloc_pages(substream,
                         params_buffer_bytes(hw_params));
         memset(substream->runtime->dma_area, 0,
@@ -223,7 +221,7 @@ static int snd_intelmad_hw_params(struct snd_pcm_substream *substream,
 
 static int snd_intelmad_hw_free(struct snd_pcm_substream *substream)
 {
-        pr_debug("sst: snd_intelmad_hw_free called\n");
+        pr_debug("snd_intelmad_hw_free called\n");
         return snd_pcm_lib_free_pages(substream);
 }
 
@@ -250,15 +248,15 @@ static snd_pcm_uframes_t snd_intelmad_pcm_pointer
         if (stream->stream_status == INIT)
                 return 0;
 
-        ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_BUFFER_POINTER,
-                                &stream->stream_info);
+        ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
+                        SST_SND_BUFFER_POINTER, &stream->stream_info);
         if (ret_val) {
-                pr_err("sst: error code = 0x%x\n", ret_val);
+                pr_err("error code = 0x%x\n", ret_val);
                 return ret_val;
         }
-        pr_debug("sst: samples reported out 0x%llx\n",
+        pr_debug("samples reported out 0x%llx\n",
                         stream->stream_info.buffer_ptr);
-        pr_debug("sst: Frame bits:: %d period_count :: %d\n",
+        pr_debug("Frame bits:: %d period_count :: %d\n",
                         (int)substream->runtime->frame_bits,
                         (int)substream->runtime->period_size);
 
@@ -277,26 +275,26 @@ static int snd_intelmad_close(struct snd_pcm_substream *substream)
 {
         struct snd_intelmad *intelmaddata;
         struct mad_stream_pvt *stream;
-        int ret_val = 0;
+        int ret_val = 0, str_id;
 
         WARN_ON(!substream);
 
         stream = substream->runtime->private_data;
+        str_id = stream->stream_info.str_id;
 
-        pr_debug("sst: snd_intelmad_close called\n");
+        pr_debug("sst: snd_intelmad_close called for %d\n", str_id);
         intelmaddata = snd_pcm_substream_chip(substream);
 
-        pr_debug("sst: str id = %d\n", stream->stream_info.str_id);
+        pr_debug("str id = %d\n", stream->stream_info.str_id);
         if (stream->stream_info.str_id) {
                 /* SST API to actually stop/free the stream */
-                ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_FREE,
-                                &stream->stream_info.str_id);
+                ret_val = intelmaddata->sstdrv_ops->pcm_control->close(str_id);
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         intelmaddata->playback_cnt--;
                 else
                         intelmaddata->capture_cnt--;
         }
-        pr_debug("sst: snd_intelmad_close : pb cnt = %d cap cnt = %d\n",
+        pr_debug("snd_intelmad_close : pb cnt = %d cap cnt = %d\n",
                 intelmaddata->playback_cnt, intelmaddata->capture_cnt);
         kfree(substream->runtime->private_data);
         return ret_val;
@@ -319,7 +317,7 @@ static int snd_intelmad_open(struct snd_pcm_substream *substream,
 
         WARN_ON(!substream);
 
-        pr_debug("sst: snd_intelmad_open called\n");
+        pr_debug("snd_intelmad_open called\n");
 
         intelmaddata = snd_pcm_substream_chip(substream);
         runtime = substream->runtime;
@@ -456,17 +454,17 @@ void sst_mad_send_jack_report(struct snd_jack *jack,
 {
 
         if (!jack) {
-                pr_debug("sst: MAD error jack empty\n");
+                pr_debug("MAD error jack empty\n");
 
         } else {
-                pr_debug("sst: MAD send jack report for = %d!!!\n", status);
-                pr_debug("sst: MAD send jack report %d\n", jack->type);
+                pr_debug("MAD send jack report for = %d!!!\n", status);
+                pr_debug("MAD send jack report %d\n", jack->type);
                 snd_jack_report(jack, status);
 
                 /*button pressed and released */
                 if (buttonpressevent)
                         snd_jack_report(jack, 0);
-                pr_debug("sst: MAD sending jack report Done !!!\n");
+                pr_debug("MAD sending jack report Done !!!\n");
         }
 
 
@@ -490,7 +488,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
         if (intsts & 0x4) {
 
                 if (!(intelmid_audio_interrupt_enable)) {
-                        pr_debug("sst: Audio interrupt enable\n");
+                        pr_debug("Audio interrupt enable\n");
                         sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
 
                         sst_sc_reg_access(sc_access_write, PMIC_WRITE, 1);
@@ -500,7 +498,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
 
                 }
                 /* send headphone detect */
-                pr_debug("sst: MAD headphone %d\n", intsts & 0x4);
+                pr_debug("MAD headphone %d\n", intsts & 0x4);
                 jack = &intelmaddata->jack[0].jack;
                 present = !(intelmaddata->jack[0].jack_status);
                 intelmaddata->jack[0].jack_status = present;
@@ -510,7 +508,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
 
         if (intsts & 0x2) {
                 /* send short push */
-                pr_debug("sst: MAD short push %d\n", intsts & 0x2);
+                pr_debug("MAD short push %d\n", intsts & 0x2);
                 jack = &intelmaddata->jack[2].jack;
                 present = 1;
                 jack_event_flag = 1;
@@ -518,7 +516,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
         }
         if (intsts & 0x1) {
                 /* send long push */
-                pr_debug("sst: MAD long push %d\n", intsts & 0x1);
+                pr_debug("MAD long push %d\n", intsts & 0x1);
                 jack = &intelmaddata->jack[3].jack;
                 present = 1;
                 jack_event_flag = 1;
@@ -526,7 +524,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
         }
         if (intsts & 0x8) {
                 if (!(intelmid_audio_interrupt_enable)) {
-                        pr_debug("sst: Audio interrupt enable\n");
+                        pr_debug("Audio interrupt enable\n");
                         sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
 
                         sst_sc_reg_access(sc_access_write, PMIC_WRITE, 1);
@@ -535,7 +533,7 @@ void sst_mad_jackdetection_fs(u8 intsts , struct snd_intelmad *intelmaddata)
                         intelmaddata->jack[1].jack_status = 0;
                 }
                 /* send headset detect */
-                pr_debug("sst: MAD headset = %d\n", intsts & 0x8);
+                pr_debug("MAD headset = %d\n", intsts & 0x8);
                 jack = &intelmaddata->jack[1].jack;
                 present = !(intelmaddata->jack[1].jack_status);
                 intelmaddata->jack[1].jack_status = present;
@@ -558,10 +556,10 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 
         scard_ops = intelmaddata->sstdrv_ops->scard_ops;
 
-        pr_debug("sst: previous value: %x\n", intelmaddata->jack_prev_state);
+        pr_debug("previous value: %x\n", intelmaddata->jack_prev_state);
 
         if (!(intelmid_audio_interrupt_enable)) {
-                pr_debug("sst: Audio interrupt enable\n");
+                pr_debug("Audio interrupt enable\n");
                 intelmaddata->jack_prev_state = 0xC0;
                 intelmid_audio_interrupt_enable = 1;
         }
@@ -572,12 +570,12 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
                         sc_access_read.reg_addr = 0x201;
                         sst_sc_reg_access(&sc_access_read, PMIC_READ, 1);
                         value = (sc_access_read.value);
-                        pr_debug("sst: value returned = 0x%x\n", value);
+                        pr_debug("value returned = 0x%x\n", value);
                 }
 
                 if (jack_prev_state == 0xc0 && value == 0x40) {
                         /*headset detected. */
-                        pr_debug("sst: MAD headset inserted\n");
+                        pr_debug("MAD headset inserted\n");
                         jack = &intelmaddata->jack[1].jack;
                         present = 1;
                         jack_event_flag = 1;
@@ -587,7 +585,7 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 
                 if (jack_prev_state == 0xc0 && value == 0x00) {
                         /* headphone  detected. */
-                        pr_debug("sst: MAD headphone inserted\n");
+                        pr_debug("MAD headphone inserted\n");
                         jack = &intelmaddata->jack[0].jack;
                         present = 1;
                         jack_event_flag = 1;
@@ -596,9 +594,9 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 
                 if (jack_prev_state == 0x40 && value == 0xc0) {
                         /*headset  removed*/
-                        pr_debug("sst: Jack headset status %d\n",
+                        pr_debug("Jack headset status %d\n",
                                 intelmaddata->jack[1].jack_status);
-                        pr_debug("sst: MAD headset removed\n");
+                        pr_debug("MAD headset removed\n");
                         jack = &intelmaddata->jack[1].jack;
                         present = 0;
                         jack_event_flag = 1;
@@ -607,9 +605,9 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 
                 if (jack_prev_state == 0x00 && value == 0xc0) {
                         /* headphone  detected. */
-                        pr_debug("sst: Jack headphone status %d\n",
+                        pr_debug("Jack headphone status %d\n",
                                         intelmaddata->jack[0].jack_status);
-                        pr_debug("sst: headphone removed\n");
+                        pr_debug("headphone removed\n");
                         jack = &intelmaddata->jack[0].jack;
                         present = 0;
                         jack_event_flag = 1;
@@ -618,7 +616,7 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
                 if (jack_prev_state == 0x40 && value == 0x00) {
                         /*button pressed*/
                         do_gettimeofday(&intelmaddata->jack[1].buttonpressed);
-                        pr_debug("sst: MAD button press detected n");
+                        pr_debug("MAD button press detected\n");
                 }
 
 
@@ -628,19 +626,19 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
                                 do_gettimeofday(
                                         &intelmaddata->jack[1].buttonreleased);
                                 /*button pressed */
-                                pr_debug("sst: Button Released detected\n");
+                                pr_debug("Button Released detected\n");
                                 timediff = intelmaddata->jack[1].
                                         buttonreleased.tv_sec - intelmaddata->
                                         jack[1].buttonpressed.tv_sec;
                                 buttonpressflag = 1;
                                 if (timediff > 1) {
-                                        pr_debug("sst: long press detected\n");
+                                        pr_debug("long press detected\n");
                                         /* send headphone detect/undetect */
                                         jack = &intelmaddata->jack[3].jack;
                                         present = 1;
                                         jack_event_flag = 1;
                                 } else {
-                                        pr_debug("sst: short press detected\n");
+                                        pr_debug("short press detected\n");
                                         /* send headphone detect/undetect */
                                         jack = &intelmaddata->jack[2].jack;
                                         present = 1;
@@ -667,24 +665,24 @@ void sst_mad_jackdetection_nec(u8 intsts, struct snd_intelmad *intelmaddata)
                 sc_access_read.reg_addr = 0x132;
                 sst_sc_reg_access(&sc_access_read, PMIC_READ, 1);
                 value = (sc_access_read.value);
-                pr_debug("sst: value returned = 0x%x\n", value);
+                pr_debug("value returned = 0x%x\n", value);
         }
         if (intsts & 0x1) {
-                pr_debug("sst: headset detected\n");
+                pr_debug("headset detected\n");
                 /* send headset detect/undetect */
                 jack = &intelmaddata->jack[1].jack;
                 present = (value == 0x1) ? 1 : 0;
                 jack_event_flag = 1;
         }
         if (intsts & 0x2) {
-                pr_debug("sst: headphone detected\n");
+                pr_debug("headphone detected\n");
                 /* send headphone detect/undetect */
                 jack = &intelmaddata->jack[0].jack;
                 present = (value == 0x2) ? 1 : 0;
                 jack_event_flag = 1;
         }
         if (intsts & 0x4) {
-                pr_debug("sst: short push detected\n");
+                pr_debug("short push detected\n");
                 /* send short push */
                 jack = &intelmaddata->jack[2].jack;
                 present = 1;
@@ -692,7 +690,7 @@ void sst_mad_jackdetection_nec(u8 intsts, struct snd_intelmad *intelmaddata)
                 buttonpressflag = 1;
         }
         if (intsts & 0x8) {
-                pr_debug("sst: long push detected\n");
+                pr_debug("long push detected\n");
                 /* send long push */
                 jack = &intelmaddata->jack[3].jack;
                 present = 1;
@@ -738,12 +736,12 @@ static int __devinit snd_intelmad_register_irq(
         u32 regbase = AUDINT_BASE, regsize = 8;
         char *drv_name;
 
-        pr_debug("sst: irq reg done, regbase 0x%x, regsize 0x%x\n",
+        pr_debug("irq reg done, regbase 0x%x, regsize 0x%x\n",
                                         regbase, regsize);
         intelmaddata->int_base = ioremap_nocache(regbase, regsize);
         if (!intelmaddata->int_base)
-                pr_err("sst: Mapping of cache failed\n");
-        pr_debug("sst: irq = 0x%x\n", intelmaddata->irq);
+                pr_err("Mapping of cache failed\n");
+        pr_debug("irq = 0x%x\n", intelmaddata->irq);
         if (intelmaddata->cpu_id == CPU_CHIP_PENWELL)
                 drv_name = DRIVER_NAME_MFLD;
         else
@@ -753,7 +751,7 @@ static int __devinit snd_intelmad_register_irq(
                                 IRQF_SHARED, drv_name,
                                 intelmaddata);
         if (ret_val)
-                pr_err("sst: cannot register IRQ\n");
+                pr_err("cannot register IRQ\n");
         return ret_val;
 }
 
@@ -775,10 +773,10 @@ static int __devinit snd_intelmad_sst_register(
                 if (ret_val)
                         return ret_val;
                 sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0));
-                pr_debug("sst: orginal n extrated vendor id = 0x%x %d\n",
+                pr_debug("orginal n extrated vendor id = 0x%x %d\n",
                                 vendor_addr.value, sst_card_vendor_id);
                 if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) {
-                        pr_err("sst: vendor card not supported!!\n");
+                        pr_err("vendor card not supported!!\n");
                         return -EIO;
                 }
         } else
@@ -801,7 +799,7 @@ static int __devinit snd_intelmad_sst_register(
         /* registering with SST driver to get access to SST APIs to use */
         ret_val = register_sst_card(intelmaddata->sstdrv_ops);
         if (ret_val) {
-                pr_err("sst: sst card registration failed\n");
+                pr_err("sst card registration failed\n");
                 return ret_val;
         }
 
@@ -832,7 +830,7 @@ static int __devinit snd_intelmad_pcm_new(struct snd_card *card,
         char name[32] = INTEL_MAD;
         struct snd_pcm_ops *pb_ops = NULL, *cap_ops = NULL;
 
-        pr_debug("sst: called for pb %d, cp %d, idx %d\n", pb, cap, index);
+        pr_debug("called for pb %d, cp %d, idx %d\n", pb, cap, index);
         ret_val = snd_pcm_new(card, name, index, pb, cap, &pcm);
         if (ret_val)
                 return ret_val;
@@ -878,7 +876,7 @@ static int __devinit snd_intelmad_pcm(struct snd_card *card,
 
         WARN_ON(!card);
         WARN_ON(!intelmaddata);
-        pr_debug("sst: snd_intelmad_pcm called\n");
+        pr_debug("snd_intelmad_pcm called\n");
         ret_val = snd_intelmad_pcm_new(card, intelmaddata, 1, 1, 0);
         if (intelmaddata->cpu_id == CPU_CHIP_LINCROFT)
                 return ret_val;
@@ -903,7 +901,7 @@ static int snd_intelmad_jack(struct snd_intelmad *intelmaddata)
         struct snd_jack *jack;
         int retval;
 
-        pr_debug("sst: snd_intelmad_jack called\n");
+        pr_debug("snd_intelmad_jack called\n");
         jack = &intelmaddata->jack[0].jack;
         retval = snd_jack_new(intelmaddata->card, "Headphone",
                                 SND_JACK_HEADPHONE, &jack);
@@ -982,9 +980,9 @@ static int __devinit snd_intelmad_mixer(struct snd_intelmad *intelmaddata)
                 ret_val = snd_ctl_add(card,
                                 snd_ctl_new1(&controls[idx],
                                 intelmaddata));
-                pr_debug("sst: mixer[idx]=%d added\n", idx);
+                pr_debug("mixer[idx]=%d added\n", idx);
                 if (ret_val) {
-                        pr_err("sst: in adding of control index = %d\n", idx);
+                        pr_err("in adding of control index = %d\n", idx);
                         break;
                 }
         }
@@ -999,7 +997,7 @@ static int snd_intelmad_dev_free(struct snd_device *device)
 
         intelmaddata = device->device_data;
 
-        pr_debug("sst: snd_intelmad_dev_free called\n");
+        pr_debug("snd_intelmad_dev_free called\n");
         snd_card_free(intelmaddata->card);
         /*genl_unregister_family(&audio_event_genl_family);*/
         unregister_sst_card(intelmaddata->sstdrv_ops);
@@ -1040,23 +1038,23 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
         const struct platform_device_id *id = platform_get_device_id(pdev);
         unsigned int cpu_id = (unsigned int)id->driver_data;
 
-        pr_debug("sst: probe for %s cpu_id %d\n", pdev->name, cpu_id);
+        pr_debug("probe for %s cpu_id %d\n", pdev->name, cpu_id);
         if (!strcmp(pdev->name, DRIVER_NAME_MRST))
-                pr_debug("sst: detected MRST\n");
+                pr_debug("detected MRST\n");
         else if (!strcmp(pdev->name, DRIVER_NAME_MFLD))
-                pr_debug("sst: detected MFLD\n");
+                pr_debug("detected MFLD\n");
         else {
-                pr_err("sst: detected unknown device abort!!\n");
+                pr_err("detected unknown device abort!!\n");
                 return -EIO;
         }
         if ((cpu_id < CPU_CHIP_LINCROFT) || (cpu_id > CPU_CHIP_PENWELL)) {
-                pr_err("sst: detected unknown cpu_id abort!!\n");
+                pr_err("detected unknown cpu_id abort!!\n");
                 return -EIO;
         }
         /* allocate memory for saving internal context and working */
         intelmaddata = kzalloc(sizeof(*intelmaddata), GFP_KERNEL);
         if (!intelmaddata) {
-                pr_debug("sst: mem alloctn fail\n");
+                pr_debug("mem alloctn fail\n");
                 return -ENOMEM;
         }
 
@@ -1064,7 +1062,7 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
         intelmaddata->sstdrv_ops = kzalloc(sizeof(struct intel_sst_card_ops),
                                         GFP_KERNEL);
         if (!intelmaddata->sstdrv_ops) {
-                pr_err("sst: mem allocation for ops fail\n");
+                pr_err("mem allocation for ops fail\n");
                 kfree(intelmaddata);
                 return -ENOMEM;
         }
@@ -1073,7 +1071,7 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
         /* create a card instance with ALSA framework */
         ret_val = snd_card_create(card_index, card_id, THIS_MODULE, 0, &card);
         if (ret_val) {
-                pr_err("sst: snd_card_create fail\n");
+                pr_err("snd_card_create fail\n");
                 goto free_allocs;
         }
 
@@ -1092,7 +1090,7 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
         /* registering with LPE driver to get access to SST APIs to use */
         ret_val = snd_intelmad_sst_register(intelmaddata);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_sst_register failed\n");
+                pr_err("snd_intelmad_sst_register failed\n");
                 goto free_allocs;
         }
 
@@ -1100,19 +1098,19 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
 
         ret_val = snd_intelmad_pcm(card, intelmaddata);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_pcm failed\n");
+                pr_err("snd_intelmad_pcm failed\n");
                 goto free_allocs;
         }
 
         ret_val = snd_intelmad_mixer(intelmaddata);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_mixer failed\n");
+                pr_err("snd_intelmad_mixer failed\n");
                 goto free_allocs;
         }
 
         ret_val = snd_intelmad_jack(intelmaddata);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_jack failed\n");
+                pr_err("snd_intelmad_jack failed\n");
                 goto free_allocs;
         }
 
@@ -1126,31 +1124,31 @@ int __devinit snd_intelmad_probe(struct platform_device *pdev)
 
         ret_val = snd_intelmad_register_irq(intelmaddata);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_register_irq fail\n");
+                pr_err("snd_intelmad_register_irq fail\n");
                 goto free_allocs;
         }
 
         /* internal function call to register device with ALSA */
         ret_val = snd_intelmad_create(intelmaddata, card);
         if (ret_val) {
-                pr_err("sst: snd_intelmad_create failed\n");
+                pr_err("snd_intelmad_create failed\n");
                 goto free_allocs;
         }
         card->private_data = &intelmaddata;
         snd_card_set_dev(card, &pdev->dev);
         ret_val = snd_card_register(card);
         if (ret_val) {
-                pr_err("sst: snd_card_register failed\n");
+                pr_err("snd_card_register failed\n");
                 goto free_allocs;
         }
 
-        pr_debug("sst:snd_intelmad_probe complete\n");
+        pr_debug("snd_intelmad_probe complete\n");
         return ret_val;
 
 free_mad_jack_wq:
         destroy_workqueue(intelmaddata->mad_jack_wq);
 free_allocs:
-        pr_err("sst: probe failed\n");
+        pr_err("probe failed\n");
         snd_card_free(card);
         kfree(intelmaddata->sstdrv_ops);
         kfree(intelmaddata);
@@ -1200,7 +1198,7 @@ static struct platform_driver snd_intelmad_driver = {
  */
 static int __init alsa_card_intelmad_init(void)
 {
-        pr_debug("sst: mad_init called\n");
+        pr_debug("mad_init called\n");
         return platform_driver_register(&snd_intelmad_driver);
 }
 
@@ -1211,7 +1209,7 @@ static int __init alsa_card_intelmad_init(void)
  */
 static void __exit alsa_card_intelmad_exit(void)
 {
-        pr_debug("sst:mad_exit called\n");
+        pr_debug("mad_exit called\n");
         return platform_driver_unregister(&snd_intelmad_driver);
 }
 
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h
index 81e744816765..0ce103185848 100644
--- a/drivers/staging/intel_sst/intelmid.h
+++ b/drivers/staging/intel_sst/intelmid.h
@@ -178,9 +178,4 @@ extern struct snd_kcontrol_new snd_intelmad_controls_mrst[];
 extern struct snd_kcontrol_new snd_intelmad_controls_mfld[];
 extern struct snd_pmic_ops *intelmad_vendor_ops[];
 
-/* This is an enabler hook as the platform detection logic isn't yet
-   present and depends on some firmware and DMI support to detect AAVA
-   devices. It will vanish once the AAVA platform support is merged */
-#define is_aava()       0
-
 #endif /* __INTELMID_H */
diff --git a/drivers/staging/intel_sst/intelmid_ctrl.c b/drivers/staging/intel_sst/intelmid_ctrl.c
index 03b4ece02f91..69af0704ce94 100644
--- a/drivers/staging/intel_sst/intelmid_ctrl.c
+++ b/drivers/staging/intel_sst/intelmid_ctrl.c
@@ -24,6 +24,9 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *  ALSA driver handling mixer controls for Intel MAD chipset
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <sound/core.h>
 #include <sound/control.h>
 #include "jack.h"
@@ -216,7 +219,7 @@ static int snd_intelmad_volume_get(struct snd_kcontrol *kcontrol,
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
 
-        pr_debug("sst: snd_intelmad_volume_get called\n");
+        pr_debug("snd_intelmad_volume_get called\n");
 
         WARN_ON(!uval);
         WARN_ON(!kcontrol);
@@ -273,7 +276,7 @@ static int snd_intelmad_mute_get(struct snd_kcontrol *kcontrol,
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
 
-        pr_debug("sst: Mute_get called\n");
+        pr_debug("Mute_get called\n");
 
         WARN_ON(!uval);
         WARN_ON(!kcontrol);
@@ -332,7 +335,7 @@ static int snd_intelmad_volume_set(struct snd_kcontrol *kcontrol,
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
 
-        pr_debug("sst: volume set called:%ld %ld\n",
+        pr_debug("volume set called:%ld %ld\n",
                         uval->value.integer.value[0],
                         uval->value.integer.value[1]);
 
@@ -387,7 +390,7 @@ static int snd_intelmad_mute_set(struct snd_kcontrol *kcontrol,
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
 
-        pr_debug("sst: snd_intelmad_mute_set called\n");
+        pr_debug("snd_intelmad_mute_set called\n");
 
         WARN_ON(!uval);
         WARN_ON(!kcontrol);
@@ -455,7 +458,7 @@ static int snd_intelmad_device_get(struct snd_kcontrol *kcontrol,
 {
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
-        pr_debug("sst: device_get called\n");
+        pr_debug("device_get called\n");
 
         WARN_ON(!uval);
         WARN_ON(!kcontrol);
@@ -491,8 +494,9 @@ static int snd_intelmad_device_set(struct snd_kcontrol *kcontrol,
         struct snd_intelmad *intelmaddata;
         struct snd_pmic_ops *scard_ops;
         int ret_val = 0, vendor, status;
+        struct intel_sst_pcm_control *pcm_control;
 
-        pr_debug("sst: snd_intelmad_device_set called\n");
+        pr_debug("snd_intelmad_device_set called\n");
 
         WARN_ON(!uval);
         WARN_ON(!kcontrol);
@@ -518,15 +522,13 @@ static int snd_intelmad_device_set(struct snd_kcontrol *kcontrol,
         case INPUT_SEL:
                 vendor = intelmaddata->sstdrv_ops->vendor_id;
                 if ((vendor == SND_MX) || (vendor == SND_FS)) {
-                        if (uval->value.enumerated.item[0] == HS_MIC) {
+                        pcm_control = intelmaddata->sstdrv_ops->pcm_control;
+                        if (uval->value.enumerated.item[0] == HS_MIC)
                                 status = 1;
-                                intelmaddata->sstdrv_ops->
-                                control_set(SST_ENABLE_RX_TIME_SLOT, &status);
-                        } else {
+                        else
                                 status = 0;
-                                intelmaddata->sstdrv_ops->
-                                control_set(SST_ENABLE_RX_TIME_SLOT, &status);
-                        }
+                        pcm_control->device_control(
+                                        SST_ENABLE_RX_TIME_SLOT, &status);
                 }
                 ret_val = scard_ops->set_input_dev(
                                 uval->value.enumerated.item[0]);
diff --git a/drivers/staging/intel_sst/intelmid_msic_control.c b/drivers/staging/intel_sst/intelmid_msic_control.c
index 4d1755efceef..da093ed0cd88 100644
--- a/drivers/staging/intel_sst/intelmid_msic_control.c
+++ b/drivers/staging/intel_sst/intelmid_msic_control.c
@@ -24,6 +24,8 @@
  * This file contains the control operations of msic vendors
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/file.h>
 #include "intel_sst.h"
@@ -83,7 +85,7 @@ static int msic_init_card(void)
         snd_msic_ops.cap_on = 0;
         snd_msic_ops.input_dev_id = DMIC; /*def dev*/
         snd_msic_ops.output_dev_id = STEREO_HEADPHONE;
-        pr_debug("sst: msic init complete!!\n");
+        pr_debug("msic init complete!!\n");
         return 0;
 }
 
@@ -173,7 +175,7 @@ static int msic_power_up_pb(unsigned int device)
                         return retval;
         }
 
-        pr_debug("sst: powering up pb.... Device %d\n", device);
+        pr_debug("powering up pb.... Device %d\n", device);
         sst_sc_reg_access(sc_access1, PMIC_WRITE, 4);
         switch (device) {
         case SND_SST_DEVICE_HEADSET:
@@ -205,7 +207,7 @@ static int msic_power_up_pb(unsigned int device)
                 break;
 
         default:
-                pr_warn("sst: Wrong Device %d, selected %d\n",
+                pr_warn("Wrong Device %d, selected %d\n",
                                device, snd_msic_ops.output_dev_id);
         }
         return sst_sc_reg_access(sc_access_pcm2, PMIC_READ_MODIFY, 1);
@@ -268,7 +270,7 @@ static int msic_power_up_cp(unsigned int device)
                         return retval;
         }
 
-        pr_debug("sst: powering up cp....%d\n", snd_msic_ops.input_dev_id);
+        pr_debug("powering up cp....%d\n", snd_msic_ops.input_dev_id);
         sst_sc_reg_access(sc_access2, PMIC_READ_MODIFY, 1);
         snd_msic_ops.cap_on = 1;
         if (snd_msic_ops.input_dev_id == AMIC)
@@ -283,7 +285,7 @@ static int msic_power_down(void)
 {
         int retval = 0;
 
-        pr_debug("sst: powering dn msic\n");
+        pr_debug("powering dn msic\n");
         snd_msic_ops.pb_on = 0;
         snd_msic_ops.cap_on = 0;
         return retval;
@@ -293,7 +295,7 @@ static int msic_power_down_pb(void)
 {
         int retval = 0;
 
-        pr_debug("sst: powering dn pb....\n");
+        pr_debug("powering dn pb....\n");
         snd_msic_ops.pb_on = 0;
         return retval;
 }
@@ -302,7 +304,7 @@ static int msic_power_down_cp(void)
 {
         int retval = 0;
 
-        pr_debug("sst: powering dn cp....\n");
+        pr_debug("powering dn cp....\n");
         snd_msic_ops.cap_on = 0;
         return retval;
 }
@@ -311,7 +313,7 @@ static int msic_set_selected_output_dev(u8 value)
 {
         int retval = 0;
 
-        pr_debug("sst: msic set selected output:%d\n", value);
+        pr_debug("msic set selected output:%d\n", value);
         snd_msic_ops.output_dev_id = value;
         if (snd_msic_ops.pb_on)
                 msic_power_up_pb(SND_SST_DEVICE_HEADSET);
@@ -330,15 +332,15 @@ static int msic_set_selected_input_dev(u8 value)
         };
         int retval = 0;
 
-        pr_debug("sst: msic_set_selected_input_dev:%d\n", value);
+        pr_debug("msic_set_selected_input_dev:%d\n", value);
         snd_msic_ops.input_dev_id = value;
         switch (value) {
         case AMIC:
-                pr_debug("sst: Selecting AMIC1\n");
+                pr_debug("Selecting AMIC1\n");
                 retval = sst_sc_reg_access(sc_access_amic, PMIC_WRITE, 1);
                 break;
         case DMIC:
-                pr_debug("sst: Selecting DMIC1\n");
+                pr_debug("Selecting DMIC1\n");
                 retval = sst_sc_reg_access(sc_access_dmic, PMIC_WRITE, 1);
                 break;
         default:
diff --git a/drivers/staging/intel_sst/intelmid_pvt.c b/drivers/staging/intel_sst/intelmid_pvt.c
index 9ed9475ccc7b..3ba9daf67526 100644
--- a/drivers/staging/intel_sst/intelmid_pvt.c
+++ b/drivers/staging/intel_sst/intelmid_pvt.c
@@ -23,6 +23,9 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * ALSA driver for Intel MID sound card chipset - holding private functions
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/io.h>
 #include <asm/intel_scu_ipc.h>
 #include <sound/core.h>
@@ -50,7 +53,7 @@ void period_elapsed(void *mad_substream)
 
         if (stream->stream_status != RUNNING)
                 return;
-        pr_debug("sst: calling period elapsed\n");
+        pr_debug("calling period elapsed\n");
         snd_pcm_period_elapsed(substream);
         return;
 }
@@ -76,8 +79,8 @@ int snd_intelmad_alloc_stream(struct snd_pcm_substream *substream)
         param.uc.pcm_params.period_count = substream->runtime->period_size;
         param.uc.pcm_params.ring_buffer_addr =
                                 virt_to_phys(substream->runtime->dma_area);
-        pr_debug("sst: period_cnt = %d\n", param.uc.pcm_params.period_count);
-        pr_debug("sst: sfreq= %d, wd_sz = %d\n",
+        pr_debug("period_cnt = %d\n", param.uc.pcm_params.period_count);
+        pr_debug("sfreq= %d, wd_sz = %d\n",
                  param.uc.pcm_params.sfreq, param.uc.pcm_params.pcm_wd_sz);
 
         str_params.sparams = param;
@@ -85,24 +88,22 @@ int snd_intelmad_alloc_stream(struct snd_pcm_substream *substream)
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 str_params.ops = STREAM_OPS_PLAYBACK;
-                pr_debug("sst: Playbck stream,Device %d\n", stream->device);
+                pr_debug("Playbck stream,Device %d\n", stream->device);
         } else {
                 str_params.ops = STREAM_OPS_CAPTURE;
                 stream->device = SND_SST_DEVICE_CAPTURE;
-                pr_debug("sst: Capture stream,Device %d\n", stream->device);
+                pr_debug("Capture stream,Device %d\n", stream->device);
         }
         str_params.device_type = stream->device;
-        ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_ALLOC,
-                                        &str_params);
-        pr_debug("sst: SST_SND_PLAY/CAPTURE ret_val = %x\n",
-                        ret_val);
+        ret_val = intelmaddata->sstdrv_ops->pcm_control->open(&str_params);
+        pr_debug("sst: SST_SND_PLAY/CAPTURE ret_val = %x\n", ret_val);
         if (ret_val < 0)
                 return ret_val;
 
         stream->stream_info.str_id = ret_val;
         stream->stream_status = INIT;
         stream->stream_info.buffer_ptr = 0;
-        pr_debug("sst: str id :  %d\n", stream->stream_info.str_id);
+        pr_debug("str id :  %d\n", stream->stream_info.str_id);
 
         return ret_val;
 }
@@ -113,15 +114,15 @@ int snd_intelmad_init_stream(struct snd_pcm_substream *substream)
         struct snd_intelmad *intelmaddata = snd_pcm_substream_chip(substream);
         int ret_val;
 
-        pr_debug("sst: setting buffer ptr param\n");
+        pr_debug("setting buffer ptr param\n");
         stream->stream_info.period_elapsed = period_elapsed;
         stream->stream_info.mad_substream = substream;
         stream->stream_info.buffer_ptr = 0;
         stream->stream_info.sfreq = substream->runtime->rate;
-        ret_val = intelmaddata->sstdrv_ops->control_set(SST_SND_STREAM_INIT,
-                                        &stream->stream_info);
+        ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
+                        SST_SND_STREAM_INIT, &stream->stream_info);
         if (ret_val)
-                pr_err("sst: control_set ret error %d\n", ret_val);
+                pr_err("control_set ret error %d\n", ret_val);
         return ret_val;
 
 }
@@ -145,30 +146,29 @@ int sst_sc_reg_access(struct sc_reg_access *sc_access,
                 for (i = 0; i < num_val; i++) {
                         retval = intel_scu_ipc_iowrite8(sc_access[i].reg_addr,
                                                         sc_access[i].value);
-                        if (retval) {
-                                pr_err("sst: IPC write failed!!! %d\n", retval);
-                                return retval;
-                        }
+                        if (retval)
+                                goto err;
                 }
         } else if (type == PMIC_READ) {
                 for (i = 0; i < num_val; i++) {
                         retval = intel_scu_ipc_ioread8(sc_access[i].reg_addr,
                                                         &(sc_access[i].value));
-                        if (retval) {
-                                pr_err("sst: IPC read failed!!!!!%d\n", retval);
-                                return retval;
-                        }
+                        if (retval)
+                                goto err;
                 }
         } else {
                 for (i = 0; i < num_val; i++) {
                         retval = intel_scu_ipc_update_register(
                                 sc_access[i].reg_addr, sc_access[i].value,
                                 sc_access[i].mask);
-                        if (retval) {
-                                pr_err("sst: IPC Modify failed!!!%d\n", retval);
-                                return retval;
-                        }
+                        if (retval)
+                                goto err;
                 }
         }
-        return retval;
+        return 0;
+err:
+        pr_err("IPC failed for cmd %d, %d\n", retval, type);
+        pr_err("reg:0x%2x addr:0x%2x\n",
+                sc_access[i].reg_addr, sc_access[i].value);
+        return retval;
 }
diff --git a/drivers/staging/intel_sst/intelmid_v0_control.c b/drivers/staging/intel_sst/intelmid_v0_control.c
index f586d62ac9af..7859225e3d60 100644
--- a/drivers/staging/intel_sst/intelmid_v0_control.c
+++ b/drivers/staging/intel_sst/intelmid_v0_control.c
@@ -26,6 +26,8 @@
  *  This file contains the control operations of vendor 1
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/file.h>
 #include "intel_sst.h"
@@ -151,7 +153,7 @@ static int fs_power_up_pb(unsigned int port)
         if (retval)
                 return retval;
 
-        pr_debug("sst: in fs power up pb\n");
+        pr_debug("in fs power up pb\n");
         return fs_enable_audiodac(UNMUTE);
 }
 
@@ -173,7 +175,7 @@ static int fs_power_down_pb(void)
         if (retval)
                 return retval;
 
-        pr_debug("sst: in fsl power down pb\n");
+        pr_debug("in fsl power down pb\n");
         return fs_enable_audiodac(UNMUTE);
 }
 
@@ -380,7 +382,7 @@ static int fs_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
                 sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
 
         }
-        pr_debug("sst: sfreq:%d,Register value = %x\n", sfreq, config1);
+        pr_debug("sfreq:%d,Register value = %x\n", sfreq, config1);
 
         if (word_size == 24) {
                 sc_access[0].reg_addr  = AUDIOPORT1;
@@ -438,18 +440,18 @@ static int fs_set_selected_input_dev(u8 value)
 
         switch (value) {
         case AMIC:
-                pr_debug("sst: Selecting amic not supported in mono cfg\n");
+                pr_debug("Selecting amic not supported in mono cfg\n");
                 return sst_sc_reg_access(sc_access_mic, PMIC_READ_MODIFY, 2);
                 break;
 
         case HS_MIC:
-                pr_debug("sst: Selecting hsmic\n");
+                pr_debug("Selecting hsmic\n");
                 return sst_sc_reg_access(sc_access_hsmic,
                                 PMIC_READ_MODIFY, 2);
                 break;
 
         case DMIC:
-                pr_debug("sst: Selecting dmic\n");
+                pr_debug("Selecting dmic\n");
                 return sst_sc_reg_access(sc_access_dmic, PMIC_READ_MODIFY, 2);
                 break;
 
@@ -505,7 +507,7 @@ static int fs_set_mute(int dev_id, u8 value)
                 return retval;
 
 
-        pr_debug("sst: dev_id:0x%x value:0x%x\n", dev_id, value);
+        pr_debug("dev_id:0x%x value:0x%x\n", dev_id, value);
         switch (dev_id) {
         case PMIC_SND_DMIC_MUTE:
                 sc_access[0].reg_addr = MICCTRL;
@@ -606,7 +608,7 @@ static int fs_set_vol(int dev_id, int value)
 
         switch (dev_id) {
         case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("sst: PMIC_SND_LEFT_PB_VOL:%d\n", value);
+                pr_debug("PMIC_SND_LEFT_PB_VOL:%d\n", value);
                 sc_access[0].value = sc_access[1].value = value;
                 sc_access[0].reg_addr = AUD16;
                 sc_access[1].reg_addr = AUD15;
@@ -616,7 +618,7 @@ static int fs_set_vol(int dev_id, int value)
                 break;
 
         case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("sst: PMIC_SND_RIGHT_PB_VOL:%d\n", value);
+                pr_debug("PMIC_SND_RIGHT_PB_VOL:%d\n", value);
                 sc_access[0].value = sc_access[1].value = value;
                 sc_access[0].reg_addr = AUD17;
                 sc_access[1].reg_addr = AUD15;
@@ -629,7 +631,7 @@ static int fs_set_vol(int dev_id, int value)
                 reg_num = 2;
                 break;
         case PMIC_SND_CAPTURE_VOL:
-                pr_debug("sst: PMIC_SND_CAPTURE_VOL:%d\n", value);
+                pr_debug("PMIC_SND_CAPTURE_VOL:%d\n", value);
                 sc_access[0].reg_addr = MICLICTRL1;
                 sc_access[1].reg_addr = MICLICTRL2;
                 sc_access[2].reg_addr = DMICCTRL1;
@@ -726,17 +728,17 @@ static int fs_get_vol(int dev_id, int *value)
 
         switch (dev_id) {
         case PMIC_SND_CAPTURE_VOL:
-                pr_debug("sst: PMIC_SND_CAPTURE_VOL\n");
+                pr_debug("PMIC_SND_CAPTURE_VOL\n");
                 sc_access.reg_addr = MICLICTRL1;
                 mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
                 break;
         case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("sst: PMIC_SND_LEFT_PB_VOL\n");
+                pr_debug("PMIC_SND_LEFT_PB_VOL\n");
                 sc_access.reg_addr = AUD16;
                 mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
                 break;
         case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("sst: PMIC_SND_RT_PB_VOL\n");
+                pr_debug("PMIC_SND_RT_PB_VOL\n");
                 sc_access.reg_addr = AUD17;
                 mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
                 break;
@@ -745,9 +747,9 @@ static int fs_get_vol(int dev_id, int *value)
         }
 
         retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("sst: value read = 0x%x\n", sc_access.value);
+        pr_debug("value read = 0x%x\n", sc_access.value);
         *value = (int) (sc_access.value & mask);
-        pr_debug("sst: value returned = 0x%x\n", *value);
+        pr_debug("value returned = 0x%x\n", *value);
         return retval;
 }
 
diff --git a/drivers/staging/intel_sst/intelmid_v1_control.c b/drivers/staging/intel_sst/intelmid_v1_control.c
index 9de86b2f6b08..478cfecdefd7 100644
--- a/drivers/staging/intel_sst/intelmid_v1_control.c
+++ b/drivers/staging/intel_sst/intelmid_v1_control.c
@@ -25,6 +25,8 @@
  *  This file contains the control operations of vendor 2
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/file.h>
 #include <asm/mrst.h>
@@ -132,56 +134,6 @@ static int mx_init_card(void)
         return sst_sc_reg_access(sc_access, PMIC_WRITE, 47);
 }
 
-static int mx_init_capture_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {0x206, 0x5a, 0x0},
-                {0x207, 0xbe, 0x0},
-                {0x208, 0x90, 0x0},
-                {0x209, 0x32, 0x0},
-                {0x20e, 0x22, 0x0},
-                {0x210, 0x84, 0x0},
-                {0x223, 0x20, 0x0},
-                {0x226, 0xC0, 0x0},
-        };
-
-        int retval = 0;
-
-        retval = sst_sc_reg_access(sc_access, PMIC_WRITE, 8);
-        if (0 != retval) {
-                /* pmic communication fails */
-                pr_debug("sst: pmic commn failed\n");
-                return retval;
-        }
-
-        pr_debug("sst: Capture configuration complete!!\n");
-        return 0;
-}
-
-static int mx_init_playback_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {0x206, 0x00, 0x0},
-                {0x207, 0x00, 0x0},
-                {0x208, 0x00, 0x0},
-                {0x209, 0x51, 0x0},
-                {0x20e, 0x51, 0x0},
-                {0x210, 0x21, 0x0},
-                {0x223, 0x01, 0x0},
-        };
-        int retval = 0;
-
-        retval = sst_sc_reg_access(sc_access, PMIC_WRITE, 9);
-        if (0 != retval) {
-                /* pmic communication fails */
-                pr_debug("sst: pmic commn failed\n");
-                return retval;
-        }
-
-        pr_debug("sst: Playback configuration complete!!\n");
-        return 0;
-}
-
 static int mx_enable_audiodac(int value)
 {
         struct sc_reg_access sc_access[3];
@@ -204,7 +156,7 @@ static int mx_enable_audiodac(int value)
         retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
         if (retval)
                 return retval;
-        pr_debug("sst: mute status = %d", snd_pmic_ops_mx.mute_status);
+        pr_debug("mute status = %d\n", snd_pmic_ops_mx.mute_status);
         if (snd_pmic_ops_mx.mute_status == MUTE ||
                                 snd_pmic_ops_mx.master_mute == MUTE)
                 return retval;
@@ -412,7 +364,7 @@ static int mx_set_pcm_voice_params(void)
                 if (retval)
                         return retval;
         }
-        pr_debug("sst: SST DBG mx_set_pcm_voice_params called\n");
+        pr_debug("SST DBG:mx_set_pcm_voice_params called\n");
         return sst_sc_reg_access(sc_access, PMIC_WRITE, 44);
 }
 
@@ -529,7 +481,7 @@ static int mx_set_selected_output_dev(u8 dev_id)
                         return retval;
         }
 
-        pr_debug("sst: mx_set_selected_output_dev dev_id:0x%x\n", dev_id);
+        pr_debug("mx_set_selected_output_dev dev_id:0x%x\n", dev_id);
         snd_pmic_ops_mx.output_dev_id = dev_id;
         switch (dev_id) {
         case STEREO_HEADPHONE:
@@ -549,7 +501,7 @@ static int mx_set_selected_output_dev(u8 dev_id)
                 num_reg = 1;
                 break;
         case RECEIVER:
-                pr_debug("sst: RECEIVER Koski selected\n");
+                pr_debug("RECEIVER Koski selected\n");
 
                 /* configuration - AS enable, receiver enable */
                 sc_access[0].reg_addr = 0xFF;
@@ -559,7 +511,7 @@ static int mx_set_selected_output_dev(u8 dev_id)
                 num_reg = 1;
                 break;
         default:
-                pr_err("sst: Not a valid output dev\n");
+                pr_err("Not a valid output dev\n");
                 return 0;
         }
         return sst_sc_reg_access(sc_access, PMIC_WRITE, num_reg);
@@ -598,7 +550,7 @@ static int mx_set_selected_input_dev(u8 dev_id)
                         return retval;
         }
         snd_pmic_ops_mx.input_dev_id = dev_id;
-        pr_debug("sst: mx_set_selected_input_dev dev_id:0x%x\n", dev_id);
+        pr_debug("mx_set_selected_input_dev dev_id:0x%x\n", dev_id);
 
         switch (dev_id) {
         case AMIC:
@@ -646,7 +598,7 @@ static int mx_set_mute(int dev_id, u8 value)
         }
 
 
-        pr_debug("sst: set_mute dev_id:0x%x , value:%d\n", dev_id, value);
+        pr_debug("set_mute dev_id:0x%x , value:%d\n", dev_id, value);
 
         switch (dev_id) {
         case PMIC_SND_DMIC_MUTE:
@@ -760,7 +712,7 @@ static int mx_set_vol(int dev_id, int value)
                 if (retval)
                         return retval;
         }
-        pr_debug("sst: set_vol dev_id:0x%x ,value:%d\n", dev_id, value);
+        pr_debug("set_vol dev_id:0x%x ,value:%d\n", dev_id, value);
         switch (dev_id) {
         case PMIC_SND_RECEIVER_VOL:
                 return 0;
@@ -875,7 +827,7 @@ static int mx_get_vol(int dev_id, int *value)
         if (retval)
                 return retval;
         *value = -(sc_access.value & mask);
-        pr_debug("sst: get volume value extracted %d\n", *value);
+        pr_debug("get volume value extracted %d\n", *value);
         return retval;
 }
 
diff --git a/drivers/staging/intel_sst/intelmid_v2_control.c b/drivers/staging/intel_sst/intelmid_v2_control.c
index 3a7de769842a..e38e89df6e84 100644
--- a/drivers/staging/intel_sst/intelmid_v2_control.c
+++ b/drivers/staging/intel_sst/intelmid_v2_control.c
@@ -26,6 +26,8 @@
  *  This file contains the control operations of vendor 3
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/file.h>
 #include "intel_sst.h"
@@ -120,7 +122,7 @@ static int nc_init_card(void)
         snd_pmic_ops_nc.master_mute = UNMUTE;
         snd_pmic_ops_nc.mute_status = UNMUTE;
         sst_sc_reg_access(sc_access, PMIC_WRITE, 26);
-        pr_debug("sst: init complete!!\n");
+        pr_debug("init complete!!\n");
         return 0;
 }
 
@@ -169,7 +171,7 @@ static int nc_power_up_pb(unsigned int port)
         nc_enable_audiodac(MUTE);
         msleep(30);
 
-        pr_debug("sst: powering up pb....\n");
+        pr_debug("powering up pb....\n");
 
         sc_access[0].reg_addr = VAUDIOCNT;
         sc_access[0].value = 0x27;
@@ -222,7 +224,7 @@ static int nc_power_up_cp(unsigned int port)
                 return retval;
 
 
-        pr_debug("sst: powering up cp....\n");
+        pr_debug("powering up cp....\n");
 
         if (port == 0xFF)
                 return 0;
@@ -275,7 +277,7 @@ static int nc_power_down(void)
         nc_enable_audiodac(MUTE);
 
 
-        pr_debug("sst: powering dn nc_power_down ....\n");
+        pr_debug("powering dn nc_power_down ....\n");
 
         msleep(30);
 
@@ -324,7 +326,7 @@ static int nc_power_down_pb(void)
         if (retval)
                 return retval;
 
-        pr_debug("sst: powering dn pb....\n");
+        pr_debug("powering dn pb....\n");
 
         nc_enable_audiodac(MUTE);
 
@@ -370,7 +372,7 @@ static int nc_power_down_cp(void)
         if (retval)
                 return retval;
 
-        pr_debug("sst: powering dn cp....\n");
+        pr_debug("powering dn cp....\n");
         return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
 }
 
@@ -400,7 +402,7 @@ static int nc_set_pcm_voice_params(void)
                 return retval;
 
         sst_sc_reg_access(sc_access, PMIC_WRITE, 14);
-        pr_debug("sst: Voice parameters set successfully!!\n");
+        pr_debug("Voice parameters set successfully!!\n");
         return 0;
 }
 
@@ -451,20 +453,20 @@ static int nc_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 
                 sc_access.value = 0x07;
                 sc_access.reg_addr = RMUTE;
-                pr_debug("sst: RIGHT_HP_MUTE value%d\n", sc_access.value);
+                pr_debug("RIGHT_HP_MUTE value%d\n", sc_access.value);
                 sc_access.mask = MASK2;
                 sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
         } else {
                 sc_access.value = 0x00;
                 sc_access.reg_addr = RMUTE;
-                pr_debug("sst: RIGHT_HP_MUTE value %d\n", sc_access.value);
+                pr_debug("RIGHT_HP_MUTE value %d\n", sc_access.value);
                 sc_access.mask = MASK2;
                 sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
 
 
         }
 
-        pr_debug("sst: word_size = %d\n", word_size);
+        pr_debug("word_size = %d\n", word_size);
 
         if (word_size == 24) {
                 sc_access.reg_addr = AUDIOPORT2;
@@ -477,7 +479,7 @@ static int nc_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
         }
         sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
 
-        pr_debug("sst: word_size = %d\n", word_size);
+        pr_debug("word_size = %d\n", word_size);
         sc_access.reg_addr = AUDIOPORT1;
         sc_access.mask = MASK5|MASK4|MASK1|MASK0;
         if (word_size == 16)
@@ -508,7 +510,7 @@ static int nc_set_selected_output_dev(u8 value)
                 retval = nc_init_card();
         if (retval)
                 return retval;
-        pr_debug("sst: nc set selected output:%d\n", value);
+        pr_debug("nc set selected output:%d\n", value);
         switch (value) {
         case STEREO_HEADPHONE:
                 retval = sst_sc_reg_access(sc_access_HP, PMIC_WRITE, 2);
@@ -517,7 +519,7 @@ static int nc_set_selected_output_dev(u8 value)
                 retval = sst_sc_reg_access(sc_access_IS, PMIC_WRITE, 2);
                 break;
         default:
-                pr_err("sst: rcvd illegal request: %d\n", value);
+                pr_err("rcvd illegal request: %d\n", value);
                 return -EINVAL;
         }
         return retval;
@@ -541,7 +543,7 @@ static int nc_audio_init(void)
         };
 
         sst_sc_reg_access(sc_access, PMIC_WRITE, 12);
-        pr_debug("sst: Audio Init successfully!!\n");
+        pr_debug("Audio Init successfully!!\n");
 
         /*set output device */
         nc_set_selected_output_dev(snd_pmic_ops_nc.output_dev_id);
@@ -549,13 +551,13 @@ static int nc_audio_init(void)
         if (snd_pmic_ops_nc.num_channel == 1) {
                 sc_acces.value = 0x07;
                 sc_acces.reg_addr = RMUTE;
-                pr_debug("sst: RIGHT_HP_MUTE value%d\n", sc_acces.value);
+                pr_debug("RIGHT_HP_MUTE value%d\n", sc_acces.value);
                 sc_acces.mask = MASK2;
                 sst_sc_reg_access(&sc_acces, PMIC_READ_MODIFY, 1);
         } else {
                 sc_acces.value = 0x00;
                 sc_acces.reg_addr = RMUTE;
-                pr_debug("sst: RIGHT_HP_MUTE value%d\n", sc_acces.value);
+                pr_debug("RIGHT_HP_MUTE value%d\n", sc_acces.value);
                 sc_acces.mask = MASK2;
                 sst_sc_reg_access(&sc_acces, PMIC_READ_MODIFY, 1);
         }
@@ -629,11 +631,11 @@ static int nc_set_mute(int dev_id, u8 value)
         if (retval)
                 return retval;
 
-        pr_debug("sst: set device id::%d, value %d\n", dev_id, value);
+        pr_debug("set device id::%d, value %d\n", dev_id, value);
 
         switch (dev_id) {
         case PMIC_SND_MUTE_ALL:
-                pr_debug("sst: PMIC_SND_MUTE_ALL value %d\n", value);
+                pr_debug("PMIC_SND_MUTE_ALL value %d\n", value);
                 snd_pmic_ops_nc.mute_status = value;
                 snd_pmic_ops_nc.master_mute = value;
                 if (value == UNMUTE) {
@@ -669,7 +671,7 @@ static int nc_set_mute(int dev_id, u8 value)
                 }
                 break;
         case PMIC_SND_HP_MIC_MUTE:
-                pr_debug("sst: PMIC_SND_HPMIC_MUTE value %d\n", value);
+                pr_debug("PMIC_SND_HPMIC_MUTE value %d\n", value);
                 if (value == UNMUTE) {
                         /* unmute the system, set the 6th bit to one */
                         sc_access[0].value = 0x00;
@@ -682,7 +684,7 @@ static int nc_set_mute(int dev_id, u8 value)
                 retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
                 break;
         case PMIC_SND_AMIC_MUTE:
-                pr_debug("sst: PMIC_SND_AMIC_MUTE value %d\n", value);
+                pr_debug("PMIC_SND_AMIC_MUTE value %d\n", value);
                 if (value == UNMUTE) {
                         /* unmute the system, set the 6th bit to one */
                         sc_access[0].value = 0x00;
@@ -696,7 +698,7 @@ static int nc_set_mute(int dev_id, u8 value)
                 break;
 
         case PMIC_SND_DMIC_MUTE:
-                pr_debug("sst: INPUT_MUTE_DMIC value%d\n", value);
+                pr_debug("INPUT_MUTE_DMIC value%d\n", value);
                 if (value == UNMUTE) {
                         /* unmute the system, set the 6th bit to one */
                         sc_access[1].value = 0x00;
@@ -724,13 +726,13 @@ static int nc_set_mute(int dev_id, u8 value)
 
                 if (dev_id == PMIC_SND_LEFT_HP_MUTE) {
                         sc_access[0].reg_addr = LMUTE;
-                        pr_debug("sst: LEFT_HP_MUTE value %d\n",
+                        pr_debug("LEFT_HP_MUTE value %d\n",
                                         sc_access[0].value);
                 } else {
                         if (snd_pmic_ops_nc.num_channel == 1)
                                 sc_access[0].value = 0x04;
                         sc_access[0].reg_addr = RMUTE;
-                        pr_debug("sst: RIGHT_HP_MUTE value %d\n",
+                        pr_debug("RIGHT_HP_MUTE value %d\n",
                                         sc_access[0].value);
                 }
                 sc_access[0].mask = MASK2;
@@ -743,7 +745,7 @@ static int nc_set_mute(int dev_id, u8 value)
                 else
                         sc_access[0].value = 0x03;
                 sc_access[0].reg_addr = LMUTE;
-                pr_debug("sst: SPEAKER_MUTE %d\n", sc_access[0].value);
+                pr_debug("SPEAKER_MUTE %d\n", sc_access[0].value);
                 sc_access[0].mask = MASK1;
                 retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
                 break;
@@ -764,10 +766,10 @@ static int nc_set_vol(int dev_id, int value)
         if (retval)
                 return retval;
 
-        pr_debug("sst: set volume:%d\n", dev_id);
+        pr_debug("set volume:%d\n", dev_id);
         switch (dev_id) {
         case PMIC_SND_CAPTURE_VOL:
-                pr_debug("sst: PMIC_SND_CAPTURE_VOL:value::%d\n", value);
+                pr_debug("PMIC_SND_CAPTURE_VOL:value::%d\n", value);
                 sc_access[0].value = sc_access[1].value =
                                         sc_access[2].value = -value;
                 sc_access[0].mask = sc_access[1].mask = sc_access[2].mask =
@@ -779,7 +781,7 @@ static int nc_set_vol(int dev_id, int value)
                 break;
 
         case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("sst: PMIC_SND_LEFT_HP_VOL %d\n", value);
+                pr_debug("PMIC_SND_LEFT_HP_VOL %d\n", value);
                 sc_access[0].value = -value;
                 sc_access[0].reg_addr  = AUDIOLVOL;
                 sc_access[0].mask =
@@ -788,7 +790,7 @@ static int nc_set_vol(int dev_id, int value)
                 break;
 
         case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("sst: PMIC_SND_RIGHT_HP_VOL value %d\n", value);
+                pr_debug("PMIC_SND_RIGHT_HP_VOL value %d\n", value);
                 if (snd_pmic_ops_nc.num_channel == 1) {
                         sc_access[0].value = 0x04;
                     sc_access[0].reg_addr = RMUTE;
@@ -821,11 +823,11 @@ static int nc_set_selected_input_dev(u8 value)
                 return retval;
         snd_pmic_ops_nc.input_dev_id = value;
 
-        pr_debug("sst: nc set selected input:%d\n", value);
+        pr_debug("nc set selected input:%d\n", value);
 
         switch (value) {
         case AMIC:
-                pr_debug("sst: Selecting AMIC\n");
+                pr_debug("Selecting AMIC\n");
                 sc_access[0].reg_addr = 0x107;
                 sc_access[0].value = 0x40;
                 sc_access[0].mask =  MASK6|MASK4|MASK3|MASK1|MASK0;
@@ -842,7 +844,7 @@ static int nc_set_selected_input_dev(u8 value)
                 break;
 
         case HS_MIC:
-                pr_debug("sst: Selecting HS_MIC\n");
+                pr_debug("Selecting HS_MIC\n");
                 sc_access[0].reg_addr = 0x107;
                 sc_access[0].mask =  MASK6|MASK4|MASK3|MASK1|MASK0;
                 sc_access[0].value = 0x10;
@@ -859,7 +861,7 @@ static int nc_set_selected_input_dev(u8 value)
                 break;
 
         case DMIC:
-                pr_debug("sst: DMIC\n");
+                pr_debug("DMIC\n");
                 sc_access[0].reg_addr = 0x107;
                 sc_access[0].mask = MASK6|MASK4|MASK3|MASK1|MASK0;
                 sc_access[0].value = 0x0B;
@@ -871,7 +873,7 @@ static int nc_set_selected_input_dev(u8 value)
                 sc_access[2].mask = MASK6;
                 sc_access[3].reg_addr = 0x109;
                 sc_access[3].mask = MASK6;
-                sc_access[3].value = 0x40;
+                sc_access[3].value = 0x00;
                 num_val = 4;
                 break;
         default:
@@ -890,23 +892,23 @@ static int nc_get_mute(int dev_id, u8 *value)
         if (retval)
                 return retval;
 
-        pr_debug("sst: get mute::%d\n", dev_id);
+        pr_debug("get mute::%d\n", dev_id);
 
         switch (dev_id) {
         case PMIC_SND_AMIC_MUTE:
-                pr_debug("sst: PMIC_SND_INPUT_MUTE_MIC1\n");
+                pr_debug("PMIC_SND_INPUT_MUTE_MIC1\n");
                 sc_access.reg_addr = LILSEL;
                 mask = MASK6;
                 break;
         case PMIC_SND_HP_MIC_MUTE:
-                pr_debug("sst: PMIC_SND_INPUT_MUTE_MIC2\n");
+                pr_debug("PMIC_SND_INPUT_MUTE_MIC2\n");
                 sc_access.reg_addr = LIRSEL;
                 mask = MASK6;
                 break;
         case PMIC_SND_LEFT_HP_MUTE:
         case PMIC_SND_RIGHT_HP_MUTE:
                 mask = MASK2;
-                pr_debug("sst: PMIC_SN_LEFT/RIGHT_HP_MUTE\n");
+                pr_debug("PMIC_SN_LEFT/RIGHT_HP_MUTE\n");
                 if (dev_id == PMIC_SND_RIGHT_HP_MUTE)
                         sc_access.reg_addr = RMUTE;
                 else
@@ -914,12 +916,12 @@ static int nc_get_mute(int dev_id, u8 *value)
                 break;
 
         case PMIC_SND_LEFT_SPEAKER_MUTE:
-                pr_debug("sst: PMIC_MONO_EARPIECE_MUTE\n");
+                pr_debug("PMIC_MONO_EARPIECE_MUTE\n");
                 sc_access.reg_addr = RMUTE;
                 mask = MASK1;
                 break;
         case PMIC_SND_DMIC_MUTE:
-                pr_debug("sst: PMIC_SND_INPUT_MUTE_DMIC\n");
+                pr_debug("PMIC_SND_INPUT_MUTE_DMIC\n");
                 sc_access.reg_addr = 0x105;
                 mask = MASK6;
                 break;
@@ -928,16 +930,16 @@ static int nc_get_mute(int dev_id, u8 *value)
 
         }
         retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("sst: reg value = %d\n", sc_access.value);
+        pr_debug("reg value = %d\n", sc_access.value);
         if (retval)
                 return retval;
         *value = (sc_access.value) & mask;
-        pr_debug("sst: masked value = %d\n", *value);
+        pr_debug("masked value = %d\n", *value);
         if (*value)
                 *value = 0;
         else
                 *value = 1;
-        pr_debug("sst: value returned = 0x%x\n", *value);
+        pr_debug("value returned = 0x%x\n", *value);
         return retval;
 }
 
@@ -953,19 +955,19 @@ static int nc_get_vol(int dev_id, int *value)
 
         switch (dev_id) {
         case PMIC_SND_CAPTURE_VOL:
-                pr_debug("sst: PMIC_SND_INPUT_CAPTURE_VOL\n");
+                pr_debug("PMIC_SND_INPUT_CAPTURE_VOL\n");
                 sc_access.reg_addr =  LILSEL;
                 mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
                 break;
 
         case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("sst: GET_VOLUME_PMIC_LEFT_HP_VOL\n");
+                pr_debug("GET_VOLUME_PMIC_LEFT_HP_VOL\n");
                 sc_access.reg_addr = AUDIOLVOL;
                 mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
                 break;
 
         case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("sst: GET_VOLUME_PMIC_RIGHT_HP_VOL\n");
+                pr_debug("GET_VOLUME_PMIC_RIGHT_HP_VOL\n");
                 sc_access.reg_addr = AUDIORVOL;
                 mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
                 break;
@@ -975,9 +977,9 @@ static int nc_get_vol(int dev_id, int *value)
 
         }
         retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("sst: value read = 0x%x\n", sc_access.value);
+        pr_debug("value read = 0x%x\n", sc_access.value);
         *value = -((sc_access.value) & mask);
-        pr_debug("sst: get vol value returned = %d\n", *value);
+        pr_debug("get vol value returned = %d\n", *value);
         return retval;
 }
 
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index 978bf87ff13d..515e448852a0 100644
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -11,43 +11,37 @@
 #include "transport.h"
 #include "init.h"
 
-BYTE            IsSSFDCCompliance;
-BYTE            IsXDCompliance;
-extern DWORD MediaChange;
-extern int      Check_D_MediaFmt(struct us_data *);
+BYTE IsSSFDCCompliance;
+BYTE IsXDCompliance;
 
-//----- ENE_InitMedia() ----------------------------------------
+/*
+ * ENE_InitMedia():
+ */
 int ENE_InitMedia(struct us_data *us)
 {
         int     result;
         BYTE    MiscReg03 = 0;
 
-        printk("--- Init Media ---\n");
+        printk(KERN_INFO "--- Init Media ---\n");
         result = ENE_Read_BYTE(us, REG_CARD_STATUS, &MiscReg03);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Read register fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Read register fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
-        printk("MiscReg03 = %x\n", MiscReg03);
+        printk(KERN_INFO "MiscReg03 = %x\n", MiscReg03);
 
-        if (MiscReg03 & 0x01)
-        {
-                if (!us->SD_Status.Ready)
-                {
+        if (MiscReg03 & 0x01) {
+                if (!us->SD_Status.Ready) {
                         result = ENE_SDInit(us);
                         if (result != USB_STOR_XFER_GOOD)
                                 return USB_STOR_TRANSPORT_ERROR;
                 }
         }
 
-        if (MiscReg03 & 0x02)
-        {
-                if (!us->SM_Status.Ready && !us->MS_Status.Ready)
-                {
+        if (MiscReg03 & 0x02) {
+                if (!us->SM_Status.Ready && !us->MS_Status.Ready) {
                         result = ENE_SMInit(us);
-                        if (result != USB_STOR_XFER_GOOD)
-                        {
+                        if (result != USB_STOR_XFER_GOOD) {
                                 result = ENE_MSInit(us);
                                 if (result != USB_STOR_XFER_GOOD)
                                         return USB_STOR_TRANSPORT_ERROR;
@@ -58,7 +52,9 @@ int ENE_InitMedia(struct us_data *us)
         return result;
 }
 
-//----- ENE_Read_BYTE() ----------------------------------------
+/*
+ * ENE_Read_BYTE() :
+ */
 int ENE_Read_BYTE(struct us_data *us, WORD index, void *buf)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
@@ -76,19 +72,20 @@ int ENE_Read_BYTE(struct us_data *us, WORD index, void *buf)
         return result;
 }
 
-//----- ENE_SDInit() ---------------------
+/*
+ * ENE_SDInit():
+ */
 int ENE_SDInit(struct us_data *us)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         int     result;
         BYTE    buf[0x200];
 
-        printk("transport --- ENE_SDInit\n");
-        // SD Init Part-1
+        printk(KERN_INFO "transport --- ENE_SDInit\n");
+        /* SD Init Part-1 */
         result = ENE_LoadBinCode(us, SD_INIT1_PATTERN);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Load SD Init Code Part-1 Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Load SD Init Code Part-1 Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
@@ -98,17 +95,15 @@ int ENE_SDInit(struct us_data *us)
         bcb->CDB[0] = 0xF2;
 
         result = ENE_SendScsiCmd(us, FDIR_READ, NULL, 0);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Exection SD Init Code Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Exection SD Init Code Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
-        // SD Init Part-2
+        /* SD Init Part-2 */
         result = ENE_LoadBinCode(us, SD_INIT2_PATTERN);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Load SD Init Code Part-2 Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Load SD Init Code Part-2 Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
@@ -119,45 +114,41 @@ int ENE_SDInit(struct us_data *us)
         bcb->CDB[0]                     = 0xF1;
 
         result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Exection SD Init Code Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Exection SD Init Code Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
         us->SD_Status =  *(PSD_STATUS)&buf[0];
-        if (us->SD_Status.Insert && us->SD_Status.Ready)
-        {
+        if (us->SD_Status.Insert && us->SD_Status.Ready) {
                 ENE_ReadSDReg(us, (PBYTE)&buf);
-                printk("Insert     = %x\n", us->SD_Status.Insert);
-                printk("Ready      = %x\n", us->SD_Status.Ready);
-                printk("IsMMC      = %x\n", us->SD_Status.IsMMC);
-                printk("HiCapacity = %x\n", us->SD_Status.HiCapacity);
-                printk("HiSpeed    = %x\n", us->SD_Status.HiSpeed);
-                printk("WtP        = %x\n", us->SD_Status.WtP);
-        }
-        else
-        {
-                printk("SD Card Not Ready --- %x\n", buf[0]);
+                printk(KERN_INFO "Insert     = %x\n", us->SD_Status.Insert);
+                printk(KERN_INFO "Ready      = %x\n", us->SD_Status.Ready);
+                printk(KERN_INFO "IsMMC      = %x\n", us->SD_Status.IsMMC);
+                printk(KERN_INFO "HiCapacity = %x\n", us->SD_Status.HiCapacity);
+                printk(KERN_INFO "HiSpeed    = %x\n", us->SD_Status.HiSpeed);
+                printk(KERN_INFO "WtP        = %x\n", us->SD_Status.WtP);
+        } else {
+                printk(KERN_ERR "SD Card Not Ready --- %x\n", buf[0]);
                 return USB_STOR_TRANSPORT_ERROR;
         }
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_MSInit() ----------------------------------------
+/*
+ * ENE_MSInit():
+ */
 int ENE_MSInit(struct us_data *us)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         int     result;
         BYTE    buf[0x200];
         WORD    MSP_BlockSize, MSP_UserAreaBlocks;
-        
 
-        printk("transport --- ENE_MSInit\n");
+        printk(KERN_INFO "transport --- ENE_MSInit\n");
         result = ENE_LoadBinCode(us, MS_INIT_PATTERN);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Load MS Init Code Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Load MS Init Code Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
@@ -169,53 +160,49 @@ int ENE_MSInit(struct us_data *us)
         bcb->CDB[1]                     = 0x01;
 
         result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Exection MS Init Code Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "Exection MS Init Code Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
         us->MS_Status = *(PMS_STATUS)&buf[0];
 
-        if (us->MS_Status.Insert && us->MS_Status.Ready)
-        {
-                printk("Insert     = %x\n", us->MS_Status.Insert);
-                printk("Ready      = %x\n", us->MS_Status.Ready);
-                printk("IsMSPro    = %x\n", us->MS_Status.IsMSPro);
-                printk("IsMSPHG    = %x\n", us->MS_Status.IsMSPHG);
-                printk("WtP        = %x\n", us->MS_Status.WtP);
-                if (us->MS_Status.IsMSPro)
-                {
-                        MSP_BlockSize      = (buf[6] <<8) | buf[7];
-                        MSP_UserAreaBlocks = (buf[10]<<8) | buf[11];
+        if (us->MS_Status.Insert && us->MS_Status.Ready) {
+                printk(KERN_INFO "Insert     = %x\n", us->MS_Status.Insert);
+                printk(KERN_INFO "Ready      = %x\n", us->MS_Status.Ready);
+                printk(KERN_INFO "IsMSPro    = %x\n", us->MS_Status.IsMSPro);
+                printk(KERN_INFO "IsMSPHG    = %x\n", us->MS_Status.IsMSPHG);
+                printk(KERN_INFO "WtP        = %x\n", us->MS_Status.WtP);
+                if (us->MS_Status.IsMSPro) {
+                        MSP_BlockSize      = (buf[6] << 8) | buf[7];
+                        MSP_UserAreaBlocks = (buf[10] << 8) | buf[11];
                         us->MSP_TotalBlock = MSP_BlockSize * MSP_UserAreaBlocks;
-                }
-                else
+                } else {
                         MS_CardInit(us);
-                printk("MS Init Code OK !!\n");
-        }
-        else
-        {
-                printk("MS Card Not Ready --- %x\n", buf[0]);
+                }
+                printk(KERN_INFO "MS Init Code OK !!\n");
+        } else {
+                printk(KERN_INFO "MS Card Not Ready --- %x\n", buf[0]);
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_SMInit() ----------------------------------------
+/*
+ *ENE_SMInit()
+ */
 int ENE_SMInit(struct us_data *us)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         int     result;
         BYTE    buf[0x200];
 
-        printk("transport --- ENE_SMInit\n");
+        printk(KERN_INFO "transport --- ENE_SMInit\n");
 
         result = ENE_LoadBinCode(us, SM_INIT_PATTERN);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Load SM Init Code Fail !!\n");
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_INFO "Load SM Init Code Fail !!\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
@@ -227,9 +214,9 @@ int ENE_SMInit(struct us_data *us)
         bcb->CDB[1]                     = 0x01;
 
         result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("Exection SM Init Code Fail !! result = %x\n", result);
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR
+                       "Exection SM Init Code Fail !! result = %x\n", result);
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
@@ -238,32 +225,31 @@ int ENE_SMInit(struct us_data *us)
         us->SM_DeviceID = buf[1];
         us->SM_CardID   = buf[2];
 
-        if (us->SM_Status.Insert && us->SM_Status.Ready)
-        {
-                printk("Insert     = %x\n", us->SM_Status.Insert);
-                printk("Ready      = %x\n", us->SM_Status.Ready);
-                printk("WtP        = %x\n", us->SM_Status.WtP);
-                printk("DeviceID   = %x\n", us->SM_DeviceID);
-                printk("CardID     = %x\n", us->SM_CardID);
+        if (us->SM_Status.Insert && us->SM_Status.Ready) {
+                printk(KERN_INFO "Insert     = %x\n", us->SM_Status.Insert);
+                printk(KERN_INFO "Ready      = %x\n", us->SM_Status.Ready);
+                printk(KERN_INFO "WtP        = %x\n", us->SM_Status.WtP);
+                printk(KERN_INFO "DeviceID   = %x\n", us->SM_DeviceID);
+                printk(KERN_INFO "CardID     = %x\n", us->SM_CardID);
                 MediaChange = 1;
                 Check_D_MediaFmt(us);
-        }
-        else
-        {
-                printk("SM Card Not Ready --- %x\n", buf[0]);
+        } else {
+                printk(KERN_ERR "SM Card Not Ready --- %x\n", buf[0]);
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_ReadSDReg() ----------------------------------------------
+/*
+ * ENE_ReadSDReg()
+ */
 int ENE_ReadSDReg(struct us_data *us, u8 *RdBuf)
 {
         WORD    tmpreg;
         DWORD   reg4b;
-        
-        //printk("transport --- ENE_ReadSDReg\n");
+
+        /* printk(KERN_INFO "transport --- ENE_ReadSDReg\n"); */
         reg4b = *(PDWORD)&RdBuf[0x18];
         us->SD_READ_BL_LEN = (BYTE)((reg4b >> 8) & 0x0f);
 
@@ -277,74 +263,75 @@ int ENE_ReadSDReg(struct us_data *us, u8 *RdBuf)
         if (us->SD_Status.HiCapacity && us->SD_Status.IsMMC)
                 us->HC_C_SIZE = *(PDWORD)(&RdBuf[0x100]);
 
-        if (us->SD_READ_BL_LEN > SD_BLOCK_LEN)
-        {
-                us->SD_Block_Mult = 1 << (us->SD_READ_BL_LEN - SD_BLOCK_LEN);           us->SD_READ_BL_LEN = SD_BLOCK_LEN;
-        }
-        else
-        {               us->SD_Block_Mult = 1;
+        if (us->SD_READ_BL_LEN > SD_BLOCK_LEN) {
+                us->SD_Block_Mult =
+                        1 << (us->SD_READ_BL_LEN - SD_BLOCK_LEN);
+                us->SD_READ_BL_LEN = SD_BLOCK_LEN;
+        } else {
+                us->SD_Block_Mult = 1;
         }
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_LoadBinCode() ---------------------
+/*
+ * ENE_LoadBinCode()
+ */
 int ENE_LoadBinCode(struct us_data *us, BYTE flag)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         int result;
-        //void *buf;
+        /* void *buf; */
         PBYTE buf;
 
-        //printk("transport --- ENE_LoadBinCode\n");
+        /* printk(KERN_INFO "transport --- ENE_LoadBinCode\n"); */
         if (us->BIN_FLAG == flag)
                 return USB_STOR_TRANSPORT_GOOD;
 
         buf = kmalloc(0x800, GFP_KERNEL);
         if (buf == NULL)
                 return USB_STOR_TRANSPORT_ERROR;
-        switch ( flag )
-        {
-                // For SD
-                case SD_INIT1_PATTERN:
-                        printk("SD_INIT1_PATTERN\n");
-                        memcpy(buf, SD_Init1, 0x800);
+        switch (flag) {
+        /* For SD */
+        case SD_INIT1_PATTERN:
+                printk(KERN_INFO "SD_INIT1_PATTERN\n");
+                memcpy(buf, SD_Init1, 0x800);
                 break;
-                case SD_INIT2_PATTERN:
-                        printk("SD_INIT2_PATTERN\n");
-                        memcpy(buf, SD_Init2, 0x800);
+        case SD_INIT2_PATTERN:
+                printk(KERN_INFO "SD_INIT2_PATTERN\n");
+                memcpy(buf, SD_Init2, 0x800);
                 break;
-                case SD_RW_PATTERN:
-                        printk("SD_RW_PATTERN\n");
-                        memcpy(buf, SD_Rdwr, 0x800);
+        case SD_RW_PATTERN:
+                printk(KERN_INFO "SD_RW_PATTERN\n");
+                memcpy(buf, SD_Rdwr, 0x800);
                 break;
-                // For MS
-                case MS_INIT_PATTERN:
-                        printk("MS_INIT_PATTERN\n");
-                        memcpy(buf, MS_Init, 0x800);
+        /* For MS */
+        case MS_INIT_PATTERN:
+                printk(KERN_INFO "MS_INIT_PATTERN\n");
+                memcpy(buf, MS_Init, 0x800);
                 break;
-                case MSP_RW_PATTERN:
-                        printk("MSP_RW_PATTERN\n");
-                        memcpy(buf, MSP_Rdwr, 0x800);
+        case MSP_RW_PATTERN:
+                printk(KERN_INFO "MSP_RW_PATTERN\n");
+                memcpy(buf, MSP_Rdwr, 0x800);
                 break;
-                case MS_RW_PATTERN:
-                        printk("MS_RW_PATTERN\n");
-                        memcpy(buf, MS_Rdwr, 0x800);
+        case MS_RW_PATTERN:
+                printk(KERN_INFO "MS_RW_PATTERN\n");
+                memcpy(buf, MS_Rdwr, 0x800);
                 break;
-                // For SS
-                case SM_INIT_PATTERN:
-                        printk("SM_INIT_PATTERN\n");
-                        memcpy(buf, SM_Init, 0x800);
+        /* For SS */
+        case SM_INIT_PATTERN:
+                printk(KERN_INFO "SM_INIT_PATTERN\n");
+                memcpy(buf, SM_Init, 0x800);
                 break;
-                case SM_RW_PATTERN:
-                        printk("SM_RW_PATTERN\n");
-                        memcpy(buf, SM_Rdwr, 0x800);
+        case SM_RW_PATTERN:
+                printk(KERN_INFO "SM_RW_PATTERN\n");
+                memcpy(buf, SM_Rdwr, 0x800);
                 break;
         }
 
         memset(bcb, 0, sizeof(struct bulk_cb_wrap));
         bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
         bcb->DataTransferLength = 0x800;
-        bcb->Flags =0x00;
+        bcb->Flags = 0x00;
         bcb->CDB[0] = 0xEF;
 
         result = ENE_SendScsiCmd(us, FDIR_WRITE, buf, 0);
@@ -354,54 +341,63 @@ int ENE_LoadBinCode(struct us_data *us, BYTE flag)
         return result;
 }
 
-//----- ENE_SendScsiCmd() ---------------------
+/*
+ * ENE_SendScsiCmd():
+ */
 int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         struct bulk_cs_wrap *bcs = (struct bulk_cs_wrap *) us->iobuf;
 
         int result;
-        unsigned int transfer_length=bcb->DataTransferLength, cswlen=0, partial=0;
+        unsigned int transfer_length = bcb->DataTransferLength,
+                     cswlen = 0, partial = 0;
         unsigned int residue;
 
-        //printk("transport --- ENE_SendScsiCmd\n");
-        // send cmd to out endpoint
-        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb, US_BULK_CB_WRAP_LEN, NULL);
-        if (result != USB_STOR_XFER_GOOD)
-        {
-                printk("send cmd to out endpoint fail ---\n");
+        /* printk(KERN_INFO "transport --- ENE_SendScsiCmd\n"); */
+        /* send cmd to out endpoint */
+        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
+                                            bcb, US_BULK_CB_WRAP_LEN, NULL);
+        if (result != USB_STOR_XFER_GOOD) {
+                printk(KERN_ERR "send cmd to out endpoint fail ---\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
 
-        if (buf)
-        {
-                unsigned int pipe = fDir == FDIR_READ ? us->recv_bulk_pipe : us->send_bulk_pipe;
-                // Bulk
+        if (buf) {
+                unsigned int pipe = fDir;
+
+                if (fDir == FDIR_READ)
+                        pipe = us->recv_bulk_pipe;
+                else
+                        pipe = us->send_bulk_pipe;
+
+                /* Bulk */
                 if (use_sg)
                         result = usb_stor_bulk_srb(us, pipe, us->srb);
                 else
-                        result = usb_stor_bulk_transfer_sg(us, pipe, buf, transfer_length, 0, &partial);
-                if (result != USB_STOR_XFER_GOOD)
-                {
-                        printk("data transfer fail ---\n");
+                        result = usb_stor_bulk_transfer_sg(us, pipe, buf,
+                                                transfer_length, 0, &partial);
+                if (result != USB_STOR_XFER_GOOD) {
+                        printk(KERN_ERR "data transfer fail ---\n");
                         return USB_STOR_TRANSPORT_ERROR;
                 }
         }
 
-        // Get CSW for device status
-        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, US_BULK_CS_WRAP_LEN, &cswlen);
+        /* Get CSW for device status */
+        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs,
+                                                US_BULK_CS_WRAP_LEN, &cswlen);
 
-        if (result == USB_STOR_XFER_SHORT && cswlen == 0)
-        {
-                printk("Received 0-length CSW; retrying...\n");
-                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, US_BULK_CS_WRAP_LEN, &cswlen);
+        if (result == USB_STOR_XFER_SHORT && cswlen == 0) {
+                printk(KERN_WARNING "Received 0-length CSW; retrying...\n");
+                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
+                                        bcs, US_BULK_CS_WRAP_LEN, &cswlen);
         }
 
-        if (result == USB_STOR_XFER_STALLED)
-        {
+        if (result == USB_STOR_XFER_STALLED) {
                 /* get the status again */
-                printk("Attempting to get CSW (2nd try)...\n");
-                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, US_BULK_CS_WRAP_LEN, NULL);
+                printk(KERN_WARNING "Attempting to get CSW (2nd try)...\n");
+                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
+                                                bcs, US_BULK_CS_WRAP_LEN, NULL);
         }
 
         if (result != USB_STOR_XFER_GOOD)
@@ -410,12 +406,14 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
         /* check bulk status */
         residue = le32_to_cpu(bcs->Residue);
 
-        /* try to compute the actual residue, based on how much data
-         * was really transferred and what the device tells us */
-        if (residue && !(us->fflags & US_FL_IGNORE_RESIDUE))
-        {
+        /*
+         * try to compute the actual residue, based on how much data
+         * was really transferred and what the device tells us
+         */
+        if (residue && !(us->fflags & US_FL_IGNORE_RESIDUE)) {
                 residue = min(residue, transfer_length);
-                scsi_set_resid(us->srb, max(scsi_get_resid(us->srb), (int) residue));
+                scsi_set_resid(us->srb, max(scsi_get_resid(us->srb),
+                                                        (int) residue));
         }
 
         if (bcs->Status != US_BULK_STAT_OK)
@@ -424,35 +422,40 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_Read_Data() ---------------------
+/*
+ * ENE_Read_Data()
+ */
 int ENE_Read_Data(struct us_data *us, void *buf, unsigned int length)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         struct bulk_cs_wrap *bcs = (struct bulk_cs_wrap *) us->iobuf;
         int result;
 
-        //printk("transport --- ENE_Read_Data\n");
-        // set up the command wrapper
+        /* printk(KERN_INFO "transport --- ENE_Read_Data\n"); */
+        /* set up the command wrapper */
         memset(bcb, 0, sizeof(struct bulk_cb_wrap));
         bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
         bcb->DataTransferLength = length;
-        bcb->Flags =0x80;
+        bcb->Flags = 0x80;
         bcb->CDB[0] = 0xED;
         bcb->CDB[2] = 0xFF;
         bcb->CDB[3] = 0x81;
 
-        // send cmd to out endpoint
-        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb, US_BULK_CB_WRAP_LEN, NULL);
+        /* send cmd to out endpoint */
+        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb,
+                                                US_BULK_CB_WRAP_LEN, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        // R/W data
-        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, buf, length, NULL);
+        /* R/W data */
+        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
+                                                buf, length, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        // Get CSW for device status
-        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, US_BULK_CS_WRAP_LEN, NULL);
+        /* Get CSW for device status */
+        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs,
+                                                US_BULK_CS_WRAP_LEN, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
         if (bcs->Status != US_BULK_STAT_OK)
@@ -461,35 +464,40 @@ int ENE_Read_Data(struct us_data *us, void *buf, unsigned int length)
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- ENE_Write_Data() ---------------------
+/*
+ * ENE_Write_Data():
+ */
 int ENE_Write_Data(struct us_data *us, void *buf, unsigned int length)
 {
         struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
         struct bulk_cs_wrap *bcs = (struct bulk_cs_wrap *) us->iobuf;
         int result;
 
-        //printk("transport --- ENE_Write_Data\n");
-        // set up the command wrapper
+        /* printk("transport --- ENE_Write_Data\n"); */
+        /* set up the command wrapper */
         memset(bcb, 0, sizeof(struct bulk_cb_wrap));
         bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
         bcb->DataTransferLength = length;
-        bcb->Flags =0x00;
+        bcb->Flags = 0x00;
         bcb->CDB[0] = 0xEE;
         bcb->CDB[2] = 0xFF;
         bcb->CDB[3] = 0x81;
 
-        // send cmd to out endpoint
-        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb, US_BULK_CB_WRAP_LEN, NULL);
+        /* send cmd to out endpoint */
+        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcb,
+                                                US_BULK_CB_WRAP_LEN, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        // R/W data
-        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, buf, length, NULL);
+        /* R/W data */
+        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
+                                                buf, length, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
 
-        // Get CSW for device status
-        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs, US_BULK_CS_WRAP_LEN, NULL);
+        /* Get CSW for device status */
+        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, bcs,
+                                                US_BULK_CS_WRAP_LEN, NULL);
         if (result != USB_STOR_XFER_GOOD)
                 return USB_STOR_TRANSPORT_ERROR;
         if (bcs->Status != US_BULK_STAT_OK)
@@ -498,42 +506,52 @@ int ENE_Write_Data(struct us_data *us, void *buf, unsigned int length)
         return USB_STOR_TRANSPORT_GOOD;
 }
 
-//----- usb_stor_print_cmd() ---------------------
+/*
+ * usb_stor_print_cmd():
+ */
 void usb_stor_print_cmd(struct scsi_cmnd *srb)
 {
         PBYTE   Cdb = srb->cmnd;
         DWORD   cmd = Cdb[0];
-        DWORD   bn  =   ((Cdb[2]<<24) & 0xff000000) | ((Cdb[3]<<16) & 0x00ff0000) |
-                        ((Cdb[4]<< 8) & 0x0000ff00) | ((Cdb[5]<< 0) & 0x000000ff);
-        WORD    blen = ((Cdb[7]<< 8) & 0xff00) | ((Cdb[8]<< 0) & 0x00ff);
+        DWORD   bn  =   ((Cdb[2] << 24) & 0xff000000) |
+                        ((Cdb[3] << 16) & 0x00ff0000) |
+                        ((Cdb[4] << 8) & 0x0000ff00) |
+                        ((Cdb[5] << 0) & 0x000000ff);
+        WORD    blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
 
         switch (cmd) {
         case TEST_UNIT_READY:
-                //printk("scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd);
+                /* printk(KERN_INFO
+                         "scsi cmd %X --- SCSIOP_TEST_UNIT_READY\n", cmd); */
                 break;
         case INQUIRY:
-                printk("scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
+                printk(KERN_INFO "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
                 break;
         case MODE_SENSE:
-                printk("scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
+                printk(KERN_INFO "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
                 break;
         case START_STOP:
-                printk("scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
+                printk(KERN_INFO "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
                 break;
         case READ_CAPACITY:
-                printk("scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
+                printk(KERN_INFO "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
                 break;
         case READ_10:
-                //printk("scsi cmd %X --- SCSIOP_READ, bn = %X, blen = %X\n", cmd, bn, blen);
+                /*  printk(KERN_INFO
+                           "scsi cmd %X --- SCSIOP_READ,bn = %X, blen = %X\n"
+                           ,cmd, bn, blen); */
                 break;
         case WRITE_10:
-                //printk("scsi cmd %X --- SCSIOP_WRITE, bn = %X, blen = %X\n", cmd, bn, blen);
+                /* printk(KERN_INFO
+                          "scsi cmd %X --- SCSIOP_WRITE,
+                          bn = %X, blen = %X\n" , cmd, bn, blen); */
                 break;
         case ALLOW_MEDIUM_REMOVAL:
-                printk("scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
+                printk(KERN_INFO
+                        "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
                 break;
         default:
-                printk("scsi cmd %X --- Other cmd\n", cmd);
+                printk(KERN_INFO "scsi cmd %X --- Other cmd\n", cmd);
                 break;
         }
         bn = 0;
diff --git a/drivers/staging/keucr/init.h b/drivers/staging/keucr/init.h
index cd199fc1e6d5..5223132a6c24 100644
--- a/drivers/staging/keucr/init.h
+++ b/drivers/staging/keucr/init.h
@@ -1,5 +1,8 @@
 #include "common.h"
 
+extern DWORD MediaChange;
+extern int Check_D_MediaFmt(struct us_data *);
+
 BYTE SD_Init1[] = {
 0x90, 0xFF, 0x09, 0xE0, 0x30, 0xE1, 0x06, 0x90,
 0xFF, 0x23, 0x74, 0x80, 0xF0, 0x90, 0xFF, 0x09,
diff --git a/drivers/staging/keucr/ms.c b/drivers/staging/keucr/ms.c
index 9a3fdb4e4fe4..452ea8f54f67 100644
--- a/drivers/staging/keucr/ms.c
+++ b/drivers/staging/keucr/ms.c
@@ -347,7 +347,7 @@ int MS_LibProcessBootBlock(struct us_data *us, WORD PhyBlock, BYTE *PageData)
         BYTE                     *PageBuffer;
         MS_LibTypeExtdat         ExtraData;
 
-        if ((PageBuffer = (BYTE *)kmalloc(MS_BYTES_PER_PAGE, GFP_KERNEL))==NULL)
+        if ((PageBuffer = kmalloc(MS_BYTES_PER_PAGE, GFP_KERNEL))==NULL)
                 return (DWORD)-1;
 
         result = (DWORD)-1;
@@ -480,8 +480,8 @@ int MS_LibAllocLogicalMap(struct us_data *us)
         DWORD  i;
 
 
-        us->MS_Lib.Phy2LogMap = (WORD *)kmalloc(us->MS_Lib.NumberOfPhyBlock * sizeof(WORD), GFP_KERNEL);
-        us->MS_Lib.Log2PhyMap = (WORD *)kmalloc(us->MS_Lib.NumberOfLogBlock * sizeof(WORD), GFP_KERNEL);
+        us->MS_Lib.Phy2LogMap = kmalloc(us->MS_Lib.NumberOfPhyBlock * sizeof(WORD), GFP_KERNEL);
+        us->MS_Lib.Log2PhyMap = kmalloc(us->MS_Lib.NumberOfLogBlock * sizeof(WORD), GFP_KERNEL);
 
         if ((us->MS_Lib.Phy2LogMap == NULL) || (us->MS_Lib.Log2PhyMap == NULL))
         {
@@ -610,8 +610,8 @@ int MS_LibAllocWriteBuf(struct us_data *us)
 {
         us->MS_Lib.wrtblk = (WORD)-1;
 
-        us->MS_Lib.blkpag = (BYTE *)kmalloc(us->MS_Lib.PagesPerBlock * us->MS_Lib.BytesPerSector, GFP_KERNEL);
-        us->MS_Lib.blkext = (MS_LibTypeExtdat *)kmalloc(us->MS_Lib.PagesPerBlock * sizeof(MS_LibTypeExtdat), GFP_KERNEL);
+        us->MS_Lib.blkpag = kmalloc(us->MS_Lib.PagesPerBlock * us->MS_Lib.BytesPerSector, GFP_KERNEL);
+        us->MS_Lib.blkext = kmalloc(us->MS_Lib.PagesPerBlock * sizeof(MS_LibTypeExtdat), GFP_KERNEL);
 
         if ((us->MS_Lib.blkpag == NULL) || (us->MS_Lib.blkext == NULL))
         {
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index bdfbf76f8df9..2cbe9f897eef 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -153,9 +153,9 @@ int Media_D_ReadSector(struct us_data *us, DWORD start,WORD count,BYTE *buf)
         WORD len, bn;
 
         //if (Check_D_MediaPower())        ; ¦b 6250 don't care
-        //    return(ErrCode);             ;
+        //    return(ErrCode);
         //if (Check_D_MediaFmt(fdoExt))    ;
-        //    return(ErrCode);             ;
+        //    return(ErrCode);
         if (Conv_D_MediaAddr(us, start))
                 return(ErrCode);
 
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index 1b52535a388f..ce10cf215f51 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -763,8 +763,8 @@ int Ssfdc_D_WriteSectForCopy(struct us_data *us, BYTE *buf, BYTE *redundant)
         bcb->CDB[7]                     = (BYTE)addr;
         bcb->CDB[6]                     = (BYTE)(addr/0x0100);
         bcb->CDB[5]                     = Media.Zone/2;
-        bcb->CDB[8]                     = *(redundant+REDT_ADDR1H);;
-        bcb->CDB[9]                     = *(redundant+REDT_ADDR1L);;
+        bcb->CDB[8]                     = *(redundant+REDT_ADDR1H);
+        bcb->CDB[9]                     = *(redundant+REDT_ADDR1L);
 
         result = ENE_SendScsiCmd(us, FDIR_WRITE, buf, 0);
         if (result != USB_STOR_XFER_GOOD)
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index 1e3bb1406331..9647154a4923 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -147,7 +147,7 @@ void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize)
         const int bytes_per_frame = line6pcm->properties->bytes_per_frame;
         int frames = fsize / bytes_per_frame;
 
-        if (runtime == 0)
+        if (runtime == NULL)
                 return;
 
         if (line6pcm->pos_in_done + frames > runtime->buffer_size) {
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index ab67e889d2c4..e554a2da643a 100644
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -127,7 +127,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
 
-        if (urb == 0) {
+        if (urb == NULL) {
                 dev_err(line6->ifcdev, "Out of memory\n");
                 return -ENOMEM;
         }
@@ -137,7 +137,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
 
         transfer_buffer = kmalloc(length, GFP_ATOMIC);
 
-        if (transfer_buffer == 0) {
+        if (transfer_buffer == NULL) {
                 usb_free_urb(urb);
                 dev_err(line6->ifcdev, "Out of memory\n");
                 return -ENOMEM;
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index 29940fd1671b..10c543836583 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -246,7 +246,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 
         change_volume(urb_out, line6pcm->volume_playback, bytes_per_frame);
 
-        if (line6pcm->prev_fbuf != 0) {
+        if (line6pcm->prev_fbuf != NULL) {
 #ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
                 if (line6pcm->flags & MASK_PCM_IMPULSE) {
                         create_impulse_test_signal(line6pcm, urb_out,
diff --git a/drivers/staging/memrar/memrar.h b/drivers/staging/memrar/memrar.h
index 0b735b827c09..0feb73b94c91 100644
--- a/drivers/staging/memrar/memrar.h
+++ b/drivers/staging/memrar/memrar.h
@@ -95,6 +95,7 @@ struct RAR_buffer {
         dma_addr_t bus_address;
 };
 
+#if defined(CONFIG_MRST_RAR_HANDLER)
 /**
  * rar_reserve() - reserve RAR buffers
  * @buffers:    array of RAR_buffers where type and size of buffers to
@@ -149,7 +150,25 @@ extern size_t rar_release(struct RAR_buffer *buffers,
 extern size_t rar_handle_to_bus(struct RAR_buffer *buffers,
                                 size_t count);
 
+#else
 
+extern inline size_t rar_reserve(struct RAR_buffer *buffers, size_t count)
+{
+        return 0;
+}
+
+extern inline size_t rar_release(struct RAR_buffer *buffers, size_t count)
+{
+        return 0;
+}
+
+extern inline size_t rar_handle_to_bus(struct RAR_buffer *buffers,
+                                size_t count)
+{
+        return 0;
+}
+
+#endif  /* MRST_RAR_HANDLER */
 #endif  /* __KERNEL__ */
 
 #endif  /* _MEMRAR_H */
diff --git a/drivers/staging/msm/Makefile b/drivers/staging/msm/Makefile
index bb3606faf20e..07a89ecfcc2b 100644
--- a/drivers/staging/msm/Makefile
+++ b/drivers/staging/msm/Makefile
@@ -41,11 +41,11 @@ obj-$(CONFIG_FB_MSM_EBI2) += ebi2_lcd.o
 obj-$(CONFIG_FB_MSM_LCDC) += lcdc.o
 
 # MDDI
-msm_mddi-objs := mddi.o mddihost.o mddihosti.o
+msm_mddi-y := mddi.o mddihost.o mddihosti.o
 obj-$(CONFIG_FB_MSM_MDDI) += msm_mddi.o
 
 # External MDDI
-msm_mddi_ext-objs := mddihost_e.o mddi_ext.o
+msm_mddi_ext-y := mddihost_e.o mddi_ext.o
 obj-$(CONFIG_FB_MSM_EXTMDDI) += msm_mddi_ext.o
 
 # TVEnc
diff --git a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
index 864d7c18913d..edba78a3afcf 100644
--- a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
+++ b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
@@ -77,7 +77,7 @@ static void toshiba_spi_write(char cmd, uint32 data, int num)
 
         /* followed by parameter bytes */
         if (num) {
-                bp = (char *)&data;;
+                bp = (char *)&data;
                 bp += (num - 1);
                 while (num) {
                         toshiba_spi_write_byte(1, *bp);
diff --git a/drivers/staging/msm/tvenc.c b/drivers/staging/msm/tvenc.c
index f41c5ac22f25..4fbb77b253d3 100644
--- a/drivers/staging/msm/tvenc.c
+++ b/drivers/staging/msm/tvenc.c
@@ -279,12 +279,13 @@ static int __init tvenc_driver_init(void)
 
         if (IS_ERR(tvenc_clk)) {
                 printk(KERN_ERR "error: can't get tvenc_clk!\n");
-                return IS_ERR(tvenc_clk);
+                return PTR_ERR(tvenc_clk);
         }
 
         if (IS_ERR(tvdac_clk)) {
                 printk(KERN_ERR "error: can't get tvdac_clk!\n");
-                return IS_ERR(tvdac_clk);
+                clk_put(tvenc_clk);
+                return PTR_ERR(tvdac_clk);
         }
 
 //      pm_qos_add_requirement(PM_QOS_SYSTEM_BUS_FREQ , "tvenc",
diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
index 677152044f45..683657cb21f5 100644
--- a/drivers/staging/phison/phison.c
+++ b/drivers/staging/phison/phison.c
@@ -69,7 +69,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         return ret;
 }
 
-static const struct pci_device_id phison_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(phison_pci_tbl) = {
         { PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
           PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
         { 0, },
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c
index 2fdb3e01460d..6540864216c8 100644
--- a/drivers/staging/pohmelfs/crypto.c
+++ b/drivers/staging/pohmelfs/crypto.c
@@ -130,10 +130,8 @@ err_out_exit:
 
 void pohmelfs_crypto_engine_exit(struct pohmelfs_crypto_engine *e)
 {
-        if (e->hash)
-                crypto_free_hash(e->hash);
-        if (e->cipher)
-                crypto_free_ablkcipher(e->cipher);
+        crypto_free_hash(e->hash);
+        crypto_free_ablkcipher(e->cipher);
         kfree(e->data);
 }
 
diff --git a/drivers/staging/rt2860/chip/mac_pci.h b/drivers/staging/rt2860/chip/mac_pci.h
index 9f25ef047f59..b8868a5b9e04 100644
--- a/drivers/staging/rt2860/chip/mac_pci.h
+++ b/drivers/staging/rt2860/chip/mac_pci.h
@@ -30,7 +30,8 @@
     Abstract:
 
     Revision History:
-    Who          When          What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix some typos
     ---------    ----------    ----------------------------------------------
  */
 
@@ -45,7 +46,7 @@
 
 /* */
 /* Device ID & Vendor ID related definitions, */
-/* NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip. */
+/* NOTE: you should not add the new VendorID/DeviceID here unless you know for sure what chip it belongs too. */
 /* */
 #define NIC_PCI_VENDOR_ID               0x1814
 #define PCIBUS_INTEL_VENDOR     0x8086
@@ -83,7 +84,7 @@ struct PACKED rt_txd {
         u32 SDPtr1;
         /*Word3 */
         u32 rsv2:24;
-        u32 WIV:1;              /* Wireless Info Valid. 1 if Driver already fill WI,  o if DMA needs to copy WI to correctposition */
+        u32 WIV:1;              /* Wireless Info Valid. 1 if Driver already fill WI,  o if DMA needs to copy WI to correct position */
         u32 QSEL:2;             /* select on-chip FIFO ID for 2nd-stage output scheduler.0:MGMT, 1:HCCA 2:EDCA */
         u32 rsv:2;
         u32 TCO:1;              /* */
diff --git a/drivers/staging/rt2860/chip/mac_usb.h b/drivers/staging/rt2860/chip/mac_usb.h
index ed0c0b43b05e..e8158fb58648 100644
--- a/drivers/staging/rt2860/chip/mac_usb.h
+++ b/drivers/staging/rt2860/chip/mac_usb.h
@@ -30,7 +30,8 @@
     Abstract:
 
     Revision History:
-    Who          When          What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix a typo
     ---------    ----------    ----------------------------------------------
  */
 
@@ -93,7 +94,7 @@ struct rt_txinfo {
         /* Word 0 */
         u32 USBDMATxPktLen:16;  /*used ONLY in USB bulk Aggregation,  Total byte counts of all sub-frame. */
         u32 rsv:8;
-        u32 WIV:1;              /* Wireless Info Valid. 1 if Driver already fill WI,  o if DMA needs to copy WI to correctposition */
+        u32 WIV:1;              /* Wireless Info Valid. 1 if Driver already fill WI,  o if DMA needs to copy WI to correct position */
         u32 QSEL:2;             /* select on-chip FIFO ID for 2nd-stage output scheduler.0:MGMT, 1:HCCA 2:EDCA */
         u32 SwUseLastRound:1;   /* Software use. */
         u32 rsv2:2;             /* Software use. */
diff --git a/drivers/staging/rt2860/chip/rtmp_mac.h b/drivers/staging/rt2860/chip/rtmp_mac.h
index e8f7172ce42a..3d1e4915b956 100644
--- a/drivers/staging/rt2860/chip/rtmp_mac.h
+++ b/drivers/staging/rt2860/chip/rtmp_mac.h
@@ -32,6 +32,7 @@
 
         Revision History:
         Who                     When              What
+        Justin P. Mattock       11/07/2010        Fix a comments, and typos
         --------        ----------        ----------------------------------------------
 */
 
@@ -43,7 +44,7 @@
 /* ================================================================================= */
 
 /* the first 24-byte in TXD is called TXINFO and will be DMAed to MAC block through TXFIFO. */
-/* MAC block use this TXINFO to control the transmission behavior of this frame. */
+/* MAC block uses this TXINFO to control the transmission behavior of this frame. */
 #define FIFO_MGMT                 0
 #define FIFO_HCCA                 1
 #define FIFO_EDCA                 2
@@ -458,8 +459,8 @@ typedef union _BBP_CSR_CFG_STRUC {
 /* */
 typedef union _RF_CSR_CFG0_STRUC {
         struct {
-                u32 RegIdAndContent:24; /* Register     value to program into BBP */
-                u32 bitwidth:5; /* Selected     BBP     register */
+                u32 RegIdAndContent:24; /* Register value to program into BBP */
+                u32 bitwidth:5; /* Selected BBP register */
                 u32 StandbyMode:1;      /* 0: high when stand by 1: low when standby */
                 u32 Sel:1;      /* 0:RF_LE0 activate  1:RF_LE1 activate */
                 u32 Busy:1;     /* 0: idle 1: 8busy */
@@ -469,7 +470,7 @@ typedef union _RF_CSR_CFG0_STRUC {
 #define RF_CSR_CFG1                     0x1024
 typedef union _RF_CSR_CFG1_STRUC {
         struct {
-                u32 RegIdAndContent:24; /* Register     value to program into BBP */
+                u32 RegIdAndContent:24; /* Register value to program into BBP */
                 u32 RFGap:5;    /* Gap between BB_CONTROL_RF and RF_LE. 0: 3 system clock cycle (37.5usec) 1: 5 system clock cycle (62.5usec) */
                 u32 rsv:7;      /* 0: idle 1: 8busy */
         } field;
@@ -478,7 +479,7 @@ typedef union _RF_CSR_CFG1_STRUC {
 #define RF_CSR_CFG2                     0x1028  /* */
 typedef union _RF_CSR_CFG2_STRUC {
         struct {
-                u32 RegIdAndContent:24; /* Register     value to program into BBP */
+                u32 RegIdAndContent:24; /* Register value to program into BBP */
                 u32 rsv:8;      /* 0: idle 1: 8busy */
         } field;
         u32 word;
@@ -490,7 +491,7 @@ typedef union _LED_CFG_STRUC {
                 u32 OffPeriod:8;        /* blinking off period unit 1ms */
                 u32 SlowBlinkPeriod:6;  /* slow blinking period. unit:1ms */
                 u32 rsv:2;
-                u32 RLedMode:2; /* red Led Mode    0: off1: blinking upon TX2: periodic slow blinking3: always on */
+                u32 RLedMode:2; /* red Led Mode 0: off1: blinking upon TX2: periodic slow blinking3: always on */
                 u32 GLedMode:2; /* green Led Mode */
                 u32 YLedMode:2; /* yellow Led Mode */
                 u32 LedPolar:1; /* Led Polarity.  0: active low1: active high */
@@ -621,9 +622,9 @@ typedef union _TX_TIMEOUT_CFG_STRUC {
 #define TX_RTY_CFG      0x134c
 typedef union PACKED _TX_RTY_CFG_STRUC {
         struct {
-                u32 ShortRtyLimit:8;    /*  short retry limit */
-                u32 LongRtyLimit:8;     /*long retry limit */
-                u32 LongRtyThre:12;     /* Long retry threshoold */
+                u32 ShortRtyLimit:8;    /* short retry limit */
+                u32 LongRtyLimit:8;     /* long retry limit */
+                u32 LongRtyThre:12;     /* Long retry threshold */
                 u32 NonAggRtyMode:1;    /* Non-Aggregate MPDU retry mode.  0:expired by retry limit, 1: expired by mpdu life timer */
                 u32 AggRtyMode:1;       /* Aggregate MPDU retry mode.  0:expired by retry limit, 1: expired by mpdu life timer */
                 u32 TxautoFBEnable:1;   /* Tx retry PHY rate auto fallback enable */
diff --git a/drivers/staging/rt2860/chip/rtmp_phy.h b/drivers/staging/rt2860/chip/rtmp_phy.h
index 9f924ea6ca35..98454df30a22 100644
--- a/drivers/staging/rt2860/chip/rtmp_phy.h
+++ b/drivers/staging/rt2860/chip/rtmp_phy.h
@@ -247,7 +247,7 @@
                         }                                               \
                 }                                                       \
                 if (BbpCsr.field.Busy == BUSY) {                        \
-                        DBGPRINT_ERR(("BBP(viaMCU=%d) read R%d fail\n", (_bViaMCU), _bbpID));   \
+                        DBGPRINT_ERR("BBP(viaMCU=%d) read R%d fail\n", (_bViaMCU), _bbpID);     \
                         *(_pV) = (_pAd)->BbpWriteLatch[_bbpID];               \
                         if ((_bViaMCU) == TRUE) {                       \
                                 RTMP_IO_READ32(_pAd, _regID, &BbpCsr.word);                             \
@@ -336,11 +336,11 @@
                         }                                               \
                 }                                                       \
         } else {                                                        \
-                DBGPRINT_ERR((" , brt30xxBanMcuCmd = %d, Read BBP %d \n", (_A)->brt30xxBanMcuCmd, (_I)));       \
+                DBGPRINT_ERR(" , brt30xxBanMcuCmd = %d, Read BBP %d \n", (_A)->brt30xxBanMcuCmd, (_I)); \
                 *(_pV) = (_A)->BbpWriteLatch[_I];                       \
         }                                                               \
         if ((BbpCsr.field.Busy == BUSY) || ((_A)->bPCIclkOff == TRUE)) { \
-                DBGPRINT_ERR(("BBP read R%d=0x%x fail\n", _I, BbpCsr.word)); \
+                DBGPRINT_ERR("BBP read R%d=0x%x fail\n", _I, BbpCsr.word); \
                 *(_pV) = (_A)->BbpWriteLatch[_I];                       \
         }                                                               \
 }
@@ -378,7 +378,7 @@
                         break;                                          \
                 }                                                       \
                 if (_busyCnt == MAX_BUSY_COUNT) {                       \
-                        DBGPRINT_ERR(("BBP write R%d fail\n", _bbpID)); \
+                        DBGPRINT_ERR("BBP write R%d fail\n", _bbpID);   \
                         if ((_bViaMCU) == TRUE) {                       \
                                 RTMP_IO_READ32(_pAd, H2M_BBP_AGENT, &BbpCsr.word);      \
                                 BbpCsr.field.Busy = 0;                  \
@@ -459,15 +459,15 @@
                                 break;                                                                                                                  \
                         }                                                                                                                                       \
                 } else {                                                \
-                        DBGPRINT_ERR(("  brt30xxBanMcuCmd = %d. Write BBP %d \n",  (_A)->brt30xxBanMcuCmd, (_I)));      \
+                        DBGPRINT_ERR("  brt30xxBanMcuCmd = %d. Write BBP %d \n",  (_A)->brt30xxBanMcuCmd, (_I));        \
                 }                                                                                                                                       \
                 if ((BusyCnt == MAX_BUSY_COUNT) || ((_A)->bPCIclkOff == TRUE)) { \
                         if (BusyCnt == MAX_BUSY_COUNT)                          \
                                 (_A)->AccessBBPFailCount++;                                     \
-                        DBGPRINT_ERR(("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff)); \
+                        DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff);   \
                 }                                                                                                                                       \
         } else {                                                        \
-                DBGPRINT_ERR(("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n"));  \
+                DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n");    \
         }                                                                                                                                               \
 }
 #endif /* RTMP_MAC_PCI // */
diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index c2933c69bc04..334720ee1345 100644
--- a/drivers/staging/rt2860/chips/rt3090.c
+++ b/drivers/staging/rt2860/chips/rt3090.c
@@ -28,10 +28,11 @@
         rt3090.c
 
         Abstract:
-        Specific funcitons and variables for RT3070
+        Specific functions and variables for RT3070
 
         Revision History:
-        Who         When          What
+        Who                     When            What
+        Justin P. Mattock       11/07/2010      Fix a typo
         --------    ----------    ----------------------------------------------
 */
 
@@ -51,7 +52,8 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
         if (IS_RT3090(pAd)) {
                 /* Init RF calibration */
                 /* Driver should toggle RF R30 bit7 before init RF registers */
-                u32 RfReg = 0, data;
+                u8 RfReg;
+                u32 data;
 
                 RT30xxReadRFRegister(pAd, RF_R30, (u8 *)&RfReg);
                 RfReg |= 0x80;
diff --git a/drivers/staging/rt2860/chips/rt30xx.c b/drivers/staging/rt2860/chips/rt30xx.c
index 4367a196aeff..354debfe1477 100644
--- a/drivers/staging/rt2860/chips/rt30xx.c
+++ b/drivers/staging/rt2860/chips/rt30xx.c
@@ -28,10 +28,11 @@
         rt30xx.c
 
         Abstract:
-        Specific funcitons and variables for RT30xx.
+        Specific functions and variables for RT30xx.
 
         Revision History:
-        Who         When          What
+        Who                     When            What
+        Justin P. Mattock       11/07/2010      Fix some typos
         --------    ----------    ----------------------------------------------
 */
 
@@ -53,7 +54,7 @@ struct rt_reg_pair RT30xx_RFRegTable[] = {
         ,
         {RF_R06, 0x02}
         ,
-        {RF_R07, 0x70}
+        {RF_R07, 0x60}
         ,
         {RF_R09, 0x0F}
         ,
@@ -89,7 +90,7 @@ struct rt_reg_pair RT30xx_RFRegTable[] = {
 
 u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(struct rt_reg_pair));
 
-/* Antenna divesity use GPIO3 and EESK pin for control */
+/* Antenna diversity use GPIO3 and EESK pin for control */
 /* Antenna and EEPROM access are both using EESK pin, */
 /* Therefor we should avoid accessing EESK at the same time */
 /* Then restore antenna after EEPROM access */
@@ -243,7 +244,7 @@ void RTMPFilterCalibration(struct rt_rtmp_adapter *pAd)
                                 break;
                         }
 
-                        /* prevent infinite loop cause driver hang. */
+                        /* prevent infinite loop; causes driver hang. */
                         if (loopcnt++ > 100) {
                                 DBGPRINT(RT_DEBUG_ERROR,
                                          ("RTMPFilterCalibration - can't find a valid value, loopcnt=%d stop calibrating",
@@ -441,7 +442,7 @@ void RT30xxReverseRFSleepModeSetup(struct rt_rtmp_adapter *pAd)
 
                 /* VCO_IC, RF R7 register Bit 4 & Bit 5 to 1 */
                 RT30xxReadRFRegister(pAd, RF_R07, &RFValue);
-                RFValue |= 0x30;
+                RFValue |= 0x20;
                 RT30xxWriteRFRegister(pAd, RF_R07, RFValue);
 
                 /* Idoh, RF R9 register Bit 1, Bit 2 & Bit 3 to 1 */
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 8eef82d92621..b046c2b814c5 100644
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -799,8 +799,8 @@ void BAOriSessionTearDown(struct rt_rtmp_adapter *pAd,
                         /* force send specified TID DelBA */
                         struct rt_mlme_delba_req DelbaReq;
                         struct rt_mlme_queue_elem *Elem =
-                            (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                        MEM_ALLOC_FLAG);
+                                kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                        MEM_ALLOC_FLAG);
                         if (Elem != NULL) {
                                 NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                                 NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
@@ -839,8 +839,8 @@ void BAOriSessionTearDown(struct rt_rtmp_adapter *pAd,
             && (pBAEntry->ORI_BA_Status == Originator_Done)) {
                 struct rt_mlme_delba_req DelbaReq;
                 struct rt_mlme_queue_elem *Elem =
-                    (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                MEM_ALLOC_FLAG);
+                        kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                MEM_ALLOC_FLAG);
                 if (Elem != NULL) {
                         NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                         NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
@@ -908,8 +908,8 @@ void BARecSessionTearDown(struct rt_rtmp_adapter *pAd,
                 /* */
                 if (bPassive == FALSE) {
                         struct rt_mlme_queue_elem *Elem =
-                            (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                        MEM_ALLOC_FLAG);
+                                kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                        MEM_ALLOC_FLAG);
                         if (Elem != NULL) {
                                 NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                                 NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
@@ -1270,13 +1270,13 @@ BOOLEAN CntlEnqueueForRecv(struct rt_rtmp_adapter *pAd,
 
         /* First check the size, it MUST not exceed the mlme queue size */
         if (MsgLen > MGMT_DMA_BUFFER_SIZE) {
-                DBGPRINT_ERR(("CntlEnqueueForRecv: frame too large, size = %ld \n", MsgLen));
+                DBGPRINT_ERR("CntlEnqueueForRecv: frame too large, size = %ld \n", MsgLen);
                 return FALSE;
         } else if (MsgLen != sizeof(struct rt_frame_ba_req)) {
-                DBGPRINT_ERR(("CntlEnqueueForRecv: BlockAck Request frame length size = %ld incorrect\n", MsgLen));
+                DBGPRINT_ERR("CntlEnqueueForRecv: BlockAck Request frame length size = %ld incorrect\n", MsgLen);
                 return FALSE;
         } else if (MsgLen != sizeof(struct rt_frame_ba_req)) {
-                DBGPRINT_ERR(("CntlEnqueueForRecv: BlockAck Request frame length size = %ld incorrect\n", MsgLen));
+                DBGPRINT_ERR("CntlEnqueueForRecv: BlockAck Request frame length size = %ld incorrect\n", MsgLen);
                 return FALSE;
         }
 
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 93a53479d766..2204c2bda386 100644
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -1366,7 +1366,7 @@ void RTMPResumeMsduTransmission(struct rt_rtmp_adapter *pAd)
         /* R66 should not be 0 */
         if (pAd->BbpTuning.R66CurrentValue == 0) {
                 pAd->BbpTuning.R66CurrentValue = 0x38;
-                DBGPRINT_ERR(("RTMPResumeMsduTransmission, R66CurrentValue=0...\n"));
+                DBGPRINT_ERR("RTMPResumeMsduTransmission, R66CurrentValue=0...\n");
         }
 
         RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66,
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c
index 43d73a05c8eb..7af59ff9e220 100644
--- a/drivers/staging/rt2860/common/cmm_data_pci.c
+++ b/drivers/staging/rt2860/common/cmm_data_pci.c
@@ -137,7 +137,7 @@ u16 RtmpPCI_WriteSingleTxResource(struct rt_rtmp_adapter *pAd,
 
         pTxD->SDPtr0 = BufBasePaLow;
         pTxD->SDLen0 = TXINFO_SIZE + TXWI_SIZE + hwHeaderLen;   /* include padding */
-        pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);;
+        pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);
         pTxD->SDLen1 = pTxBlk->SrcBufLen;
         pTxD->LastSec0 = 0;
         pTxD->LastSec1 = (bIsLast) ? 1 : 0;
@@ -215,7 +215,7 @@ u16 RtmpPCI_WriteMultiTxResource(struct rt_rtmp_adapter *pAd,
 
         pTxD->SDPtr0 = BufBasePaLow;
         pTxD->SDLen0 = firstDMALen;     /* include padding */
-        pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);;
+        pTxD->SDPtr1 = PCI_MAP_SINGLE(pAd, pTxBlk, 0, 1, PCI_DMA_TODEVICE);
         pTxD->SDLen1 = pTxBlk->SrcBufLen;
         pTxD->LastSec0 = 0;
         pTxD->LastSec1 = (bIsLast) ? 1 : 0;
diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c
index e26ba4942877..850f0fbc6d90 100644
--- a/drivers/staging/rt2860/common/cmm_mac_pci.c
+++ b/drivers/staging/rt2860/common/cmm_mac_pci.c
@@ -89,7 +89,7 @@ int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
 
                         if (pAd->TxDescRing[num].AllocVa == NULL) {
                                 ErrorValue = ERRLOG_OUT_OF_SHARED_MEMORY;
-                                DBGPRINT_ERR(("Failed to allocate a big buffer\n"));
+                                DBGPRINT_ERR("Failed to allocate a big buffer\n");
                                 Status = NDIS_STATUS_RESOURCES;
                                 break;
                         }
@@ -121,7 +121,7 @@ int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
 
                         if (pAd->TxBufSpace[num].AllocVa == NULL) {
                                 ErrorValue = ERRLOG_OUT_OF_SHARED_MEMORY;
-                                DBGPRINT_ERR(("Failed to allocate a big buffer\n"));
+                                DBGPRINT_ERR("Failed to allocate a big buffer\n");
                                 Status = NDIS_STATUS_RESOURCES;
                                 break;
                         }
@@ -197,7 +197,7 @@ int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
 
                 if (pAd->MgmtDescRing.AllocVa == NULL) {
                         ErrorValue = ERRLOG_OUT_OF_SHARED_MEMORY;
-                        DBGPRINT_ERR(("Failed to allocate a big buffer\n"));
+                        DBGPRINT_ERR("Failed to allocate a big buffer\n");
                         Status = NDIS_STATUS_RESOURCES;
                         break;
                 }
@@ -251,7 +251,7 @@ int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
 
                 if (pAd->RxDescRing.AllocVa == NULL) {
                         ErrorValue = ERRLOG_OUT_OF_SHARED_MEMORY;
-                        DBGPRINT_ERR(("Failed to allocate a big buffer\n"));
+                        DBGPRINT_ERR("Failed to allocate a big buffer\n");
                         Status = NDIS_STATUS_RESOURCES;
                         break;
                 }
@@ -304,7 +304,7 @@ int RTMPAllocTxRxRingMemory(struct rt_rtmp_adapter *pAd)
                         /* Error handling */
                         if (pDmaBuf->AllocVa == NULL) {
                                 ErrorValue = ERRLOG_OUT_OF_SHARED_MEMORY;
-                                DBGPRINT_ERR(("Failed to allocate RxRing's 1st buffer\n"));
+                                DBGPRINT_ERR("Failed to allocate RxRing's 1st buffer\n");
                                 Status = NDIS_STATUS_RESOURCES;
                                 break;
                         }
diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c
index 72731cbb81df..64a65a460c29 100644
--- a/drivers/staging/rt2860/common/cmm_mac_usb.c
+++ b/drivers/staging/rt2860/common/cmm_mac_usb.c
@@ -236,7 +236,7 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd)
                 os_alloc_mem(pAd, (u8 **) (&pAd->MgmtDescRing.AllocVa),
                              pAd->MgmtDescRing.AllocSize);
                 if (pAd->MgmtDescRing.AllocVa == NULL) {
-                        DBGPRINT_ERR(("Failed to allocate a big buffer for MgmtDescRing!\n"));
+                        DBGPRINT_ERR("Failed to allocate a big buffer for MgmtDescRing!\n");
                         Status = NDIS_STATUS_RESOURCES;
                         goto out1;
                 }
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c
index e37b64b6a608..0040f45b629b 100644
--- a/drivers/staging/rt2860/common/cmm_wpa.c
+++ b/drivers/staging/rt2860/common/cmm_wpa.c
@@ -2794,7 +2794,7 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
 
         /* Check length */
         if ((len <= 0) || (pEid->Len != len)) {
-                DBGPRINT_ERR(("%s : The length is invalid\n", __func__));
+                DBGPRINT_ERR("%s : The length is invalid\n", __func__);
                 return NULL;
         }
         /* Check WPA or WPA2 */
@@ -2803,14 +2803,13 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
                 u16 ucount;
 
                 if (len < sizeof(struct rt_rsnie)) {
-                        DBGPRINT_ERR(("%s : The length is too short for WPA\n",
-                                      __func__));
+                        DBGPRINT_ERR("%s : The length is too short for WPA\n", __func__);
                         return NULL;
                 }
                 /* Get the count of pairwise cipher */
                 ucount = cpu2le16(pRsnie->ucount);
                 if (ucount > 2) {
-                        DBGPRINT_ERR(("%s : The count(%d) of pairwise cipher is invlaid\n", __func__, ucount));
+                        DBGPRINT_ERR("%s : The count(%d) of pairwise cipher is invlaid\n", __func__, ucount);
                         return NULL;
                 }
                 /* Get the group cipher */
@@ -2836,14 +2835,13 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
                 isWPA2 = TRUE;
 
                 if (len < sizeof(struct rt_rsnie2)) {
-                        DBGPRINT_ERR(("%s : The length is too short for WPA2\n",
-                                      __func__));
+                        DBGPRINT_ERR("%s : The length is too short for WPA2\n", __func__);
                         return NULL;
                 }
                 /* Get the count of pairwise cipher */
                 ucount = cpu2le16(pRsnie->ucount);
                 if (ucount > 2) {
-                        DBGPRINT_ERR(("%s : The count(%d) of pairwise cipher is invlaid\n", __func__, ucount));
+                        DBGPRINT_ERR("%s : The count(%d) of pairwise cipher is invlaid\n", __func__, ucount);
                         return NULL;
                 }
                 /* Get the group cipher */
@@ -2863,7 +2861,7 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
                 offset = sizeof(struct rt_rsnie2) + (4 * (ucount - 1));
 
         } else {
-                DBGPRINT_ERR(("%s : Unknown IE (%d)\n", __func__, pEid->Eid));
+                DBGPRINT_ERR("%s : Unknown IE (%d)\n", __func__, pEid->Eid);
                 return NULL;
         }
 
@@ -2872,8 +2870,7 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
         len -= offset;
 
         if (len < sizeof(struct rt_rsnie_auth)) {
-                DBGPRINT_ERR(("%s : The length of RSNIE is too short\n",
-                              __func__));
+                DBGPRINT_ERR("%s : The length of RSNIE is too short\n", __func__);
                 return NULL;
         }
         /* pointer to AKM count */
@@ -2882,8 +2879,7 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
         /* Get the count of pairwise cipher */
         acount = cpu2le16(pAkm->acount);
         if (acount > 2) {
-                DBGPRINT_ERR(("%s : The count(%d) of AKM is invlaid\n",
-                              __func__, acount));
+                DBGPRINT_ERR("%s : The count(%d) of AKM is invlaid\n", __func__, acount);
                 return NULL;
         }
         /* Get the AKM suite */
@@ -2910,7 +2906,7 @@ u8 *GetSuiteFromRSNIE(u8 *rsnie,
                         return pBuf;
                 }
         } else {
-                DBGPRINT_ERR(("%s : it can't get any more information beyond AKM \n", __func__));
+                DBGPRINT_ERR("%s : it can't get any more information beyond AKM \n", __func__);
                 return NULL;
         }
 
diff --git a/drivers/staging/rt2860/common/ee_efuse.c b/drivers/staging/rt2860/common/ee_efuse.c
index 03412f5bc990..fed0ba452271 100644
--- a/drivers/staging/rt2860/common/ee_efuse.c
+++ b/drivers/staging/rt2860/common/ee_efuse.c
@@ -264,7 +264,7 @@ int set_eFuseGetFreeBlockCount_Proc(struct rt_rtmp_adapter *pAd, char *arg)
                 if (i == EFUSE_USAGE_MAP_END)
                         efusefreenum = 0;
         }
-        printk("efuseFreeNumber is %d\n", efusefreenum);
+        printk(KERN_DEBUG "efuseFreeNumber is %d\n", efusefreenum);
         return TRUE;
 }
 
@@ -274,16 +274,23 @@ int set_eFusedump_Proc(struct rt_rtmp_adapter *pAd, char *arg)
         int i = 0;
         if (!pAd->bUseEfuse)
                 return FALSE;
+
+        printk(KERN_DEBUG "Block 0: ");
+
         for (i = 0; i < EFUSE_USAGE_MAP_END / 2; i++) {
                 InBuf[0] = 2 * i;
                 InBuf[1] = 2;
                 InBuf[2] = 0x0;
 
                 eFuseReadPhysical(pAd, &InBuf[0], 4, &InBuf[2], 2);
-                if (i % 4 == 0)
-                        printk("\nBlock %x:", i / 8);
-                printk("%04x ", InBuf[2]);
+                if (i && i % 4 == 0) {
+                        printk(KERN_CONT "\n");
+                        printk(KERN_DEBUG "Block %x:", i / 8);
+                }
+                printk(KERN_CONT "%04x ", InBuf[2]);
         }
+        printk(KERN_CONT "\n");
+
         return TRUE;
 }
 
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 7300c6e9c175..d9c3fd5c2166 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -550,7 +550,7 @@ void MlmeHandler(struct rt_rtmp_adapter *pAd)
                         Elem->MsgLen = 0;
 
                 } else {
-                        DBGPRINT_ERR(("MlmeHandler: MlmeQueue empty\n"));
+                        DBGPRINT_ERR("MlmeHandler: MlmeQueue empty\n");
                 }
         }
 
@@ -4698,8 +4698,7 @@ BOOLEAN MlmeEnqueue(struct rt_rtmp_adapter *pAd,
 
         /* First check the size, it MUST not exceed the mlme queue size */
         if (MsgLen > MGMT_DMA_BUFFER_SIZE) {
-                DBGPRINT_ERR(("MlmeEnqueue: msg too large, size = %ld \n",
-                              MsgLen));
+                DBGPRINT_ERR("MlmeEnqueue: msg too large, size = %ld \n", MsgLen);
                 return FALSE;
         }
 
@@ -4762,12 +4761,12 @@ BOOLEAN MlmeEnqueueForRecv(struct rt_rtmp_adapter *pAd,
         if (RTMP_TEST_FLAG
             (pAd,
              fRTMP_ADAPTER_HALT_IN_PROGRESS | fRTMP_ADAPTER_NIC_NOT_EXIST)) {
-                DBGPRINT_ERR(("MlmeEnqueueForRecv: fRTMP_ADAPTER_HALT_IN_PROGRESS\n"));
+                DBGPRINT_ERR("MlmeEnqueueForRecv: fRTMP_ADAPTER_HALT_IN_PROGRESS\n");
                 return FALSE;
         }
         /* First check the size, it MUST not exceed the mlme queue size */
         if (MsgLen > MGMT_DMA_BUFFER_SIZE) {
-                DBGPRINT_ERR(("MlmeEnqueueForRecv: frame too large, size = %ld \n", MsgLen));
+                DBGPRINT_ERR("MlmeEnqueueForRecv: frame too large, size = %ld \n", MsgLen);
                 return FALSE;
         }
 
@@ -4777,7 +4776,7 @@ BOOLEAN MlmeEnqueueForRecv(struct rt_rtmp_adapter *pAd,
 
         {
                 if (!MsgTypeSubst(pAd, pFrame, &Machine, &MsgType)) {
-                        DBGPRINT_ERR(("MlmeEnqueueForRecv: un-recongnized mgmt->subtype=%d\n", pFrame->Hdr.FC.SubType));
+                        DBGPRINT_ERR("MlmeEnqueueForRecv: un-recongnized mgmt->subtype=%d\n", pFrame->Hdr.FC.SubType);
                         return FALSE;
                 }
         }
@@ -4867,7 +4866,7 @@ void MlmeRestartStateMachine(struct rt_rtmp_adapter *pAd)
                         Elem->MsgLen = 0;
 
                 } else {
-                        DBGPRINT_ERR(("MlmeRestartStateMachine: MlmeQueue empty\n"));
+                        DBGPRINT_ERR("MlmeRestartStateMachine: MlmeQueue empty\n");
                 }
         }
 #endif /* RTMP_MAC_PCI // */
diff --git a/drivers/staging/rt2860/common/rt_rf.c b/drivers/staging/rt2860/common/rt_rf.c
index 519121d81040..2895447ffc48 100644
--- a/drivers/staging/rt2860/common/rt_rf.c
+++ b/drivers/staging/rt2860/common/rt_rf.c
@@ -131,8 +131,7 @@ int RT30xxReadRFRegister(struct rt_rtmp_adapter *pAd,
                 }
         }
         if (rfcsr.field.RF_CSR_KICK == BUSY) {
-                DBGPRINT_ERR(("RF read R%d=0x%x fail, i[%d], k[%d]\n", regID,
-                              rfcsr.word, i, k));
+                DBGPRINT_ERR("RF read R%d=0x%x fail, i[%d], k[%d]\n", regID, rfcsr.word, i, k);
                 return STATUS_UNSUCCESSFUL;
         }
 
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 3628e85802e3..d359a14f5d4d 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -169,14 +169,14 @@ int RTMPAllocAdapterBlock(void *handle,
                 pBeaconBuf = kmalloc(MAX_BEACON_SIZE, MEM_ALLOC_FLAG);
                 if (pBeaconBuf == NULL) {
                         Status = NDIS_STATUS_FAILURE;
-                        DBGPRINT_ERR(("Failed to allocate memory - BeaconBuf!\n"));
+                        DBGPRINT_ERR("Failed to allocate memory - BeaconBuf!\n");
                         break;
                 }
                 NdisZeroMemory(pBeaconBuf, MAX_BEACON_SIZE);
 
                 Status = AdapterBlockAllocateMemory(handle, (void **) & pAd);
                 if (Status != NDIS_STATUS_SUCCESS) {
-                        DBGPRINT_ERR(("Failed to allocate memory - ADAPTER\n"));
+                        DBGPRINT_ERR("Failed to allocate memory - ADAPTER\n");
                         break;
                 }
                 pAd->BeaconBuf = pBeaconBuf;
@@ -785,8 +785,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
                   Version.field.Version, Version.field.FaeReleaseNumber));
 
         if (Version.field.Version > VALID_EEPROM_VERSION) {
-                DBGPRINT_ERR(("E2PROM: WRONG VERSION 0x%x, should be %d\n",
-                              Version.field.Version, VALID_EEPROM_VERSION));
+                DBGPRINT_ERR("E2PROM: WRONG VERSION 0x%x, should be %d\n", Version.field.Version, VALID_EEPROM_VERSION);
                 /*pAd->SystemErrorBitmap |= 0x00000001;
 
                    // hard-code default value when no proper E2PROM installed
@@ -2911,7 +2910,7 @@ void RTMPSetTimer(struct rt_ralink_timer *pTimer, unsigned long Value)
                         RTMP_OS_Add_Timer(&pTimer->TimerObj, Value);
                 }
         } else {
-                DBGPRINT_ERR(("RTMPSetTimer failed, Timer hasn't been initialize!\n"));
+                DBGPRINT_ERR("RTMPSetTimer failed, Timer hasn't been initialize!\n");
         }
 }
 
@@ -2947,7 +2946,7 @@ void RTMPModTimer(struct rt_ralink_timer *pTimer, unsigned long Value)
                         RTMP_OS_Mod_Timer(&pTimer->TimerObj, Value);
                 }
         } else {
-                DBGPRINT_ERR(("RTMPModTimer failed, Timer hasn't been initialize!\n"));
+                DBGPRINT_ERR("RTMPModTimer failed, Timer hasn't been initialize!\n");
         }
 }
 
@@ -2989,7 +2988,7 @@ void RTMPCancelTimer(struct rt_ralink_timer *pTimer, OUT BOOLEAN * pCancelled)
                 RtmpTimerQRemove(pTimer->pAd, pTimer);
 #endif /* RTMP_TIMER_TASK_SUPPORT // */
         } else {
-                DBGPRINT_ERR(("RTMPCancelTimer failed, Timer hasn't been initialize!\n"));
+                DBGPRINT_ERR("RTMPCancelTimer failed, Timer hasn't been initialize!\n");
         }
 }
 
@@ -3251,8 +3250,7 @@ int rt28xx_init(struct rt_rtmp_adapter *pAd,
         /* Load 8051 firmware */
         Status = NICLoadFirmware(pAd);
         if (Status != NDIS_STATUS_SUCCESS) {
-                DBGPRINT_ERR(("NICLoadFirmware failed, Status[=0x%08x]\n",
-                              Status));
+                DBGPRINT_ERR("NICLoadFirmware failed, Status[=0x%08x]\n", Status);
                 goto err1;
         }
 
@@ -3268,8 +3266,7 @@ int rt28xx_init(struct rt_rtmp_adapter *pAd,
 
         Status = RTMPAllocTxRxRingMemory(pAd);
         if (Status != NDIS_STATUS_SUCCESS) {
-                DBGPRINT_ERR(("RTMPAllocDMAMemory failed, Status[=0x%08x]\n",
-                              Status));
+                DBGPRINT_ERR("RTMPAllocDMAMemory failed, Status[=0x%08x]\n", Status);
                 goto err1;
         }
 
@@ -3284,7 +3281,7 @@ int rt28xx_init(struct rt_rtmp_adapter *pAd,
 
         Status = MlmeInit(pAd);
         if (Status != NDIS_STATUS_SUCCESS) {
-                DBGPRINT_ERR(("MlmeInit failed, Status[=0x%08x]\n", Status));
+                DBGPRINT_ERR("MlmeInit failed, Status[=0x%08x]\n", Status);
                 goto err2;
         }
         /* Initialize pAd->StaCfg, pAd->ApCfg, pAd->CommonCfg to manufacture default */
@@ -3309,8 +3306,7 @@ int rt28xx_init(struct rt_rtmp_adapter *pAd,
         /* */
         Status = NICInitializeAdapter(pAd, TRUE);
         if (Status != NDIS_STATUS_SUCCESS) {
-                DBGPRINT_ERR(("NICInitializeAdapter failed, Status[=0x%08x]\n",
-                              Status));
+                DBGPRINT_ERR("NICInitializeAdapter failed, Status[=0x%08x]\n", Status);
                 if (Status != NDIS_STATUS_SUCCESS)
                         goto err3;
         }
diff --git a/drivers/staging/rt2860/common/rtmp_mcu.c b/drivers/staging/rt2860/common/rtmp_mcu.c
index 844d4b987b78..80fa4160ed62 100644
--- a/drivers/staging/rt2860/common/rtmp_mcu.c
+++ b/drivers/staging/rt2860/common/rtmp_mcu.c
@@ -267,7 +267,7 @@ int RtmpAsicSendCommandToMcu(struct rt_rtmp_adapter *pAd,
                 } while (i++ < 100);
 
                 if (i > 100) {
-                        DBGPRINT_ERR(("H2M_MAILBOX still hold by MCU. command fail\n"));
+                        DBGPRINT_ERR("H2M_MAILBOX still hold by MCU. command fail\n");
                         return FALSE;
                 }
 
@@ -296,7 +296,7 @@ int RtmpAsicSendCommandToMcu(struct rt_rtmp_adapter *pAd,
 #ifdef RTMP_MAC_PCI
 #endif /* RTMP_MAC_PCI // */
                         {
-                                DBGPRINT_ERR(("H2M_MAILBOX still hold by MCU. command fail\n"));
+                                DBGPRINT_ERR("H2M_MAILBOX still hold by MCU. command fail\n");
                         }
                         return FALSE;
                 }
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c
index 2d5f847e6cc6..1dfb802aab9a 100644
--- a/drivers/staging/rt2860/common/spectrum.c
+++ b/drivers/staging/rt2860/common/spectrum.c
@@ -1837,7 +1837,7 @@ static void PeerChSwAnnAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_
                         }
 
                         if (index >= pAd->ChannelListNum) {
-                                DBGPRINT_ERR(("&&&&&&&&&&&&&&&&&&&&&&&&&&PeerChSwAnnAction(can not find New Channel=%d in ChannelList[%d]\n", pAd->CommonCfg.Channel, pAd->ChannelListNum));
+                                DBGPRINT_ERR("&&&&&&&&&&&&&&&&&&&&&&&&&&PeerChSwAnnAction(can not find New Channel=%d in ChannelList[%d]\n", pAd->CommonCfg.Channel, pAd->ChannelListNum);
                         }
                 }
         }
diff --git a/drivers/staging/rt2860/mlme.h b/drivers/staging/rt2860/mlme.h
index 01414c3b4889..cd1ee3d7a91d 100644
--- a/drivers/staging/rt2860/mlme.h
+++ b/drivers/staging/rt2860/mlme.h
@@ -32,8 +32,9 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ------------------------------
-        John Chang      2003-08-28              Created
-        John Chang  2004-09-06      modified for RT2600
+        John Chang              2003-08-28              Created
+        John Chang              2004-09-06              modified for RT2600
+        Justin P. Mattock       11/07/2010              Fix typos in comments
 
 */
 #ifndef __MLME_H__
@@ -41,7 +42,7 @@
 
 #include "rtmp_dot11.h"
 
-/* maximum supported capability information - */
+/* maximum supported capability information */
 /* ESS, IBSS, Privacy, Short Preamble, Spectrum mgmt, Short Slot */
 #define SUPPORTED_CAPABILITY_INFO   0x0533
 
@@ -77,7 +78,7 @@
 #define CW_MAX_IN_BITS              10  /* actual CwMax = 2^CW_MAX_IN_BITS - 1 */
 
 /* Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720). */
-/* SHould not refer to this constant anymore */
+/* Should not refer to this constant anymore */
 /*#define RSSI_TO_DBM_OFFSET          120 // for RT2530 RSSI-115 = dBm */
 #define RSSI_FOR_MID_TX_POWER       -55 /* -55 db is considered mid-distance */
 #define RSSI_FOR_LOW_TX_POWER       -45 /* -45 db is considered very short distance and */
@@ -123,7 +124,7 @@
 #define TID_MAC_HASH_INDEX(Addr, TID)      (TID_MAC_HASH(Addr, TID) % HASH_TABLE_SIZE)
 
 /* LED Control */
-/* assoiation ON. one LED ON. another blinking when TX, OFF when idle */
+/* association ON. one LED ON. another blinking when TX, OFF when idle */
 /* no association, both LED off */
 #define ASIC_LED_ACT_ON(pAd)        RTMP_IO_WRITE32(pAd, MAC_CSR14, 0x00031e46)
 #define ASIC_LED_ACT_OFF(pAd)       RTMP_IO_WRITE32(pAd, MAC_CSR14, 0x00001e46)
@@ -284,8 +285,8 @@ struct PACKED rt_ht_capability_ie {
 
 /* 802.11n draft3 related structure definitions. */
 /* 7.3.2.60 */
-#define dot11OBSSScanPassiveDwell                                                       20      /* in TU. min amount of time that the STA continously scans each channel when performing an active OBSS scan. */
-#define dot11OBSSScanActiveDwell                                                        10      /* in TU.min amount of time that the STA continously scans each channel when performing an passive OBSS scan. */
+#define dot11OBSSScanPassiveDwell                                                       20      /* in TU. min amount of time that the STA continuously scans each channel when performing an active OBSS scan. */
+#define dot11OBSSScanActiveDwell                                                        10      /* in TU.min amount of time that the STA continuously scans each channel when performing an passive OBSS scan. */
 #define dot11BSSWidthTriggerScanInterval                                        300     /* in sec. max interval between scan operations to be performed to detect BSS channel width trigger events. */
 #define dot11OBSSScanPassiveTotalPerChannel                                     200     /* in TU. min total amount of time that the STA scans each channel when performing a passive OBSS scan. */
 #define dot11OBSSScanActiveTotalPerChannel                                      20      /*in TU. min total amount of time that the STA scans each channel when performing a active OBSS scan */
@@ -325,7 +326,7 @@ struct rt_trigger_eventa {
 };
 
 /* 20/40 trigger event table */
-/* If one Event A delete or created, or if Event B is detected or not detected, STA should send 2040BSSCoexistence to AP. */
+/* If one Event (A) is deleted or created, or if Event (B) is detected or not detected, STA should send 2040BSSCoexistence to AP. */
 #define MAX_TRIGGER_EVENT               64
 struct rt_trigger_event_tab {
         u8 EventANo;
@@ -357,14 +358,14 @@ struct PACKED rt_bss_2040_intolerant_ch_report {
         u8 ChList[0];
 };
 
-/* The structure for channel switch annoucement IE. This is in 802.11n D3.03 */
+/* The structure for channel switch announcement IE. This is in 802.11n D3.03 */
 struct PACKED rt_cha_switch_announce_ie {
         u8 SwitchMode;  /*channel switch mode */
         u8 NewChannel;  /* */
         u8 SwitchCount; /* */
 };
 
-/* The structure for channel switch annoucement IE. This is in 802.11n D3.03 */
+/* The structure for channel switch announcement IE. This is in 802.11n D3.03 */
 struct PACKED rt_sec_cha_offset_ie {
         u8 SecondaryChannelOffset;      /* 1: Secondary above, 3: Secondary below, 0: no Secondary */
 };
@@ -377,7 +378,7 @@ struct rt_ht_phy_info {
         u8 MCSSet[16];
 };
 
-/*This structure substracts ralink supports from all 802.11n-related features. */
+/*This structure subtracts ralink supports from all 802.11n-related features. */
 /*Features not listed here but contained in 802.11n spec are not supported in rt2860. */
 struct rt_ht_capability {
         u16 ChannelWidth:1;
@@ -387,14 +388,14 @@ struct rt_ht_capability {
         u16 ShortGIfor40:1;     /*for40MHz */
         u16 TxSTBC:1;
         u16 RxSTBC:2;   /* 2 bits */
-        u16 AmsduEnable:1;      /* Enable to transmit A-MSDU. Suggest disable. We should use A-MPDU to gain best benifit of 802.11n */
+        u16 AmsduEnable:1;      /* Enable to transmit A-MSDU. Suggest disable. We should use A-MPDU to gain best benefit of 802.11n */
         u16 AmsduSize:1;        /* Max receiving A-MSDU size */
         u16 rsv:5;
 
         /*Substract from Addiont HT INFO IE */
         u8 MaxRAmpduFactor:2;
         u8 MpduDensity:3;
-        u8 ExtChanOffset:2;     /* Please not the difference with following     u8   NewExtChannelOffset; from 802.11n */
+        u8 ExtChanOffset:2;     /* Please note the difference with following     u8   NewExtChannelOffset; from 802.11n */
         u8 RecomWidth:1;
 
         u16 OperaionMode:2;
@@ -481,7 +482,7 @@ struct PACKED rt_ba_parm {
         u16 AMSDUSupported:1;   /* 0: not permitted             1: permitted */
         u16 BAPolicy:1; /* 1: immediately BA    0:delayed BA */
         u16 TID:4;              /* value of TC os TS */
-        u16 BufSize:10; /* number of buffe of size 2304 octetsr */
+        u16 BufSize:10; /* number of buffer of size 2304 octetsr */
 };
 
 /* 2-byte BA Starting Seq CONTROL field */
@@ -551,7 +552,7 @@ struct PACKED rt_frame_mtba_req {
         BASEQ_CONTROL BAStartingSeq;
 };
 
-/* Compressed format is mandantory in HT STA */
+/* Compressed format is mandatory in HT STA */
 struct PACKED rt_frame_mtba {
         struct rt_frame_control FC;
         u16 Duration;
@@ -647,7 +648,7 @@ struct PACKED rt_frame_ba {
         u8 bitmask[8];
 };
 
-/* Radio Measuement Request Frame Format */
+/* Radio Measurement Request Frame Format */
 struct PACKED rt_frame_rm_req_action {
         struct rt_header_802_11 Hdr;
         u8 Category;
@@ -709,7 +710,7 @@ struct rt_edca_parm {
         u8 Cwmin[4];
         u8 Cwmax[4];
         u16 Txop[4];            /* in unit of 32-us */
-        BOOLEAN bACM[4];        /* 1: Admission Control of AC_BK is mandattory */
+        BOOLEAN bACM[4];        /* 1: Admission Control of AC_BK is mandatory */
 };
 
 /* QBSS LOAD information from QAP's BEACON/ProbeRsp */
@@ -757,7 +758,7 @@ struct rt_wpa_ie {
 struct rt_bss_entry {
         u8 Bssid[MAC_ADDR_LEN];
         u8 Channel;
-        u8 CentralChannel;      /*Store the wide-band central channel for 40MHz.  .used in 40MHz AP. Or this is the same as Channel. */
+        u8 CentralChannel;      /*Store the wide-band central channel for 40MHz. used in 40MHz AP. Or this is the same as Channel. */
         u8 BssType;
         u16 AtimWin;
         u16 BeaconPeriod;
@@ -855,7 +856,7 @@ struct rt_state_machine {
         STATE_MACHINE_FUNC *TransFunc;
 };
 
-/* MLME AUX data structure that hold temporarliy settings during a connection attempt. */
+/* MLME AUX data structure that holds temporarliy settings during a connection attempt. */
 /* Once this attemp succeeds, all settings will be copy to pAd->StaActive. */
 /* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */
 /* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */
@@ -996,7 +997,7 @@ struct PACKED rt_rtmp_tx_rate_switch {
 #define MAC_TABLE_ASSOC_TIMEOUT                 5       /* unit: sec */
 #define MAC_TABLE_FULL(Tab)                             ((Tab).size == MAX_LEN_OF_MAC_TABLE)
 
-/* AP shall drop the sta if contine Tx fail count reach it. */
+/* AP shall drop the sta if continue Tx fail count reach it. */
 #define MAC_ENTRY_LIFE_CHECK_CNT                20      /* packet cnt. */
 
 /* Value domain of pMacEntry->Sst */
diff --git a/drivers/staging/rt2860/oid.h b/drivers/staging/rt2860/oid.h
index 1704c27b2736..5a25f0d3cfeb 100644
--- a/drivers/staging/rt2860/oid.h
+++ b/drivers/staging/rt2860/oid.h
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        Name            Date                    Modification logs
+        Name                    Date                    Modification logs
+        Justin P. Mattock       11/07/2010      Fix typos in comments
 */
 #ifndef _OID_H_
 #define _OID_H_
@@ -78,7 +79,7 @@
 #define NDIS_802_11_LENGTH_RATES        8
 #define NDIS_802_11_LENGTH_RATES_EX     16
 #define MAC_ADDR_LENGTH                 6
-/*#define MAX_NUM_OF_CHS                                        49 // 14 channels @2.4G +  12@UNII + 4 @MMAC + 11 @HiperLAN2 + 7 @Japan + 1 as NULL terminationc */
+/*#define MAX_NUM_OF_CHS                                        49 // 14 channels @2.4G +  12@UNII + 4 @MMAC + 11 @HiperLAN2 + 7 @Japan + 1 as NULL termination */
 #define MAX_NUM_OF_CHS                          54      /* 14 channels @2.4G +  12@UNII(lower/middle) + 16@HiperLAN2 + 11@UNII(upper) + 0 @Japan + 1 as NULL termination */
 #define MAX_NUMBER_OF_EVENT                             10      /* entry # in EVENT table */
 #define MAX_NUMBER_OF_MAC                               32      /* if MAX_MBSSID_NUM is 8, this value can't be larger than 211 */
@@ -87,7 +88,7 @@
 #define MAX_NUMBER_OF_DLS_ENTRY                 4
 
 #define RT_QUERY_SIGNAL_CONTEXT                         0x0402
-#define RT_SET_IAPP_PID                         0x0404
+#define RT_SET_IAPP_PID                         0x0404
 #define RT_SET_APD_PID                                          0x0405
 #define RT_SET_DEL_MAC_ENTRY                            0x0406
 #define RT_QUERY_EVENT_TABLE                    0x0407
@@ -610,7 +611,7 @@ struct rt_802_11_event_log {
 
 struct rt_802_11_event_table {
         unsigned long Num;
-        unsigned long Rsv;              /* to align Log[] at LARGE_INEGER boundary */
+        unsigned long Rsv;              /* to align Log[] at LARGE_INTEGER boundary */
         struct rt_802_11_event_log Log[MAX_NUMBER_OF_EVENT];
 };
 
@@ -721,9 +722,9 @@ struct rt_802_11_tx_rates {
 #define AUTH_FAIL                               0x4     /* Open authentication fail */
 #define AUTH_FAIL_KEYS                  0x5     /* Shared authentication fail */
 #define ASSOC_FAIL                              0x6     /* Association failed */
-#define EAP_MIC_FAILURE                 0x7     /* Deauthencation because MIC failure */
-#define EAP_4WAY_TIMEOUT                0x8     /* Deauthencation on 4-way handshake timeout */
-#define EAP_GROUP_KEY_TIMEOUT   0x9     /* Deauthencation on group key handshake timeout */
+#define EAP_MIC_FAILURE                 0x7     /* Deauthentication because MIC failure */
+#define EAP_4WAY_TIMEOUT                0x8     /* Deauthentication on 4-way handshake timeout */
+#define EAP_GROUP_KEY_TIMEOUT   0x9     /* Deauthentication on group key handshake timeout */
 #define EAP_SUCCESS                             0xa     /* EAP succeed */
 #define DETECT_RADAR_SIGNAL             0xb     /* Radar signal occur in current channel */
 #define EXTRA_INFO_MAX                  0xb     /* Indicate Last OID */
diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c
index 321facd6b0ab..25fbb1880ff2 100644
--- a/drivers/staging/rt2860/pci_main_dev.c
+++ b/drivers/staging/rt2860/pci_main_dev.c
@@ -31,7 +31,8 @@
     Create and register network interface for PCI based chipsets in Linux platform.
 
     Revision History:
-    Who         When            What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix typos in some comments
     --------    ----------      ----------------------------------------------
 */
 
@@ -40,8 +41,8 @@
 #include <linux/slab.h>
 
 /* Following information will be show when you run 'modinfo' */
-/* *** If you have a solution for the bug in current version of driver, please mail to me. */
-/* Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** */
+/* If you have a solution for a bug in current version of driver, please e-mail me. */
+/* Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. */
 MODULE_AUTHOR("Jett Chen <jett_chen@ralinktech.com>");
 MODULE_DESCRIPTION("RT2860/RT3090 Wireless Lan Linux Driver");
 MODULE_LICENSE("GPL");
@@ -50,9 +51,6 @@ MODULE_ALIAS("rt3090sta");
 /* */
 /* Function declarations */
 /* */
-extern int rt28xx_close(IN struct net_device *net_dev);
-extern int rt28xx_open(struct net_device *net_dev);
-
 static void __devexit rt2860_remove_one(struct pci_dev *pci_dev);
 static int __devinit rt2860_probe(struct pci_dev *pci_dev,
                                   const struct pci_device_id *ent);
@@ -205,7 +203,7 @@ static int rt2860_resume(struct pci_dev *pci_dev)
 
         /* initialize device before it's used by a driver */
         if (pci_enable_device(pci_dev)) {
-                printk("pci enable fail!\n");
+                printk(KERN_ERR "rt2860: pci enable fail!\n");
                 return 0;
         }
 
@@ -599,7 +597,7 @@ void RTMPInitPCIeLinkCtrlValue(struct rt_rtmp_adapter *pAd)
                 DBGPRINT_RAW(RT_DEBUG_ERROR,
                              (" AUX_CTRL = 0x%32x\n", MacValue));
 
-                /* for RT30xx F and after, PCIe infterface, and for power solution 3 */
+                /* for RT30xx F and after, PCIe interface, and for power solution 3 */
                 if ((IS_VERSION_AFTER_F(pAd))
                     && (pAd->StaCfg.PSControl.field.rt30xxPowerMode >= 2)
                     && (pAd->StaCfg.PSControl.field.rt30xxPowerMode <= 3)) {
@@ -902,7 +900,7 @@ void RTMPPCIeLinkCtrlValueRestore(struct rt_rtmp_adapter *pAd, u8 Level)
                                   Configuration);
                 if ((Configuration != 0) && (Configuration != 0xFFFF)) {
                         Configuration &= 0xfefc;
-                        /* If call from interface down, restore to orginial setting. */
+                        /* If call from interface down, restore to original setting. */
                         if (Level == RESTORE_CLOSE)
                                 Configuration |= pAd->HostLnkCtrlConfiguration;
                         else
@@ -924,7 +922,7 @@ void RTMPPCIeLinkCtrlValueRestore(struct rt_rtmp_adapter *pAd, u8 Level)
                                   Configuration);
                 if ((Configuration != 0) && (Configuration != 0xFFFF)) {
                         Configuration &= 0xfefc;
-                        /* If call from interface down, restore to orginial setting. */
+                        /* If call from interface down, restore to original setting. */
                         if (Level == RESTORE_CLOSE)
                                 Configuration |= pAd->RLnkCtrlConfiguration;
                         else
@@ -1106,12 +1104,12 @@ void RTMPrt3xSetPCIePowerLinkCtrl(struct rt_rtmp_adapter *pAd)
                 if (pos != 0)
                         pAd->HostLnkCtrlOffset = pos + PCI_EXP_LNKCTL;
 
-                /* If configurared to turn on L1. */
+                /* If configured to turn on L1. */
                 HostConfiguration = 0;
                 if (pAd->StaCfg.PSControl.field.rt30xxForceASPMTest == 1) {
                         DBGPRINT(RT_DEBUG_TRACE, ("Enter,PSM : Force ASPM\n"));
 
-                        /* Skip non-exist deice right away */
+                        /* Skip non-exist device right away */
                         if ((pAd->HostLnkCtrlOffset != 0)) {
                                 PCI_REG_READ_WORD(pObj->parent_pci_dev,
                                                   pAd->HostLnkCtrlOffset,
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index abfeea11721d..728864e18a18 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -321,7 +321,7 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
 
         RTMP_SET_PACKET_SOURCE(OSPKT_TO_RTPKT(pkt), PKTSRC_NDIS);
 
-        printk("###Clone###\n");
+        printk(KERN_DEBUG "###Clone###\n");
 
         return NDIS_STATUS_SUCCESS;
 }
@@ -343,9 +343,8 @@ int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd,
                                            RTMP_PKT_TAIL_PADDING);
         if (pPacket == NULL) {
                 *ppPacket = NULL;
-#ifdef DEBUG
-                printk("RTMPAllocateNdisPacket Fail\n");
-#endif
+                pr_devel("RTMPAllocateNdisPacket Fail\n");
+
                 return NDIS_STATUS_FAILURE;
         }
         /* 2. clone the frame content */
@@ -601,15 +600,15 @@ void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen)
                 return;
 
         pt = pSrcBufVA;
-        printk("%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
+        printk(KERN_DEBUG "%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
         for (x = 0; x < SrcBufLen; x++) {
                 if (x % 16 == 0)
-                        printk("0x%04x : ", x);
-                printk("%02x ", ((unsigned char)pt[x]));
+                        printk(KERN_DEBUG "0x%04x : ", x);
+                printk(KERN_DEBUG "%02x ", ((unsigned char)pt[x]));
                 if (x % 16 == 15)
-                        printk("\n");
+                        printk(KERN_DEBUG "\n");
         }
-        printk("\n");
+        printk(KERN_DEBUG "\n");
 }
 
 /*
@@ -767,13 +766,13 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
                 /* QOS */
                 if (pRxBlk->pHeader->FC.SubType & 0x08) {
                         header_len += 2;
-                        /* Data skip QOS contorl field */
+                        /* Data skip QOS control field */
                         pRxBlk->DataSize -= 2;
                 }
                 /* Order bit: A-Ralink or HTC+ */
                 if (pRxBlk->pHeader->FC.Order) {
                         header_len += 4;
-                        /* Data skip HTC contorl field */
+                        /* Data skip HTC control field */
                         pRxBlk->DataSize -= 4;
                 }
                 /* Copy Header */
@@ -854,7 +853,7 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
                                                                          RSSI1,
                                                                          RSSI_1),
                                     ConvertToRssi(pAd, pRxBlk->pRxWI->RSSI2,
-                                                  RSSI_2));;
+                                                  RSSI_2));
 
         ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
         ph->signal.status = 0;
@@ -926,7 +925,7 @@ int RtmpOSIRQRequest(struct net_device *pNetDev)
                     request_irq(_pObj->pci_dev->irq, rt2860_interrupt, SA_SHIRQ,
                                 (net_dev)->name, (net_dev));
                 if (retval != 0)
-                        printk("RT2860: request_irq  ERROR(%d)\n", retval);
+                        printk(KERN_ERR "rt2860: request_irq  ERROR(%d)\n", retval);
         }
 
         return retval;
@@ -1022,7 +1021,7 @@ int RtmpOSTaskKill(struct rt_rtmp_os_task *pTask)
         }
 #else
         CHECK_PID_LEGALITY(pTask->taskPID) {
-                printk("Terminate the task(%s) with pid(%d)!\n",
+                printk(KERN_INFO "Terminate the task(%s) with pid(%d)!\n",
                        pTask->taskName, GET_PID_NUMBER(pTask->taskPID));
                 mb();
                 pTask->task_killed = 1;
@@ -1175,7 +1174,7 @@ int RtmpOSNetDevAddrSet(struct net_device *pNetDev, u8 *pMacAddr)
         net_dev = pNetDev;
         GET_PAD_FROM_NET_DEV(pAd, net_dev);
 
-        /* work-around for the SuSE due to it has it's own interface name management system. */
+        /* work-around for SuSE, due to them having their own interface name management system. */
         {
                 NdisZeroMemory(pAd->StaCfg.dev_name, 16);
                 NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name,
@@ -1300,7 +1299,7 @@ int RtmpOSNetDevAttach(struct net_device *pNetDev,
         int ret, rtnl_locked = FALSE;
 
         DBGPRINT(RT_DEBUG_TRACE, ("RtmpOSNetDevAttach()--->\n"));
-        /* If we need hook some callback function to the net device structrue, now do it. */
+        /* If we need hook some callback function to the net device structure, now do it. */
         if (pDevOpHook) {
                 struct rt_rtmp_adapter *pAd = NULL;
 
@@ -1351,10 +1350,10 @@ struct net_device *RtmpOSNetDevCreate(struct rt_rtmp_adapter *pAd,
                 return NULL;
         }
 
-        /* find a available interface name, max 32 interfaces */
+        /* find an available interface name, max 32 interfaces */
         status = RtmpOSNetDevRequestName(pAd, pNetDev, pNamePrefix, devNum);
         if (status != NDIS_STATUS_SUCCESS) {
-                /* error! no any available ra name can be used! */
+                /* error! no available ra name can be used! */
                 DBGPRINT(RT_DEBUG_ERROR,
                          ("Assign interface name (%s with suffix 0~32) failed...\n",
                           pNamePrefix));
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index 5acedf18b1ab..92ff5438e777 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -30,7 +30,8 @@
     Abstract:
 
     Revision History:
-    Who          When          What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix typo in a comment
     ---------    ----------    ----------------------------------------------
 */
 
@@ -422,11 +423,7 @@ do{                                   \
 
 #define DBGPRINT(Level, Fmt)    DBGPRINT_RAW(Level, Fmt)
 
-#define DBGPRINT_ERR(Fmt)           \
-{                                   \
-    printk("ERROR! ");          \
-    printk Fmt;                  \
-}
+#define DBGPRINT_ERR(fmt, args...) printk(KERN_ERR fmt, ##args)
 
 #define DBGPRINT_S(Status, Fmt)         \
 {                                                                       \
@@ -726,7 +723,7 @@ void linux_pci_unmap_single(struct rt_rtmp_adapter *pAd, dma_addr_t dma_addr,
 #define RTMP_GET_PACKET_MOREDATA(_p)                            (RTPKT_TO_OSPKT(_p)->cb[CB_OFF+7])
 
 /* */
-/*      Sepcific Pakcet Type definition */
+/*      Specific Packet Type definition */
 /* */
 #define RTMP_PACKET_SPECIFIC_CB_OFFSET  11
 
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index ad60ceaf4b88..701561d6b6fd 100644
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -31,7 +31,8 @@
     Create and register network interface.
 
     Revision History:
-    Who         When            What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix typos in comments
     --------    ----------      ----------------------------------------------
 */
 
@@ -101,8 +102,8 @@ int MainVirtualIF_close(IN struct net_device *net_dev)
                     (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
                         struct rt_mlme_disassoc_req DisReq;
                         struct rt_mlme_queue_elem *MsgElem =
-                            (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                        MEM_ALLOC_FLAG);
+                                kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                        MEM_ALLOC_FLAG);
 
                         if (MsgElem) {
                                 COPY_MAC_ADDR(DisReq.Addr,
@@ -234,7 +235,7 @@ int rt28xx_close(struct net_device *dev)
                 RTMPPCIeLinkCtrlValueRestore(pAd, RESTORE_CLOSE);
 #endif /* RTMP_MAC_PCI // */
 
-                /* If dirver doesn't wake up firmware here, */
+                /* If driver doesn't wake up firmware here, */
                 /* NICLoadFirmware will hang forever when interface is up again. */
                 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) {
                         AsicForceWakeup(pAd, TRUE);
@@ -310,8 +311,8 @@ int rt28xx_close(struct net_device *dev)
                         RTMP_ASIC_INTERRUPT_DISABLE(pAd);
                 }
                 /* Receive packets to clear DMA index after disable interrupt. */
-                /*RTMPHandleRxDoneInterrupt(pAd); */
-                /* put to radio off to save power when driver unload.  After radiooff, can't write /read register.  So need to finish all */
+                /* RTMPHandleRxDoneInterrupt(pAd); */
+                /* put radio off to save power when driver unloads.  After radiooff, can't write/read register, so need to finish all. */
                 /* register access before Radio off. */
 
                 brc = RT28xxPciAsicRadioOff(pAd, RTMP_HALT, 0);
@@ -420,7 +421,7 @@ int rt28xx_open(struct net_device *dev)
         {
                 u32 reg = 0;
                 RTMP_IO_READ32(pAd, 0x1300, &reg);      /* clear garbage interrupts */
-                printk("0x1300 = %08x\n", reg);
+                printk(KERN_DEBUG "0x1300 = %08x\n", reg);
         }
 
         {
@@ -724,7 +725,8 @@ Note:
 int AdapterBlockAllocateMemory(void *handle, void ** ppAd)
 {
 
-        *ppAd = (void *)vmalloc(sizeof(struct rt_rtmp_adapter));        /*pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
+        *ppAd = vmalloc(sizeof(struct rt_rtmp_adapter));
+        /* pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
 
         if (*ppAd) {
                 NdisZeroMemory(*ppAd, sizeof(struct rt_rtmp_adapter));
diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c
index 3004be6da003..e5fb67cd9a68 100644
--- a/drivers/staging/rt2860/rt_pci_rbus.c
+++ b/drivers/staging/rt2860/rt_pci_rbus.c
@@ -31,7 +31,8 @@
     Create and register network interface.
 
     Revision History:
-    Who         When            What
+    Who                 When            What
+    Justin P. Mattock   11/07/2010      Fix a typo
     --------    ----------      ----------------------------------------------
 */
 
@@ -356,7 +357,7 @@ static void mgmt_dma_done_tasklet(unsigned long data)
 
         RTMPHandleMgmtRingDmaDoneInterrupt(pAd);
 
-        /* if you use RTMP_SEM_LOCK, sometimes kernel will hang up, no any */
+        /* if you use RTMP_SEM_LOCK, sometimes kernel will hang up, without any */
         /* bug report output */
         RTMP_INT_LOCK(&pAd->irq_lock, flags);
         /*
@@ -787,7 +788,7 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance)
 }
 
 /*
- * invaild or writeback cache
+ * invalid or writeback cache
  * and convert virtual address to physical address
  */
 dma_addr_t linux_pci_map_single(struct rt_rtmp_adapter *pAd, void *ptr,
diff --git a/drivers/staging/rt2860/rt_usb.c b/drivers/staging/rt2860/rt_usb.c
index bcfc0f54d2aa..eb037d2e04a2 100644
--- a/drivers/staging/rt2860/rt_usb.c
+++ b/drivers/staging/rt2860/rt_usb.c
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When            What
         --------        ----------      ----------------------------------------------
-        Name            Date            Modification logs
+        Name                    Date            Modification logs
+        Justin P. Mattock       11/07/2010      Fix some typos.
 
 */
 
@@ -40,25 +41,25 @@
 
 void dump_urb(struct urb *purb)
 {
-        printk("urb                  :0x%08lx\n", (unsigned long)purb);
-        printk("\tdev                   :0x%08lx\n", (unsigned long)purb->dev);
-        printk("\t\tdev->state          :0x%d\n", purb->dev->state);
-        printk("\tpipe                  :0x%08x\n", purb->pipe);
-        printk("\tstatus                :%d\n", purb->status);
-        printk("\ttransfer_flags        :0x%08x\n", purb->transfer_flags);
-        printk("\ttransfer_buffer       :0x%08lx\n",
+        printk(KERN_DEBUG "urb                  :0x%08lx\n", (unsigned long)purb);
+        printk(KERN_DEBUG "\tdev                   :0x%08lx\n", (unsigned long)purb->dev);
+        printk(KERN_DEBUG "\t\tdev->state          :0x%d\n", purb->dev->state);
+        printk(KERN_DEBUG "\tpipe                  :0x%08x\n", purb->pipe);
+        printk(KERN_DEBUG "\tstatus                :%d\n", purb->status);
+        printk(KERN_DEBUG "\ttransfer_flags        :0x%08x\n", purb->transfer_flags);
+        printk(KERN_DEBUG "\ttransfer_buffer       :0x%08lx\n",
                (unsigned long)purb->transfer_buffer);
-        printk("\ttransfer_buffer_length:%d\n", purb->transfer_buffer_length);
-        printk("\tactual_length         :%d\n", purb->actual_length);
-        printk("\tsetup_packet          :0x%08lx\n",
+        printk(KERN_DEBUG "\ttransfer_buffer_length:%d\n", purb->transfer_buffer_length);
+        printk(KERN_DEBUG "\tactual_length         :%d\n", purb->actual_length);
+        printk(KERN_DEBUG "\tsetup_packet          :0x%08lx\n",
                (unsigned long)purb->setup_packet);
-        printk("\tstart_frame           :%d\n", purb->start_frame);
-        printk("\tnumber_of_packets     :%d\n", purb->number_of_packets);
-        printk("\tinterval              :%d\n", purb->interval);
-        printk("\terror_count           :%d\n", purb->error_count);
-        printk("\tcontext               :0x%08lx\n",
+        printk(KERN_DEBUG "\tstart_frame           :%d\n", purb->start_frame);
+        printk(KERN_DEBUG "\tnumber_of_packets     :%d\n", purb->number_of_packets);
+        printk(KERN_DEBUG "\tinterval              :%d\n", purb->interval);
+        printk(KERN_DEBUG "\terror_count           :%d\n", purb->error_count);
+        printk(KERN_DEBUG "\tcontext               :0x%08lx\n",
                (unsigned long)purb->context);
-        printk("\tcomplete              :0x%08lx\n\n",
+        printk(KERN_DEBUG "\tcomplete              :0x%08lx\n\n",
                (unsigned long)purb->complete);
 }
 
@@ -279,7 +280,7 @@ static void rtusb_dataout_complete(unsigned long data)
             && !RTUSB_TEST_BULK_FLAG(pAd,
                                      (fRTUSB_BULK_OUT_DATA_FRAG <<
                                       BulkOutPipeId))) {
-                /* Indicate There is data avaliable */
+                /* Indicate There is data available */
                 RTUSB_SET_BULK_FLAG(pAd,
                                     (fRTUSB_BULK_OUT_DATA_NORMAL <<
                                      BulkOutPipeId));
@@ -335,7 +336,7 @@ static void rtusb_null_frame_done_tasklet(unsigned long data)
         }
 
         /* Always call Bulk routine, even reset bulk. */
-        /* The protectioon of rest bulk should be in BulkOut routine */
+        /* The protection of rest bulk should be in BulkOut routine */
         RTUSBKickBulkOut(pAd);
 }
 
@@ -383,7 +384,7 @@ static void rtusb_rts_frame_done_tasklet(unsigned long data)
         RTMP_SEM_UNLOCK(&pAd->BulkOutLock[pRTSContext->BulkOutPipeId]);
 
         /* Always call Bulk routine, even reset bulk. */
-        /* The protectioon of rest bulk should be in BulkOut routine */
+        /* The protection of rest bulk should be in BulkOut routine */
         RTUSBKickBulkOut(pAd);
 
 }
@@ -427,7 +428,7 @@ static void rtusb_pspoll_frame_done_tasklet(unsigned long data)
         RTMP_SEM_UNLOCK(&pAd->BulkOutLock[0]);
 
         /* Always call Bulk routine, even reset bulk. */
-        /* The protectioon of rest bulk should be in BulkOut routine */
+        /* The protection of rest bulk should be in BulkOut routine */
         RTUSBKickBulkOut(pAd);
 
 }
@@ -575,7 +576,7 @@ static void rtusb_mgmt_dma_done_tasklet(unsigned long data)
                 } else {
 
                         /* Always call Bulk routine, even reset bulk. */
-                        /* The protectioon of rest bulk should be in BulkOut routine */
+                        /* The protection of rest bulk should be in BulkOut routine */
                         if (pAd->MgmtRing.TxSwFreeIdx <
                             MGMT_RING_SIZE
                             /* pMLMEContext->bWaitingBulkOut == TRUE */) {
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index ca54e53b6603..70daaa4f9ac2 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -31,11 +31,12 @@
     Miniport generic portion header file
 
     Revision History:
-    Who         When          What
+    Who                 When            What
     --------    ----------    ----------------------------------------------
-    Paul Lin    2002-08-01    created
-    James Tan   2002-09-06    modified (Revise NTCRegTable)
-    John Chang  2004-09-06    modified for RT2600
+    Paul Lin            2002-08-01      created
+    James Tan           2002-09-06      modified (Revise NTCRegTable)
+    John Chang          2004-09-06      modified for RT2600
+    Justin P. Mattock   11/07/2010      Fix some typos
 */
 #ifndef __RTMP_H__
 #define __RTMP_H__
@@ -337,7 +338,7 @@ struct rt_rtmp_sg_list {
 #define LEAP_ON(_p)                 (((_p)->StaCfg.LeapAuthMode) == CISCO_AuthModeLEAP)
 #define LEAP_CCKM_ON(_p)            ((((_p)->StaCfg.LeapAuthMode) == CISCO_AuthModeLEAP) && ((_p)->StaCfg.LeapAuthInfo.CCKM == TRUE))
 
-/* if orginal Ethernet frame contains no LLC/SNAP, then an extra LLC/SNAP encap is required */
+/* if original Ethernet frame contains no LLC/SNAP, then an extra LLC/SNAP encap is required */
 #define EXTRA_LLCSNAP_ENCAP_FROM_PKT_START(_pBufVA, _pExtraLlcSnapEncap)                \
 {                                                                                                                               \
         if (((*(_pBufVA + 12) << 8) + *(_pBufVA + 13)) > 1500) {        \
@@ -466,7 +467,7 @@ struct rt_rtmp_dmabuf {
 /* Control block (Descriptor) for all ring descriptor DMA operation, buffer must be */
 /* contiguous physical memory. char stored the binding Rx packet descriptor */
 /* which won't be released, driver has to wait until upper layer return the packet */
-/* before giveing up this rx ring descriptor to ASIC. NDIS_BUFFER is assocaited pair */
+/* before giving up this rx ring descriptor to ASIC. NDIS_BUFFER is associated pair */
 /* to describe the packet buffer. For Tx, char stored the tx packet descriptor */
 /* which driver should ACK upper layer when the tx is physically done or failed. */
 /* */
@@ -602,7 +603,7 @@ struct rt_counter_ralink {
 };
 
 struct rt_counter_drs {
-        /* to record the each TX rate's quality. 0 is best, the bigger the worse. */
+        /* record each TX rate's quality. 0 is best, the bigger the worse. */
         u16 TxQuality[MAX_STEP_OF_TX_RATE_SWITCH];
         u8 PER[MAX_STEP_OF_TX_RATE_SWITCH];
         u8 TxRateUpPenalty;     /* extra # of second penalty due to last unstable condition */
@@ -719,7 +720,7 @@ struct rt_fragment_frame {
 /* Packet information for NdisQueryPacket */
 /* */
 struct rt_packet_info {
-        u32 PhysicalBufferCount;        /* Physical breaks of buffer descripor chained */
+        u32 PhysicalBufferCount;        /* Physical breaks of buffer descriptor chained */
         u32 BufferCount;        /* Number of Buffer descriptor chained */
         u32 TotalPacketLength;  /* Self explained */
         char *pFirstBuffer;     /* Pointer to first buffer descriptor */
@@ -846,8 +847,8 @@ typedef enum _ABGBAND_STATE_ {
 /* Power save method control */
 typedef union _PS_CONTROL {
         struct {
-                unsigned long EnablePSinIdle:1; /* Enable radio off when not connect to AP. radio on only when sitesurvey, */
-                unsigned long EnableNewPS:1;    /* Enable new  Chip power save fucntion . New method can only be applied in chip version after 2872. and PCIe. */
+                unsigned long EnablePSinIdle:1; /* Enable radio off when not connected to AP. radio on only when sitesurvey, */
+                unsigned long EnableNewPS:1;    /* Enable new  Chip power save function . New method can only be applied in chip version after 2872. and PCIe. */
                 unsigned long rt30xxPowerMode:2;        /* Power Level Mode for rt30xx chip */
                 unsigned long rt30xxFollowHostASPM:1;   /* Card Follows Host's setting for rt30xx chip. */
                 unsigned long rt30xxForceASPMTest:1;    /* Force enable L1 for rt30xx chip. This has higher priority than rt30xxFollowHostASPM Mode. */
@@ -1117,8 +1118,8 @@ struct rt_beacon_sync {
         unsigned long TimIELocationInBeacon[HW_BEACON_MAX_COUNT];
         unsigned long CapabilityInfoLocationInBeacon[HW_BEACON_MAX_COUNT];
         BOOLEAN EnableBeacon;   /* trigger to enable beacon transmission. */
-        u8 BeaconBitMap;        /* NOTE: If the MAX_MBSSID_NUM is larger than 8, this parameter need to change. */
-        u8 DtimBitOn;   /* NOTE: If the MAX_MBSSID_NUM is larger than 8, this parameter need to change. */
+        u8 BeaconBitMap;        /* NOTE: If the MAX_MBSSID_NUM is larger than 8, this parameter needs to change. */
+        u8 DtimBitOn;   /* NOTE: If the MAX_MBSSID_NUM is larger than 8, this parameter needs to change. */
 };
 #endif /* RTMP_MAC_USB // */
 
@@ -1211,7 +1212,7 @@ struct rt_common_config {
         /*BOOLEAN               bAutoTxRateSwitch; */
         u8 MinTxRate;   /* RATE_1, RATE_2, RATE_5_5, RATE_11 */
         u8 RtsRate;             /* RATE_xxx */
-        HTTRANSMIT_SETTING MlmeTransmit;        /* MGMT frame PHY rate setting when operatin at Ht rate. */
+        HTTRANSMIT_SETTING MlmeTransmit;        /* MGMT frame PHY rate setting when operation at Ht rate. */
         u8 MlmeRate;            /* RATE_xxx, used to send MLME frames */
         u8 BasicMlmeRate;       /* Default Rate for sending MLME frames */
 
@@ -1264,7 +1265,7 @@ struct rt_common_config {
         struct rt_ht_capability_ie HtCapability;
         struct rt_add_ht_info_ie AddHTInfo;     /* Useful as AP. */
         /*This IE is used with channel switch announcement element when changing to a new 40MHz. */
-        /*This IE is included in channel switch ammouncement frames 7.4.1.5, beacons, probe Rsp. */
+        /*This IE is included in channel switch announcement frames 7.4.1.5, beacons, probe Rsp. */
         struct rt_new_ext_chan_ie NewExtChanOffset;     /*7.3.2.20A, 1 if extension channel is above the control channel, 3 if below, 0 if not present */
 
         BOOLEAN bHTProtect;
@@ -1329,7 +1330,7 @@ struct rt_sta_admin_config {
         /* GROUP 1 - */
         /*   User configuration loaded from Registry, E2PROM or OID_xxx. These settings describe */
         /*   the user intended configuration, but not necessary fully equal to the final */
-        /*   settings in ACTIVE BSS after negotiation/compromize with the BSS holder (either */
+        /*   settings in ACTIVE BSS after negotiation/compromise with the BSS holder (either */
         /*   AP or IBSS holder). */
         /*   Once initialized, user configuration can only be changed via OID_xxx */
         u8 BssType;             /* BSS_INFRA or BSS_ADHOC */
@@ -1386,12 +1387,12 @@ struct rt_sta_admin_config {
 
         /* For WPA countermeasures */
         unsigned long LastMicErrorTime; /* record last MIC error time */
-        unsigned long MicErrCnt;        /* Should be 0, 1, 2, then reset to zero (after disassoiciation). */
+        unsigned long MicErrCnt;        /* Should be 0, 1, 2, then reset to zero (after disassociation). */
         BOOLEAN bBlockAssoc;    /* Block associate attempt for 60 seconds after counter measure occurred. */
         /* For WPA-PSK supplicant state */
         WPA_STATE WpaState;     /* Default is SS_NOTUSE and handled by microsoft 802.1x */
         u8 ReplayCounter[8];
-        u8 ANonce[32];  /* ANonce for WPA-PSK from aurhenticator */
+        u8 ANonce[32];  /* ANonce for WPA-PSK from auhenticator */
         u8 SNonce[32];  /* SNonce for WPA-PSK */
 
         u8 LastSNR0;            /* last received BEACON's SNR */
@@ -1423,7 +1424,7 @@ struct rt_sta_admin_config {
         u8 RSNIE_Len;
         u8 RSN_IE[MAX_LEN_OF_RSNIE];    /* The content saved here should be little-endian format. */
 
-        unsigned long CLBusyBytes;      /* Save the total bytes received durning channel load scan time */
+        unsigned long CLBusyBytes;      /* Save the total bytes received during channel load scan time */
         u16 RPIDensity[8];      /* Array for RPI density collection */
 
         u8 RMReqCnt;            /* Number of measurement request saved. */
@@ -1489,9 +1490,9 @@ struct rt_sta_admin_config {
         BOOLEAN bForceTxBurst;  /* 1: force enble TX PACKET BURST, 0: disable */
 };
 
-/* This data structure keep the current active BSS/IBSS's configuration that this STA */
+/* This data structure keeps the current active BSS/IBSS's configuration that this STA */
 /* had agreed upon joining the network. Which means these parameters are usually decided */
-/* by the BSS/IBSS creator instead of user configuration. Data in this data structurre */
+/* by the BSS/IBSS creator instead of user configuration. Data in this data structure */
 /* is valid only when either ADHOC_ON(pAd) or INFRA_ON(pAd) is TRUE. */
 /* Normally, after SCAN or failed roaming attempts, we need to recover back to */
 /* the current active settings. */
@@ -1519,7 +1520,7 @@ struct rt_mac_table_entry {
         /*Choose 1 from ValidAsWDS and ValidAsCLI  to validize. */
         BOOLEAN ValidAsCLI;     /* Sta mode, set this TRUE after Linkup,too. */
         BOOLEAN ValidAsWDS;     /* This is WDS Entry. only for AP mode. */
-        BOOLEAN ValidAsApCli;   /*This is a AP-Client entry, only for AP mode which enable AP-Client functions. */
+        BOOLEAN ValidAsApCli;   /* This is a AP-Client entry, only for AP mode which enable AP-Client functions. */
         BOOLEAN ValidAsMesh;
         BOOLEAN ValidAsDls;     /* This is DLS Entry. only for STA mode. */
         BOOLEAN isCached;
@@ -1527,7 +1528,7 @@ struct rt_mac_table_entry {
 
         u8 EnqueueEapolStartTimerRunning;       /* Enqueue EAPoL-Start for triggering EAP SM */
         /*jan for wpa */
-        /* record which entry revoke MIC Failure , if it leaves the BSS itself, AP won't update aMICFailTime MIB */
+        /* record which entry revoke MIC Failure, if it leaves the BSS itself, AP won't update aMICFailTime MIB */
         u8 CMTimerRunning;
         u8 apidx;               /* MBSS number */
         u8 RSNIE_Len;
@@ -1722,7 +1723,7 @@ struct rt_rtmp_adapter {
         unsigned long Rt3xxRalinkLinkCtrl;      /* USed for 3090F chip */
         u16 DeviceID;   /* Read from PCI config */
         unsigned long AccessBBPFailCount;
-        BOOLEAN bPCIclkOff;     /* flag that indicate if the PICE power status in Configuration SPace.. */
+        BOOLEAN bPCIclkOff;     /* flag that indicates if the PICE power status in Configuration Space.. */
         BOOLEAN bPCIclkOffDisableTx;    /* */
 
         BOOLEAN brt30xxBanMcuCmd;       /*when = 0xff means all commands are ok to set . */
@@ -1871,9 +1872,9 @@ struct rt_rtmp_adapter {
         /* ---------------------------- */
         u8 RfIcType;            /* RFIC_xxx */
         unsigned long RfFreqOffset;     /* Frequency offset for channel switching */
-        struct rt_rtmp_rf_regs LatchRfRegs;     /* latch th latest RF programming value since RF IC doesn't support READ */
+        struct rt_rtmp_rf_regs LatchRfRegs;     /* latch the latest RF programming value since RF IC doesn't support READ */
 
-        EEPROM_ANTENNA_STRUC Antenna;   /* Since ANtenna definition is different for a & g. We need to save it for future reference. */
+        EEPROM_ANTENNA_STRUC Antenna;   /* Since Antenna definition is different for a & g. We need to save it for future reference. */
         EEPROM_NIC_CONFIG2_STRUC NicConfig2;
 
         /* This soft Rx Antenna Diversity mechanism is used only when user set */
@@ -1990,7 +1991,7 @@ struct rt_rtmp_adapter {
         struct rt_common_config CommonCfg;
         struct rt_mlme Mlme;
 
-        /* AP needs those vaiables for site survey feature. */
+        /* AP needs those variables for site survey feature. */
         struct rt_mlme_aux MlmeAux;     /* temporary settings used during MLME state machine */
         struct rt_bss_table ScanTab;    /* store the latest SCAN result */
 
@@ -2012,7 +2013,7 @@ struct rt_rtmp_adapter {
         /* various Counters */
         struct rt_counter_802_3 Counters8023;   /* 802.3 counters */
         struct rt_counter_802_11 WlanCounters;  /* 802.11 MIB counters */
-        struct rt_counter_ralink RalinkCounters;        /* Ralink propriety counters */
+        struct rt_counter_ralink RalinkCounters;        /* Ralink proprietary counters */
         struct rt_counter_drs DrsCounters;      /* counters for Dynamic TX Rate Switching */
         struct rt_private PrivateInfo;  /* Private information & counters */
 
@@ -2024,7 +2025,7 @@ struct rt_rtmp_adapter {
         u16 Sequence;
 
         /* Control disconnect / connect event generation */
-        /*+++Didn't used anymore */
+        /*+++Not used anymore */
         unsigned long LinkDownTime;
         /*--- */
         unsigned long LastRxRate;
@@ -2036,7 +2037,7 @@ struct rt_rtmp_adapter {
         unsigned long ExtraInfo;        /* Extra information for displaying status */
         unsigned long SystemErrorBitmap;        /* b0: E2PROM version error */
 
-        /*+++Didn't used anymore */
+        /*+++Not used anymore */
         unsigned long MacIcVersion;     /* MAC/BBP serial interface issue solved after ver.D */
         /*--- */
 
@@ -2089,7 +2090,7 @@ struct rt_rtmp_adapter {
         unsigned long BulkOutReq;
         unsigned long BulkOutComplete;
         unsigned long BulkOutCompleteOther;
-        unsigned long BulkOutCompleteCancel;    /* seems not use now? */
+        unsigned long BulkOutCompleteCancel;    /* seems not used now? */
         unsigned long BulkInReq;
         unsigned long BulkInComplete;
         unsigned long BulkInCompleteFail;
@@ -2196,9 +2197,9 @@ struct rt_rx_blk {
 struct rt_tx_blk {
         u8 QueIdx;
         u8 TxFrameType; /* Indicate the Transmission type of the all frames in one batch */
-        u8 TotalFrameNum;       /* Total frame number want to send-out in one batch */
+        u8 TotalFrameNum;       /* Total frame number that wants to send-out in one batch */
         u16 TotalFragNum;       /* Total frame fragments required in one batch */
-        u16 TotalFrameLen;      /* Total length of all frames want to send-out in one batch */
+        u16 TotalFrameLen;      /* Total length of all frames that wants to send-out in one batch */
 
         struct rt_queue_header TxPacketList;
         struct rt_mac_table_entry *pMacEntry;   /* NULL: packet with 802.11 RA field is multicast/broadcast address */
@@ -2207,7 +2208,7 @@ struct rt_tx_blk {
         /* Following structure used for the characteristics of a specific packet. */
         void *pPacket;
         u8 *pSrcBufHeader;      /* Reference to the head of sk_buff->data */
-        u8 *pSrcBufData;        /* Reference to the sk_buff->data, will changed depends on hanlding progresss */
+        u8 *pSrcBufData;        /* Reference to the sk_buff->data, will change depending on the handling progresss */
         u32 SrcBufLen;          /* Length of packet payload which not including Layer 2 header */
         u8 *pExtraLlcSnapEncap; /* NULL means no extra LLC/SNAP is required */
         u8 HeaderBuf[128];      /* TempBuffer for TX_INFO + TX_WI + 802.11 Header + padding + AMSDU SubHeader + LLC/SNAP */
@@ -2219,7 +2220,7 @@ struct rt_tx_blk {
         u8 apidx;               /* The interface associated to this packet */
         u8 Wcid;                /* The MAC entry associated to this packet */
         u8 UserPriority;        /* priority class of packet */
-        u8 FrameGap;            /* what kind of IFS this packet use */
+        u8 FrameGap;            /* what kind of IFS does this packet use */
         u8 MpduReqNum;  /* number of fragments of this frame */
         u8 TxRate;              /* TODO: Obsoleted? Should change to MCS? */
         u8 CipherAlg;   /* cipher alogrithm */
@@ -2978,7 +2979,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP);
 
 void IterateOnBssTab(struct rt_rtmp_adapter *pAd);
 
-void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);;
+void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);
 
 void JoinParmFill(struct rt_rtmp_adapter *pAd,
                   struct rt_mlme_join_req *JoinReq, unsigned long BssIdx);
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h
index 9c54bacb845b..6ac617e7c9bb 100644
--- a/drivers/staging/rt2860/rtmp_def.h
+++ b/drivers/staging/rt2860/rtmp_def.h
@@ -31,10 +31,11 @@
     Miniport related definition header
 
     Revision History:
-    Who         When          What
+    Who                 When            What
     --------    ----------    ----------------------------------------------
-    Paul Lin    08-01-2002    created
-    John Chang  08-05-2003    add definition for 11g & other drafts
+    Paul Lin            08-01-2002      created
+    John Chang          08-05-2003      add definition for 11g & other drafts
+    Justin P. Mattock   11/07/2010      Fix some typos
 */
 #ifndef __RTMP_DEF_H__
 #define __RTMP_DEF_H__
@@ -111,11 +112,11 @@
         WMM Note: If memory of your system is not much, please reduce the definition;
         or when you do WMM test, the queue for low priority AC will be full, i.e.
         TX_RING_SIZE + MAX_PACKETS_IN_QUEUE packets for the AC will be buffered in
-        WLAN, maybe no any packet buffer can be got in Ethernet driver.
+        WLAN, maybe no packet buffers can get into the Ethernet driver.
 
-        Sometimes no packet buffer can be got in Ethernet driver, the system will
+        Sometimes no packet buffer can be get into the Ethernet driver, the system will
         send flow control packet to the sender to slow down its sending rate.
-        So no WMM can be saw in the air.
+        So no WMM can be seen in the air.
 */
 
 /*
@@ -125,7 +126,7 @@
         And in rt_main_end.c, clConfig.clNum = RX_RING_SIZE * 3; is changed to
         clConfig.clNum = RX_RING_SIZE * 4;
 */
-/* TODO: For VxWorks the size is 256. Shall we cahnge the value as 256 for all OS????? */
+/* TODO: For VxWorks the size is 256. Shall we change the value as 256 for all OS? */
 #define MAX_PACKETS_IN_QUEUE                            (512)   /*(512)    // to pass WMM A5-WPAPSK */
 
 #define MAX_PACKETS_IN_MCAST_PS_QUEUE           32
@@ -171,7 +172,7 @@
 #define fRTMP_ADAPTER_SCAN_2040                         0x04000000
 #define fRTMP_ADAPTER_RADIO_MEASUREMENT         0x08000000
 
-#define fRTMP_ADAPTER_START_UP                  0x10000000      /*Devive already initialized and enabled Tx/Rx. */
+#define fRTMP_ADAPTER_START_UP                  0x10000000      /*Device already initialized and enabled Tx/Rx. */
 #define fRTMP_ADAPTER_MEDIA_STATE_CHANGE    0x20000000
 #define fRTMP_ADAPTER_IDLE_RADIO_OFF        0x40000000
 
@@ -205,8 +206,8 @@
 #define fRTMP_PS_SET_PCI_CLK_OFF_COMMAND          0x00000002
 /* Indicate driver should disable kick off hardware to send packets from now. */
 #define fRTMP_PS_DISABLE_TX         0x00000004
-/* Indicate driver should IMMEDIATELY fo to sleep after receiving AP's beacon in which  doesn't indicate unicate nor multicast packets for me */
-/*. This flag is used ONLY in RTMPHandleRxDoneInterrupt routine. */
+/* Indicate driver should IMMEDIATELY go to sleep after receiving AP's beacon in which doesn't indicate unicate nor multicast packets for me */
+/* This flag is used ONLY in RTMPHandleRxDoneInterrupt routine. */
 #define fRTMP_PS_GO_TO_SLEEP_NOW         0x00000008
 #define fRTMP_PS_TOGGLE_L1              0x00000010      /* Use Toggle L1 mechanism for rt28xx PCIe */
 
@@ -303,7 +304,7 @@
 
 /* WDS definition */
 #define MAX_WDS_ENTRY               4
-#define WDS_PAIRWISE_KEY_OFFSET     60  /* WDS links uses pairwise key#60 ~ 63 in ASIC pairwise key table */
+#define WDS_PAIRWISE_KEY_OFFSET     60  /* WDS links use pairwise key#60 ~ 63 in ASIC pairwise key table */
 
 #define WDS_DISABLE_MODE            0
 #define WDS_RESTRICT_MODE           1
@@ -559,7 +560,7 @@
 #define IE_ADD_HT2                        53    /* 802.11n d1. ADDITIONAL HT CAPABILITY. ELEMENT ID TBD */
 
 /* For 802.11n D3.03 */
-/*#define IE_NEW_EXT_CHA_OFFSET             62    // 802.11n d1. New extension channel offset elemet */
+/*#define IE_NEW_EXT_CHA_OFFSET             62    // 802.11n d1. New extension channel offset element */
 #define IE_SECONDARY_CH_OFFSET          62      /* 802.11n D3.03        Secondary Channel Offset element */
 #define IE_WAPI                                                 68      /* WAPI information element */
 #define IE_2040_BSS_COEXIST               72    /* 802.11n D3.0.3 */
@@ -678,7 +679,7 @@
 
 #define ACT_MACHINE_BASE              0
 
-/*Those PEER_xx_CATE number is based on real Categary value in IEEE spec. Please don'es modify it by your self. */
+/*Those PEER_xx_CATE number is based on real Categary value in IEEE spec. Please do not modify it by your self. */
 /*Category */
 #define MT2_PEER_SPECTRUM_CATE              0
 #define MT2_PEER_QOS_CATE              1
@@ -748,7 +749,7 @@
 
 #define ACT_FUNC_SIZE                 (MAX_ACT_STATE * MAX_ACT_MSG)
 /* */
-/* STA's AUTHENTICATION state machine: states, evvents, total function # */
+/* STA's AUTHENTICATION state machine: states, events, total function # */
 /* */
 #define AUTH_REQ_IDLE                   0
 #define AUTH_WAIT_SEQ2                  1
@@ -948,7 +949,7 @@
 #define BLOCK_ACK                   0x60        /* b6:5 = 11 */
 
 /* */
-/* rtmp_data.c use these definition */
+/* rtmp_data.c uses this definition */
 /* */
 #define LENGTH_802_11               24
 #define LENGTH_802_11_AND_H         30
@@ -1288,7 +1289,7 @@
 #define IW_STA_LINKDOWN_EVENT_FLAG                                      0x0210
 #define IW_SCAN_COMPLETED_EVENT_FLAG                            0x0211
 #define IW_SCAN_ENQUEUE_FAIL_EVENT_FLAG                         0x0212
-/* if add new system event flag, please upadte the IW_SYS_EVENT_FLAG_END */
+/* if add new system event flag, please update the IW_SYS_EVENT_FLAG_END */
 #define IW_SYS_EVENT_FLAG_END                       0x0212
 #define IW_SYS_EVENT_TYPE_NUM                                           (IW_SYS_EVENT_FLAG_END - IW_SYS_EVENT_FLAG_START + 1)
 /* For system event - end */
@@ -1305,7 +1306,7 @@
 #define IW_SPOOF_DEAUTH_EVENT_FLAG                                      0x0307
 #define IW_SPOOF_UNKNOWN_MGMT_EVENT_FLAG                        0x0308
 #define IW_REPLAY_ATTACK_EVENT_FLAG                                     0x0309
-/* if add new spoof attack event flag, please upadte the IW_SPOOF_EVENT_FLAG_END */
+/* if add new spoof attack event flag, please update the IW_SPOOF_EVENT_FLAG_END */
 #define IW_SPOOF_EVENT_FLAG_END                     0x0309
 #define IW_SPOOF_EVENT_TYPE_NUM                                         (IW_SPOOF_EVENT_FLAG_END - IW_SPOOF_EVENT_FLAG_START + 1)
 /* For spoof attack event - end */
@@ -1319,7 +1320,7 @@
 #define IW_FLOOD_DISASSOC_EVENT_FLAG                            0x0404
 #define IW_FLOOD_DEAUTH_EVENT_FLAG                                      0x0405
 #define IW_FLOOD_EAP_REQ_EVENT_FLAG                                     0x0406
-/* if add new flooding attack event flag, please upadte the IW_FLOOD_EVENT_FLAG_END */
+/* if add new flooding attack event flag, please update the IW_FLOOD_EVENT_FLAG_END */
 #define IW_FLOOD_EVENT_FLAG_END                         0x0406
 #define IW_FLOOD_EVENT_TYPE_NUM                                         (IW_FLOOD_EVENT_FLAG_END - IW_FLOOD_EVENT_FLAG_START + 1)
 /* For flooding attack - end */
diff --git a/drivers/staging/rt2860/rtmp_timer.h b/drivers/staging/rt2860/rtmp_timer.h
index 28b8ac6e8352..15b628743500 100644
--- a/drivers/staging/rt2860/rtmp_timer.h
+++ b/drivers/staging/rt2860/rtmp_timer.h
@@ -28,13 +28,14 @@
         rtmp_timer.h
 
     Abstract:
-        Ralink Wireless Driver timer related data structures and delcarations
+        Ralink Wireless Driver timer related data structures and declarations 
 
     Revision History:
-        Who           When                What
+        Who                     When                 What
         --------    ----------      ----------------------------------------------
-        Name          Date                 Modification logs
-        Shiang Tu    Aug-28-2008        init version
+        Name                    Date                 Modification logs
+        Shiang Tu               Aug-28-2008          init version
+        Justin P. Mattock       11/07/2010           Fix a typo
 
 */
 
@@ -51,8 +52,8 @@
 
 /* ----------------- Timer Related MARCO ---------------*/
 /* In some os or chipset, we have a lot of timer functions and will read/write register, */
-/*   it's not allowed in Linux USB sub-system to do it ( because of sleep issue when */
-/*  submit to ctrl pipe). So we need a wrapper function to take care it. */
+/* it's not allowed in Linux USB sub-system to do it ( because of sleep issue when */
+/* submit to ctrl pipe). So we need a wrapper function to take care it. */
 
 #ifdef RTMP_TIMER_TASK_SUPPORT
 typedef void(*RTMP_TIMER_TASK_HANDLE) (void *SystemSpecific1,
diff --git a/drivers/staging/rt2860/spectrum.h b/drivers/staging/rt2860/spectrum.h
index 648fd632b606..4c325ba7ba21 100644
--- a/drivers/staging/rt2860/spectrum.h
+++ b/drivers/staging/rt2860/spectrum.h
@@ -37,7 +37,7 @@ char RTMP_GetTxPwr(struct rt_rtmp_adapter *pAd, IN HTTRANSMIT_SETTING HTTxMode);
         ==========================================================================
         Description:
                 Prepare Measurement request action frame and enqueue it into
-                management queue waiting for transmition.
+                management queue waiting for transmission.
 
         Parametrs:
                 1. the destination mac address of the frame.
@@ -60,7 +60,7 @@ void MakeMeasurementReqFrame(struct rt_rtmp_adapter *pAd,
         ==========================================================================
         Description:
                 Prepare Measurement report action frame and enqueue it into
-                management queue waiting for transmition.
+                management queue waiting for transmission.
 
         Parametrs:
                 1. the destination mac address of the frame.
@@ -80,7 +80,7 @@ void EnqueueMeasurementRep(struct rt_rtmp_adapter *pAd,
         ==========================================================================
         Description:
                 Prepare TPC Request action frame and enqueue it into
-                management queue waiting for transmition.
+                management queue waiting for transmission.
 
         Parametrs:
                 1. the destination mac address of the frame.
@@ -94,7 +94,7 @@ void EnqueueTPCReq(struct rt_rtmp_adapter *pAd, u8 *pDA, u8 DialogToken);
         ==========================================================================
         Description:
                 Prepare TPC Report action frame and enqueue it into
-                management queue waiting for transmition.
+                management queue waiting for transmission.
 
         Parametrs:
                 1. the destination mac address of the frame.
@@ -110,7 +110,7 @@ void EnqueueTPCRep(struct rt_rtmp_adapter *pAd,
         ==========================================================================
         Description:
                 Prepare Channel Switch Announcement action frame and enqueue it into
-                management queue waiting for transmition.
+                management queue waiting for transmission.
 
         Parametrs:
                 1. the destination mac address of the frame.
@@ -126,7 +126,7 @@ void EnqueueChSwAnn(struct rt_rtmp_adapter *pAd,
 /*
         ==========================================================================
         Description:
-                Spectrun action frames Handler such as channel switch annoucement,
+                Spectrun action frames Handler such as channel switch announcement,
                 measurement report, measurement request actions frames.
 
         Parametrs:
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index b7efb0b6b3f0..59e931c3190d 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        John            2004-9-3                porting from RT2500
+        John                    2004-9-3                porting from RT2500
+        Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -277,10 +278,10 @@ void MlmeAssocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
         u16 VarIesOffset;
         u16 Status;
 
-        /* Block all authentication request durning WPA block period */
+        /* Block all authentication request during WPA block period */
         if (pAd->StaCfg.bBlockAssoc == TRUE) {
                 DBGPRINT(RT_DEBUG_TRACE,
-                         ("ASSOC - Block Assoc request durning WPA block period!\n"));
+                         ("ASSOC - Block Assoc request during WPA block period!\n"));
                 pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
                 Status = MLME_STATE_MACHINE_REJECT;
                 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2,
@@ -605,10 +606,10 @@ void MlmeReassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem
         u8 *pOutBuffer = NULL;
         u16 Status;
 
-        /* Block all authentication request durning WPA block period */
+        /* Block all authentication request during WPA block period */
         if (pAd->StaCfg.bBlockAssoc == TRUE) {
                 DBGPRINT(RT_DEBUG_TRACE,
-                         ("ASSOC - Block ReAssoc request durning WPA block period!\n"));
+                         ("ASSOC - Block ReAssoc request during WPA block period!\n"));
                 pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
                 Status = MLME_STATE_MACHINE_REJECT;
                 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2,
@@ -1001,7 +1002,7 @@ void AssocPostProc(struct rt_rtmp_adapter *pAd, u8 *pAddr2, u16 CapabilityInfo,
         pAd->MlmeAux.CapabilityInfo =
             CapabilityInfo & SUPPORTED_CAPABILITY_INFO;
 
-        /* Some HT AP might lost WMM IE. We add WMM ourselves. beacuase HT requires QoS on. */
+        /* Some HT AP might lost WMM IE. We add WMM ourselves. because HT requires QoS on. */
         if ((HtCapabilityLen > 0) && (pEdcaParm->bValid == FALSE)) {
                 pEdcaParm->bValid = TRUE;
                 pEdcaParm->Aifsn[0] = 3;
@@ -1054,7 +1055,7 @@ void AssocPostProc(struct rt_rtmp_adapter *pAd, u8 *pAddr2, u16 CapabilityInfo,
         /* Set New WPA information */
         Idx = BssTableSearch(&pAd->ScanTab, pAddr2, pAd->MlmeAux.Channel);
         if (Idx == BSS_NOT_FOUND) {
-                DBGPRINT_ERR(("ASSOC - Can't find BSS after receiving Assoc response\n"));
+                DBGPRINT_ERR("ASSOC - Can't find BSS after receiving Assoc response\n");
         } else {
                 /* Init variable */
                 pAd->MacTab.Content[BSSID_WCID].RSNIE_Len = 0;
diff --git a/drivers/staging/rt2860/sta/auth.c b/drivers/staging/rt2860/sta/auth.c
index 404bd220679d..23ea00b896b0 100644
--- a/drivers/staging/rt2860/sta/auth.c
+++ b/drivers/staging/rt2860/sta/auth.c
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        John            2004-9-3                porting from RT2500
+        John                    2004-9-3                porting from RT2500
+        Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -455,10 +456,10 @@ BOOLEAN AUTH_ReqSend(struct rt_rtmp_adapter *pAd,
         u8 *pOutBuffer = NULL;
         unsigned long FrameLen = 0, tmp = 0;
 
-        /* Block all authentication request durning WPA block period */
+        /* Block all authentication request during WPA block period */
         if (pAd->StaCfg.bBlockAssoc == TRUE) {
                 DBGPRINT(RT_DEBUG_TRACE,
-                         ("%s - Block Auth request durning WPA block period!\n",
+                         ("%s - Block Auth request during WPA block period!\n",
                           pSMName));
                 pAd->Mlme.AuthMachine.CurrState = AUTH_REQ_IDLE;
                 Status = MLME_STATE_MACHINE_REJECT;
@@ -508,8 +509,7 @@ BOOLEAN AUTH_ReqSend(struct rt_rtmp_adapter *pAd,
                 RTMPSetTimer(pAuthTimer, Timeout);
                 return TRUE;
         } else {
-                DBGPRINT_ERR(("%s - MlmeAuthReqAction() sanity check failed\n",
-                              pSMName));
+                DBGPRINT_ERR("%s - MlmeAuthReqAction() sanity check failed\n", pSMName);
                 return FALSE;
         }
 
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index c380551c0354..4996258f6ecd 100644
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        John                    2004-08-08                      Major modification from RT2560
+        John                    2004-08-08              Major modification from RT2560
+        Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -64,7 +65,7 @@ u8 CipherSuiteWpaNoneAesLen =
 
 /* The following MACRO is called after 1. starting an new IBSS, 2. successfully JOIN an IBSS, */
 /* or 3. successfully ASSOCIATE to a BSS, 4. successfully RE_ASSOCIATE to a BSS */
-/* All settings successfuly negotiated furing MLME state machines become final settings */
+/* All settings successfuly negotiated firing MLME state machines become final settings */
 /* and are copied to pAd->StaActive */
 #define COPY_SETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(_pAd)                                 \
 {                                                                                       \
@@ -214,8 +215,7 @@ void MlmeCntlMachinePerformAction(struct rt_rtmp_adapter *pAd,
                 break;
 #endif /* RTMP_MAC_USB // */
         default:
-                DBGPRINT_ERR(("ERROR! CNTL - Illegal message type(=%ld)",
-                              Elem->MsgType));
+                DBGPRINT_ERR("ERROR! CNTL - Illegal message type(=%ld)", Elem->MsgType);
                 break;
         }
 }
@@ -553,7 +553,7 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
         NdisMoveMemory(&pAd->MlmeAux.SsidBssTab.BssEntry[0],
                        &pAd->ScanTab.BssEntry[BssIdx], sizeof(struct rt_bss_entry));
 
-        /* Add SSID into MlmeAux for site surey joining hidden SSID */
+        /* Add SSID into MlmeAux for site survey joining hidden SSID */
         pAd->MlmeAux.SsidLen = pAd->ScanTab.BssEntry[BssIdx].SsidLen;
         NdisMoveMemory(pAd->MlmeAux.Ssid, pAd->ScanTab.BssEntry[BssIdx].Ssid,
                        pAd->MlmeAux.SsidLen);
@@ -666,7 +666,7 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
 }
 
 /* Roaming is the only external request triggering CNTL state machine */
-/* despite of other "SET OID" operation. All "SET OID" related oerations */
+/* despite of other "SET OID" operation. All "SET OID" related operations */
 /* happen in sequence, because no other SET OID will be sent to this device */
 /* until the the previous SET operation is complete (successful o failed). */
 /* So, how do we quarantee this ROAMING request won't corrupt other "SET OID"? */
@@ -1224,7 +1224,7 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
         /* Change to AP channel */
         if ((pAd->CommonCfg.CentralChannel > pAd->CommonCfg.Channel)
             && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth == BW_40)) {
-                /* Must using 40MHz. */
+                /* Must use 40MHz. */
                 pAd->CommonCfg.BBPCurrentBW = BW_40;
                 AsicSwitchChannel(pAd, pAd->CommonCfg.CentralChannel, FALSE);
                 AsicLockChannel(pAd, pAd->CommonCfg.CentralChannel);
@@ -1259,7 +1259,7 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
         } else if ((pAd->CommonCfg.CentralChannel < pAd->CommonCfg.Channel)
                    && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth ==
                        BW_40)) {
-                /* Must using 40MHz. */
+                /* Must use 40MHz. */
                 pAd->CommonCfg.BBPCurrentBW = BW_40;
                 AsicSwitchChannel(pAd, pAd->CommonCfg.CentralChannel, FALSE);
                 AsicLockChannel(pAd, pAd->CommonCfg.CentralChannel);
@@ -1343,12 +1343,12 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
         AsicSetSlotTime(pAd, TRUE);
         AsicSetEdcaParm(pAd, &pAd->CommonCfg.APEdcaParm);
 
-        /* Call this for RTS protectionfor legacy rate, we will always enable RTS threshold, but normally it will not hit */
+        /* Call this for RTS protection for legacy rate, we will always enable RTS threshold, but normally it will not hit */
         AsicUpdateProtect(pAd, 0, (OFDMSETPROTECT | CCKSETPROTECT), TRUE,
                           FALSE);
 
         if ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE)) {
-                /* Update HT protectionfor based on AP's operating mode. */
+                /* Update HT protection for based on AP's operating mode. */
                 if (pAd->MlmeAux.AddHtInfo.AddHtInfo2.NonGfPresent == 1) {
                         AsicUpdateProtect(pAd,
                                           pAd->MlmeAux.AddHtInfo.AddHtInfo2.
@@ -1530,7 +1530,7 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
                 /* Add BSSID to WCID search table */
                 AsicUpdateRxWCIDTable(pAd, BSSID_WCID, pAd->CommonCfg.Bssid);
 
-                /* If WEP is enabled, add paiewise and shared key */
+                /* If WEP is enabled, add pairwise and shared key */
                 if (((pAd->StaCfg.WpaSupplicantUP) &&
                      (pAd->StaCfg.WepStatus == Ndis802_11WEPEnabled) &&
                      (pAd->StaCfg.PortSecured == WPA_802_1X_PORT_SECURED)) ||
@@ -1681,9 +1681,9 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
         pAd->Mlme.PeriodicRound = 0;
         pAd->Mlme.OneSecPeriodicRound = 0;
         pAd->bConfigChanged = FALSE;    /* Reset config flag */
-        pAd->ExtraInfo = GENERAL_LINK_UP;       /* Update extra information to link is up */
+        pAd->ExtraInfo = GENERAL_LINK_UP;       /* Update extra information after link is up */
 
-        /* Set asic auto fall back */
+        /* Set basic auto fall back */
         {
                 u8 *pTable;
                 u8 TableSize = 0;
@@ -1854,8 +1854,8 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType)
         Note:
                 We need more information to know it's this requst from AP.
                 If yes! we need to do extra handling, for example, remove the WPA key.
-                Otherwise on 4-way handshaking will faied, since the WPA key didn't be
-                remove while auto reconnect.
+                Otherwise on 4-way handshaking will fail, since the WPA key didn't get
+                removed while auto reconnect.
                 Disconnect request from AP, it means we will start afresh 4-way handshaking
                 on WPA mode.
 
@@ -1870,9 +1870,9 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP)
                 return;
 
         RTMP_CLEAR_PSFLAG(pAd, fRTMP_PS_GO_TO_SLEEP_NOW);
-        /*Comment the codes, beasue the line 2291 call the same function. */
-        /*RTMPCancelTimer(&pAd->Mlme.PsPollTimer,               &Cancelled); */
-        /* Not allow go to sleep within linkdown function. */
+        /* Comment the codes, because the line 2291 call the same function. */
+        /* RTMPCancelTimer(&pAd->Mlme.PsPollTimer, &Cancelled); */
+        /* Not allowed go to sleep within the linkdown function. */
         RTMP_CLEAR_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP);
 
         if (pAd->CommonCfg.bWirelessEvent) {
@@ -1970,7 +1970,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP)
         /* Set LED */
         RTMPSetLED(pAd, LED_LINK_DOWN);
         pAd->LedIndicatorStrength = 0xF0;
-        RTMPSetSignalLED(pAd, -100);    /* Force signal strength Led to be turned off, firmware is not done it. */
+        RTMPSetSignalLED(pAd, -100);    /* Force signal strength Led to be turned off, firmware has not done it. */
 
         AsicDisableSync(pAd);
 
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index 23879b7cd49a..e82c6b669eb2 100644
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -31,7 +31,8 @@
         Data path subroutines
 
         Revision History:
-        Who             When                    What
+        Who                     When            What
+        Justin P. Mattock       11/07/2010      Fix typos
         --------        ----------              ----------------------------------------------
 */
 #include "../rt_config.h"
@@ -257,8 +258,8 @@ void STARxDataFrameAnnounce(struct rt_rtmp_adapter *pAd,
                     && (pAd->CommonCfg.bDisableReordering == 0)) {
                         Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID);
                 } else {
-                        /* Determin the destination of the EAP frame */
-                        /*  to WPA state machine or upper layer */
+                        /* Determine the destination of the EAP frame */
+                        /* to WPA state machine or upper layer */
                         STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk,
                                                 FromWhichBSSID);
                 }
@@ -644,7 +645,7 @@ void STAHandleRxMgmtFrame(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
 
                 /* First check the size, it MUST not exceed the mlme queue size */
                 if (pRxWI->MPDUtotalByteCount > MGMT_DMA_BUFFER_SIZE) {
-                        DBGPRINT_ERR(("STAHandleRxMgmtFrame: frame too large, size = %d \n", pRxWI->MPDUtotalByteCount));
+                        DBGPRINT_ERR("STAHandleRxMgmtFrame: frame too large, size = %d \n", pRxWI->MPDUtotalByteCount);
                         break;
                 }
 
@@ -853,7 +854,7 @@ Return Value:
         NONE
 
 Note:
-        This function do early checking and classification for send-out packet.
+        This function does early checking and classification for send-out packet.
         You only can put OS-depened & STA related code in here.
 ========================================================================
 */
@@ -943,7 +944,7 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket)
                 DBGPRINT(RT_DEBUG_ERROR,
                          ("STASendPacket --> pSrcBufVA == NULL !SrcBufLen=%x\n",
                           SrcBufLen));
-                /* Resourece is low, system did not allocate virtual address */
+                /* Resource is low, system did not allocate virtual address */
                 /* return NDIS_STATUS_FAILURE directly to upper layer */
                 RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
                 return NDIS_STATUS_FAILURE;
@@ -979,7 +980,7 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket)
                 DBGPRINT(RT_DEBUG_ERROR,
                         ("STASendPacket->Cannot find pEntry(%pM) in MacTab!\n",
                                 pSrcBufVA));
-                /* Resourece is low, system did not allocate virtual address */
+                /* Resource is low, system did not allocate virtual address */
                 /* return NDIS_STATUS_FAILURE directly to upper layer */
                 RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
                 return NDIS_STATUS_FAILURE;
@@ -1057,9 +1058,9 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket)
 
         /* STEP 2. Check the requirement of RTS: */
         /*         If multiple fragment required, RTS is required only for the first fragment */
-        /*         if the fragment size large than RTS threshold */
+        /*         if the fragment size is larger than RTS threshold */
         /*     For RT28xx, Let ASIC send RTS/CTS */
-/*      RTMP_SET_PACKET_RTS(pPacket, 0); */
+        /*      RTMP_SET_PACKET_RTS(pPacket, 0); */
         if (NumberOfFrag > 1)
                 RTSRequired =
                     (pAd->CommonCfg.FragmentThreshold >
@@ -1171,8 +1172,8 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket)
         ========================================================================
 
         Routine Description:
-                This subroutine will scan through releative ring descriptor to find
-                out avaliable free ring descriptor and compare with request size.
+                This subroutine will scan through relative ring descriptor to find
+                out available free ring descriptor and compare with request size.
 
         Arguments:
                 pAd Pointer to our adapter
@@ -1588,7 +1589,7 @@ static inline u8 *STA_Build_ARalink_Frame_Header(struct rt_rtmp_adapter *pAd,
                 pHeaderBufPtr += 2;
                 pTxBlk->MpduHeaderLen += 2;
         }
-        /* padding at front of LLC header. LLC header should at 4-bytes aligment. */
+        /* padding at front of LLC header. LLC header should at 4-bytes alignment. */
         pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
         pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
         pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
@@ -2014,7 +2015,7 @@ void STA_Legacy_Frame_Tx(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk)
                 pHeaderBufPtr += 2;
                 pTxBlk->MpduHeaderLen += 2;
         }
-        /* The remaining content of MPDU header should locate at 4-octets aligment */
+        /* The remaining content of MPDU header should locate at 4-octets alignment */
         pTxBlk->HdrPadLen = (unsigned long)pHeaderBufPtr;
         pHeaderBufPtr = (u8 *)ROUND_UP(pHeaderBufPtr, 4);
         pTxBlk->HdrPadLen = (unsigned long)(pHeaderBufPtr - pTxBlk->HdrPadLen);
@@ -2114,7 +2115,7 @@ void STA_ARalink_Frame_Tx(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk)
                             STA_Build_ARalink_Frame_Header(pAd, pTxBlk);
 
                         /* It's ok write the TxWI here, because the TxWI->MPDUtotalByteCount */
-                        /*      will be updated after final frame was handled. */
+                        /* will be updated after final frame was handled. */
                         RTMPWriteTxWI_Data(pAd,
                                            (struct rt_txwi *) (&pTxBlk->
                                                           HeaderBuf
@@ -2291,8 +2292,8 @@ void STA_Fragment_Frame_Tx(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk
                                       pTxBlk->pExtraLlcSnapEncap, pTxBlk->pKey,
                                       0);
 
-                /* NOTE: DON'T refer the skb->len directly after following copy. Becasue the length is not adjust */
-                /*                      to correct lenght, refer to pTxBlk->SrcBufLen for the packet length in following progress. */
+                /* NOTE: DON'T refer the skb->len directly after following copy. Because the length is not adjusted */
+                /*                      to correct length, refer to pTxBlk->SrcBufLen for the packet length in following progress. */
                 NdisMoveMemory(pTxBlk->pSrcBufData + pTxBlk->SrcBufLen,
                                &pAd->PrivateInfo.Tx.MIC[0], 8);
                 /*skb_put((RTPKT_TO_OSPKT(pTxBlk->pPacket))->tail, 8); */
@@ -2301,7 +2302,7 @@ void STA_Fragment_Frame_Tx(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk
                 pTxBlk->CipherAlg = CIPHER_TKIP_NO_MIC;
         }
         /* */
-        /* calcuate the overhead bytes that encryption algorithm may add. This */
+        /* calculate the overhead bytes that encryption algorithm may add. This */
         /* affects the calculate of "duration" field */
         /* */
         if ((pTxBlk->CipherAlg == CIPHER_WEP64)
diff --git a/drivers/staging/rt2860/sta/sanity.c b/drivers/staging/rt2860/sta/sanity.c
index 8f9fd19be151..0c32604f2d3f 100644
--- a/drivers/staging/rt2860/sta/sanity.c
+++ b/drivers/staging/rt2860/sta/sanity.c
@@ -32,7 +32,8 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        John Chang  2004-09-01      add WMM support
+        John Chang              2004-09-01      add WMM support
+        Justin P. Mattock       11/07/2010      Fix typos
 */
 #include "../rt_config.h"
 
@@ -118,7 +119,7 @@ BOOLEAN PeerAssocRspSanity(struct rt_rtmp_adapter *pAd, void * pMsg, unsigned lo
         NdisMoveMemory(pAid, &pFrame->Octet[4], 2);
         Length += 2;
 
-        /* Aid already swaped byte order in RTMPFrameEndianChange() for big endian platform */
+        /* Aid already swapped byte order in RTMPFrameEndianChange() for big endian platform */
         *pAid = (*pAid) & 0x3fff;       /* AID is low 14-bit */
 
         /* -- get supported rates from payload and advance the pointer */
diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index 747d3c6d1851..7054ba1323d0 100644
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -32,8 +32,9 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        John Chang      2004-09-01      modified for rt2561/2661
-        Jan Lee         2006-08-01      modified for rt2860 for 802.11n
+        John Chang              2004-09-01              modified for rt2561/2661
+        Jan Lee                 2006-08-01              modified for rt2860 for 802.11n
+        Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -233,9 +234,9 @@ void MlmeScanReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
                 RTMPSuspendMsduTransmission(pAd);
 
                 /* */
-                /* To prevent data lost. */
-                /* Send an NULL data with turned PSM bit on to current associated AP before SCAN progress. */
-                /* And should send an NULL data with turned PSM bit off to AP, when scan progress done */
+                /* To prevent data loss. */
+                /* Send a NULL data with turned PSM bit on to current associated AP before SCAN progress. */
+                /* And should send a NULL data with turned PSM bit off to AP, when scan progress done */
                 /* */
                 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)
                     && (INFRA_ON(pAd))) {
@@ -283,7 +284,7 @@ void MlmeScanReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
                 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - BBP R4 to 20MHz.l\n"));
                 ScanNextChannel(pAd);
         } else {
-                DBGPRINT_ERR(("SYNC - MlmeScanReqAction() sanity check fail\n"));
+                DBGPRINT_ERR("SYNC - MlmeScanReqAction() sanity check fail\n");
                 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
                 Status = MLME_INVALID_FORMAT;
                 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_SCAN_CONF, 2,
@@ -535,7 +536,7 @@ void MlmeStartReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
                 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_START_CONF, 2,
                             &Status);
         } else {
-                DBGPRINT_ERR(("SYNC - MlmeStartReqAction() sanity check fail.\n"));
+                DBGPRINT_ERR("SYNC - MlmeStartReqAction() sanity check fail.\n");
                 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
                 Status = MLME_INVALID_FORMAT;
                 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_START_CONF, 2,
@@ -750,9 +751,9 @@ void PeerBeaconAtJoinAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_el
 
                 /* BEACON from desired BSS/IBSS found. We should be able to decide most */
                 /* BSS parameters here. */
-                /* Q. But what happen if this JOIN doesn't conclude a successful ASSOCIATEION? */
-                /*    Do we need to receover back all parameters belonging to previous BSS? */
-                /* A. Should be not. There's no back-door recover to previous AP. It still need */
+                /* Q. But what happen if this JOIN doesn't conclude a successful ASSOCIATION? */
+                /*    Do we need to recover back all parameters belonging to previous BSS? */
+                /* A. Should be not. There's no back-door recover to previous AP. It still needs */
                 /*    a new JOIN-AUTH-ASSOC sequence. */
                 if (MAC_ADDR_EQUAL(pAd->MlmeAux.Bssid, Bssid)) {
                         DBGPRINT(RT_DEBUG_TRACE,
@@ -876,7 +877,7 @@ void PeerBeaconAtJoinAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_el
                         pAd->MlmeAux.CfpMaxDuration = Cf.CfpMaxDuration;
                         pAd->MlmeAux.APRalinkIe = RalinkIe;
 
-                        /* Copy AP's supported rate to MlmeAux for creating assoication request */
+                        /* Copy AP's supported rate to MlmeAux for creating association request */
                         /* Also filter out not supported rate */
                         pAd->MlmeAux.SupRateLen = SupRateLen;
                         NdisMoveMemory(pAd->MlmeAux.SupRate, SupRate,
@@ -1207,7 +1208,7 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
                         }
 
                         if (index >= pAd->ChannelListNum) {
-                                DBGPRINT_ERR(("PeerBeacon(can not find New Channel=%d in ChannelList[%d]\n", pAd->CommonCfg.Channel, pAd->ChannelListNum));
+                                DBGPRINT_ERR("PeerBeacon(can not find New Channel=%d in ChannelList[%d]\n", pAd->CommonCfg.Channel, pAd->ChannelListNum);
                         }
                 }
                 /* if the ssid matched & bssid unmatched, we should select the bssid with large value. */
diff --git a/drivers/staging/rt2860/sta/wpa.c b/drivers/staging/rt2860/sta/wpa.c
index 69b8a24daa21..ff348325028b 100644
--- a/drivers/staging/rt2860/sta/wpa.c
+++ b/drivers/staging/rt2860/sta/wpa.c
@@ -33,7 +33,8 @@
         Who                     When                    What
         --------        ----------              ----------------------------------------------
         Jan     Lee             03-07-22                Initial
-        Paul Lin        03-11-28                Modify for supplicant
+        Paul Lin                03-11-28                Modify for supplicant
+        Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -86,7 +87,7 @@ void RTMPReportMicError(struct rt_rtmp_adapter *pAd, struct rt_cipher_key *pWpaK
                         /* Violate MIC error counts, MIC countermeasures kicks in */
                         pAd->StaCfg.MicErrCnt++;
                         /* We shall block all reception */
-                        /* We shall clean all Tx ring and disassoicate from AP after next EAPOL frame */
+                        /* We shall clean all Tx ring and disassociate from AP after next EAPOL frame */
                         /* */
                         /* No necessary to clean all Tx ring, on RTMPHardTransmit will stop sending non-802.1X EAPOL packets */
                         /* if pAd->StaCfg.MicErrCnt greater than 2. */
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index e095a44cbc0e..5717e12a9544 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -31,10 +31,11 @@
     IOCTL related subroutines
 
     Revision History:
-    Who         When          What
+        Who                      When          What
     --------    ----------    ----------------------------------------------
-    Rory Chen   01-03-2003    created
-        Rory Chen   02-14-2005    modify to support RT61
+        Rory Chen               01-03-2003      created
+        Rory Chen               02-14-2005      modify to support RT61
+        Justin P. Mattock       11/07/2010      Fix typos
 */
 
 #include        "rt_config.h"
@@ -851,7 +852,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
 
                 /*
                    Protocol:
-                   it will show scanned AP's WirelessMode .
+                   it will show scanned AP's WirelessMode.
                    it might be
                    802.11a
                    802.11a/n
@@ -875,13 +876,13 @@ int rt_ioctl_giwscan(struct net_device *dev,
                                         strcpy(iwe.u.name, "802.11a");
                         } else {
                                 /*
-                                   if one of non B mode rate is set supported rate . it mean G only.
+                                   if one of non B mode rate is set supported rate, it means G only.
                                  */
                                 for (rateCnt = 0;
                                      rateCnt < pBssEntry->SupRateLen;
                                      rateCnt++) {
                                         /*
-                                           6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate , it mean G only.
+                                           6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate, it means G only.
                                          */
                                         if (pBssEntry->SupRate[rateCnt] == 140
                                             || pBssEntry->SupRate[rateCnt] ==
@@ -1417,7 +1418,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
                 if ((index >= 0) && (index < 4)) {
                         pAdapter->StaCfg.DefaultKeyId = index;
                 } else
-                        /* Don't complain if only change the mode */
+                        /* Don't complain if the mode is only changed */
                 if (!(erq->flags & IW_ENCODE_MODE))
                         return -EINVAL;
         }
@@ -2732,8 +2733,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                         }
                         if (INFRA_ON(pAdapter)) {
                                 /*BOOLEAN Cancelled; */
-                                /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
-                                /* Since calling this indicate user don't want to connect to that SSID anymore. */
+                                /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
+                                /* Since calling this indicates users don't want to connect to that SSID anymore. */
                                 pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
                                 NdisZeroMemory(pAdapter->MlmeAux.
                                                AutoReconnectSsid,
@@ -2766,8 +2767,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                                 LinkDown(pAdapter, FALSE);
                         }
                         if (ADHOC_ON(pAdapter)) {
-                                /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
-                                /* Since calling this indicate user don't want to connect to that SSID anymore. */
+                                /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
+                                /* Since calling this indicates users don't want to connect to that SSID anymore. */
                                 pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
                                 NdisZeroMemory(pAdapter->MlmeAux.
                                                AutoReconnectSsid,
@@ -2884,7 +2885,7 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                 }
                 /* Enable Rx with promiscuous reception */
                 RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG, 0x3);
-                /* ASIC supporsts sniffer function with replacing RSSI with timestamp. */
+                /* ASIC supports sniffer function with replacing RSSI with timestamp. */
                 /*RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value); */
                 /*Value |= (0x80); */
                 /*RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value); */
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c
index cd15daae5412..ee68d51caa4e 100644
--- a/drivers/staging/rt2860/usb_main_dev.c
+++ b/drivers/staging/rt2860/usb_main_dev.c
@@ -27,8 +27,8 @@
 #include "rt_config.h"
 
 /* Following information will be show when you run 'modinfo' */
-/* *** If you have a solution for the bug in current version of driver, please mail to me. */
-/* Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** */
+/* If you have a solution for the bug in current version of driver, please e-mail me. */
+/* Otherwise post to the forum at ralinktech's web site(www.ralinktech.com) and let all users help you. */
 MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>");
 MODULE_DESCRIPTION("RT2870/RT3070 Wireless Lan Linux Driver");
 MODULE_LICENSE("GPL");
@@ -233,7 +233,7 @@ BOOLEAN RT28XXChipsetCheck(IN void *_dev_p)
         for (i = 0; i < rtusb_usb_id_len; i++) {
                 if (dev_p->descriptor.idVendor == rtusb_usb_id[i].idVendor &&
                     dev_p->descriptor.idProduct == rtusb_usb_id[i].idProduct) {
-                        printk("rt2870: idVendor = 0x%x, idProduct = 0x%x\n",
+                        printk(KERN_INFO "rt2870: idVendor = 0x%x, idProduct = 0x%x\n",
                                dev_p->descriptor.idVendor,
                                dev_p->descriptor.idProduct);
                         break;
@@ -241,7 +241,7 @@ BOOLEAN RT28XXChipsetCheck(IN void *_dev_p)
         }
 
         if (i == rtusb_usb_id_len) {
-                printk("rt2870: Error! Device Descriptor not matching!\n");
+                printk(KERN_ERR "rt2870: Error! Device Descriptor not matching!\n");
                 return FALSE;
         }
 
@@ -323,7 +323,7 @@ static BOOLEAN USBDevConfigInit(IN struct usb_device *dev,
 
         if (!(pAd->BulkInEpAddr && pAd->BulkOutEpAddr[0])) {
                 printk
-                    ("%s: Could not find both bulk-in and bulk-out endpoints\n",
+                    (KERN_ERR "%s: Could not find both bulk-in and bulk-out endpoints\n",
                      __FUNCTION__);
                 return FALSE;
         }
@@ -423,7 +423,7 @@ static int rt2870_resume(struct usb_interface *intf)
 /* Init driver module */
 int __init rtusb_init(void)
 {
-        printk("rtusb init --->\n");
+        printk(KERN_DEBUG "rtusb init --->\n");
         return usb_register(&rtusb_driver);
 }
 
@@ -431,7 +431,7 @@ int __init rtusb_init(void)
 void __exit rtusb_exit(void)
 {
         usb_deregister(&rtusb_driver);
-        printk("<--- rtusb exit\n");
+        printk(KERN_DEBUG "<--- rtusb exit\n");
 }
 
 module_init(rtusb_init);
@@ -814,7 +814,7 @@ static void rt2870_disconnect(struct usb_device *dev, struct rt_rtmp_adapter *pA
                   dev->bus->bus_name, dev->devpath));
         if (!pAd) {
                 usb_put_dev(dev);
-                printk("rtusb_disconnect: pAd == NULL!\n");
+                printk(KERN_ERR "rtusb_disconnect: pAd == NULL!\n");
                 return;
         }
         RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST);
@@ -884,8 +884,8 @@ static int __devinit rt2870_probe(IN struct usb_interface *intf,
         if (net_dev == NULL)
                 goto err_out_free_radev;
 
-        /* Here are the net_device structure with usb specific parameters. */
-        /* for supporting Network Manager.
+        /* Here are the net_device structure with usb specific parameters. 
+         * for supporting Network Manager.
          * Set the sysfs physical device reference for the network logical device if set prior to registration will
          * cause a symlink during initialization.
          */
diff --git a/drivers/staging/rt2860/wpa.h b/drivers/staging/rt2860/wpa.h
index 6199ae6cdcd0..116fc2caa886 100644
--- a/drivers/staging/rt2860/wpa.h
+++ b/drivers/staging/rt2860/wpa.h
@@ -32,13 +32,14 @@
         Revision History:
         Who                     When                    What
         --------        ----------              ----------------------------------------------
-        Name            Date                    Modification logs
+        Name                    Date                    Modification logs
+        Justin P. Mattock       11/07/2010              Fix a typo
 */
 
 #ifndef __WPA_H__
 #define __WPA_H__
 
-/* EAPOL Key descripter frame format related length */
+/* EAPOL Key descriptor frame format related length */
 #define LEN_KEY_DESC_NONCE                      32
 #define LEN_KEY_DESC_IV                         16
 #define LEN_KEY_DESC_RSC                        8
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
index dd8a221e21ae..b26b5a8b5f6b 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
@@ -822,7 +822,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
                 {
                         txb->queue_index = UP2AC(skb->priority);
                 } else {
-                        txb->queue_index = WME_AC_BK;;
+                        txb->queue_index = WME_AC_BK;
                 }
 
 
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index b1786dcac245..fac4eee28e4e 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -89,7 +89,7 @@ u32 rt_global_debug_component =
                         //      COMP_INTR       |
                                 COMP_ERR ; //always open err flags on
 
-static const struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(rtl8192_pci_id_tbl) = {
 #ifdef RTL8190P
         /* Realtek */
         /* Dlink */
@@ -2283,9 +2283,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
                                 IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
 
         priv->AcmControl = 0;
-        priv->pFirmware = (rt_firmware*)vmalloc(sizeof(rt_firmware));
-        if (priv->pFirmware)
-        memset(priv->pFirmware, 0, sizeof(rt_firmware));
+        priv->pFirmware = vzalloc(sizeof(rt_firmware));
 
         /* rx related queue */
         skb_queue_head_init(&priv->rx_queue);
diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c
index d83bcbcb20bd..50cd0e52b921 100644
--- a/drivers/staging/rtl8192e/r819xE_phy.c
+++ b/drivers/staging/rtl8192e/r819xE_phy.c
@@ -2596,7 +2596,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_E
                         break;
         }
 
-        return ret;;
+        return ret;
 
 }
 /******************************************************************************
diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
index 206d924a707c..eefc657ce99e 100644
--- a/drivers/staging/rtl8192u/Makefile
+++ b/drivers/staging/rtl8192u/Makefile
@@ -9,7 +9,6 @@ ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
 #ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
 #ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT
 ccflags-y += -DUSE_ONE_PIPE
-ccflags-y += -DENABLE_DOT11D
 ccflags-y += -Idrivers/staging/rtl8192u/ieee80211
 
 r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o         \
diff --git a/drivers/staging/rtl8192u/dot11d.h b/drivers/staging/rtl8192u/dot11d.h
index d99cc030ec7a..92e7a00f3ee1 100644
--- a/drivers/staging/rtl8192u/dot11d.h
+++ b/drivers/staging/rtl8192u/dot11d.h
@@ -1,7 +1,6 @@
 #ifndef __INC_DOT11D_H
 #define __INC_DOT11D_H
 
-#ifdef ENABLE_DOT11D
 #include "ieee80211/ieee80211.h"
 
 
@@ -98,5 +97,4 @@ int ToLegalChannel(
         struct ieee80211_device *dev,
         u8 channel
 );
-#endif /* ENABLE_DOT11D */
 #endif /* #ifndef __INC_DOT11D_H */
diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile
index 45704f85ef0b..0775c5599d69 100644
--- a/drivers/staging/rtl8192u/ieee80211/Makefile
+++ b/drivers/staging/rtl8192u/ieee80211/Makefile
@@ -20,7 +20,6 @@ ifeq ($(NIC_SELECT),RTL8192U)
 endif
 #ccflags-y := -DJOHN_NOCPY
 #flags to enable or disble 80211D feature
-ccflags-y += -DENABLE_DOT11D
 ieee80211-rsl-objs := ieee80211_rx.o \
                       ieee80211_softmac.o \
                       ieee80211_tx.o \
@@ -75,7 +74,6 @@ CFLAGS += -I$(KSRC)/include -I.
 CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h
 #Kernel 2.4.20
 #CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB
-#CFLAGS += -DENABLE_DOT11D
 SMP := $(shell $(CC) $(MODCFLAGS) -E -dM $(CONFIG_FILE) | \
    grep CONFIG_SMP | awk '{print $$3}')
 ifneq ($(SMP),1)
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
index b91cbfcfa71f..ce63fc341c6e 100644
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
@@ -1,4 +1,3 @@
-#ifdef ENABLE_DOT11D
 //-----------------------------------------------------------------------------
 //      File:
 //              Dot11d.c
@@ -220,4 +219,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete);
 EXPORT_SYMBOL(IsLegalChannel);
 EXPORT_SYMBOL(ToLegalChannel);
 
-#endif
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h
index 15b7a4ba37b6..54f2b4c434ff 100644
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.h
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h
@@ -1,10 +1,8 @@
 #ifndef __INC_DOT11D_H
 #define __INC_DOT11D_H
 
-#ifdef ENABLE_DOT11D
 #include "ieee80211.h"
 
-//#define ENABLE_DOT11D
 
 //#define DOT11D_MAX_CHNL_NUM 83
 
@@ -98,5 +96,4 @@ int ToLegalChannel(
         struct ieee80211_device * dev,
         u8 channel
 );
-#endif //ENABLE_DOT11D
 #endif // #ifndef __INC_DOT11D_H
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index e1216b704959..c0b844d75c0d 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1572,10 +1572,8 @@ struct ieee80211_network {
 #ifdef THOMAS_TURBO
         u8 Turbo_Enable;//enable turbo mode, added by thomas
 #endif
-#ifdef ENABLE_DOT11D
         u16 CountryIeLen;
         u8 CountryIeBuf[MAX_IE_LEN];
-#endif
         // HT Related, by amy, 2008.04.29
         BSS_HT  bssht;
         // Add to handle broadcom AP management frame CCK rate.
@@ -1769,7 +1767,6 @@ typedef u32 RT_RF_CHANGE_SOURCE;
 #define RF_CHANGE_BY_IPS BIT28
 #define RF_CHANGE_BY_INIT       0       // Do not change the RFOff reason. Defined by Bruce, 2008-01-17.
 
-#ifdef ENABLE_DOT11D
 typedef enum
 {
         COUNTRY_CODE_FCC = 0,
@@ -1784,7 +1781,6 @@ typedef enum
         COUNTRY_CODE_MIC,
         COUNTRY_CODE_GLOBAL_DOMAIN
 }country_code_type_t;
-#endif
 
 #define RT_MAX_LD_SLOT_NUM      10
 typedef struct _RT_LINK_DETECT_T{
@@ -1970,12 +1966,8 @@ struct ieee80211_device {
 
         /* map of allowed channels. 0 is dummy */
         // FIXME: remeber to default to a basic channel plan depending of the PHY type
-#ifdef ENABLE_DOT11D
         void* pDot11dInfo;
         bool bGlobalDomain;
-#else
-        int channel_map[MAX_CHANNEL_NUMBER+1];
-#endif
         int rate;       /* current rate */
         int basic_rate;
         //FIXME: pleace callback, see if redundant with softmac_features
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index c8ca9d8ed5d2..1ea8da3655ec 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -44,9 +44,7 @@
 #include <linux/ctype.h>
 
 #include "ieee80211.h"
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
                                         struct sk_buff *skb,
                                         struct ieee80211_rx_stats *rx_stats)
@@ -1599,7 +1597,6 @@ static const char *get_info_element_string(u16 id)
 }
 #endif
 
-#ifdef ENABLE_DOT11D
 static inline void ieee80211_extract_country_ie(
         struct ieee80211_device *ieee,
         struct ieee80211_info_element *info_element,
@@ -1632,7 +1629,6 @@ static inline void ieee80211_extract_country_ie(
         }
 
 }
-#endif
 
 int ieee80211_parse_info_param(struct ieee80211_device *ieee,
                 struct ieee80211_info_element *info_element,
@@ -2086,14 +2082,12 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee,
                                "QoS Error need to parse QOS_PARAMETER IE\n");
                         break;
 
-#ifdef ENABLE_DOT11D
                 case MFIE_TYPE_COUNTRY:
                         IEEE80211_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n",
                                              info_element->len);
                         //printk("=====>Receive <%s> Country IE\n",network->ssid);
                         ieee80211_extract_country_ie(ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP
                         break;
-#endif
 /* TODO */
                 default:
                         IEEE80211_DEBUG_MGMT
@@ -2229,10 +2223,8 @@ static inline int ieee80211_network_init(
 #ifdef THOMAS_TURBO
         network->Turbo_Enable = 0;
 #endif
-#ifdef ENABLE_DOT11D
         network->CountryIeLen = 0;
         memset(network->CountryIeBuf, 0, MAX_IE_LEN);
-#endif
 //Initialize HT parameters
         //ieee80211_ht_initialize(&network->bssht);
         HTInitializeBssDesc(&network->bssht);
@@ -2399,10 +2391,8 @@ static inline void update_network(struct ieee80211_network *dst,
         dst->Turbo_Enable = src->Turbo_Enable;
 #endif
 
-#ifdef ENABLE_DOT11D
         dst->CountryIeLen = src->CountryIeLen;
         memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen);
-#endif
 
         //added by amy for LEAP
         dst->bWithAironetIE = src->bWithAironetIE;
@@ -2470,7 +2460,6 @@ static inline void ieee80211_process_probe_response(
                 return;
         }
 
-#ifdef ENABLE_DOT11D
         // For Asus EeePc request,
         // (1) if wireless adapter receive get any 802.11d country code in AP beacon,
         //         wireless adapter should follow the country code.
@@ -2527,7 +2516,6 @@ static inline void ieee80211_process_probe_response(
                         }
                 }
         }
-#endif
 
         /* The network parsed correctly -- so now we scan our known networks
          * to see if we can find it in our list.
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index bc8c42533693..20f8c347cae4 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -21,9 +21,7 @@
 #include <linux/slab.h>
 #include <linux/version.h>
 #include <asm/uaccess.h>
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 
 u8 rsn_authen_cipher_suite[16][4] = {
         {0x00,0x0F,0xAC,0x00}, //Use group key, //Reserved
@@ -430,10 +428,8 @@ void ieee80211_send_probe_requests(struct ieee80211_device *ieee)
 void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
 {
         short ch = 0;
-#ifdef ENABLE_DOT11D
         u8 channel_map[MAX_CHANNEL_NUMBER+1];
         memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1);
-#endif
         down(&ieee->scan_sem);
 
         while(1)
@@ -443,11 +439,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
                         ch++;
                         if (ch > MAX_CHANNEL_NUMBER)
                                 goto out; /* scan completed */
-#ifdef ENABLE_DOT11D
                 }while(!channel_map[ch]);
-#else
-                }while(!ieee->channel_map[ch]);
-#endif
 
                 /* this function can be called in two situations
                  * 1- We have switched to ad-hoc mode and we are
@@ -471,9 +463,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
                 if (ieee->state == IEEE80211_LINKED)
                         goto out;
                 ieee->set_chan(ieee->dev, ch);
-#ifdef ENABLE_DOT11D
                 if(channel_map[ch] == 1)
-#endif
                 ieee80211_send_probe_requests(ieee);
 
                 /* this prevent excessive time wait when we
@@ -496,10 +486,8 @@ out:
         }
         else{
         ieee->sync_scan_hurryup = 0;
-#ifdef ENABLE_DOT11D
         if(IS_DOT11D_ENABLE(ieee))
                 DOT11D_ScanComplete(ieee);
-#endif
         up(&ieee->scan_sem);
 }
 }
@@ -510,10 +498,8 @@ void ieee80211_softmac_scan_wq(struct work_struct *work)
         struct delayed_work *dwork = container_of(work, struct delayed_work, work);
         struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);
         static short watchdog = 0;
-#ifdef ENABLE_DOT11D
         u8 channel_map[MAX_CHANNEL_NUMBER+1];
         memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1);
-#endif
         if(!ieee->ieee_up)
                 return;
         down(&ieee->scan_sem);
@@ -523,25 +509,16 @@ void ieee80211_softmac_scan_wq(struct work_struct *work)
                 if (watchdog++ > MAX_CHANNEL_NUMBER)
                 {
                 //if current channel is not in channel map, set to default channel.
-                #ifdef ENABLE_DOT11D
-                        if (!channel_map[ieee->current_network.channel]);
-                #else
-                        if (!ieee->channel_map[ieee->current_network.channel]);
-                #endif
+                        if (!channel_map[ieee->current_network.channel]) {
                                 ieee->current_network.channel = 6;
                                 goto out; /* no good chans */
+                        }
                 }
-#ifdef ENABLE_DOT11D
         }while(!channel_map[ieee->current_network.channel]);
-#else
-        }while(!ieee->channel_map[ieee->current_network.channel]);
-#endif
         if (ieee->scanning == 0 )
                 goto out;
         ieee->set_chan(ieee->dev, ieee->current_network.channel);
-#ifdef ENABLE_DOT11D
         if(channel_map[ieee->current_network.channel] == 1)
-#endif
         ieee80211_send_probe_requests(ieee);
 
 
@@ -550,10 +527,8 @@ void ieee80211_softmac_scan_wq(struct work_struct *work)
         up(&ieee->scan_sem);
         return;
 out:
-#ifdef ENABLE_DOT11D
         if(IS_DOT11D_ENABLE(ieee))
                 DOT11D_ScanComplete(ieee);
-#endif
         ieee->actscanning = false;
         watchdog = 0;
         ieee->scanning = 0;
@@ -635,7 +610,6 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee)
 /* called with ieee->lock held */
 void ieee80211_start_scan(struct ieee80211_device *ieee)
 {
-#ifdef ENABLE_DOT11D
         if(IS_DOT11D_ENABLE(ieee) )
         {
                 if(IS_COUNTRY_IE_VALID(ieee))
@@ -643,7 +617,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee)
                         RESET_CIE_WATCHDOG(ieee);
                 }
         }
-#endif
         if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){
                 if (ieee->scanning == 0){
                         ieee->scanning = 1;
@@ -657,7 +630,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee)
 /* called with wx_sem held */
 void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
 {
-#ifdef ENABLE_DOT11D
         if(IS_DOT11D_ENABLE(ieee) )
         {
                 if(IS_COUNTRY_IE_VALID(ieee))
@@ -665,7 +637,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
                         RESET_CIE_WATCHDOG(ieee);
                 }
         }
-#endif
         ieee->sync_scan_hurryup = 0;
         if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
                 ieee80211_softmac_scan_syncro(ieee);
@@ -2390,11 +2361,9 @@ void ieee80211_start_ibss_wq(struct work_struct *work)
         ieee80211_softmac_check_all_nets(ieee);
 
 
-#ifdef ENABLE_DOT11D //if creating an ad-hoc, set its channel to 10 temporarily--this is the requirement for ASUS, not 11D, so disable 11d.
 //      if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK))
         if (ieee->state == IEEE80211_NOLINK)
                 ieee->current_network.channel = 6;
-#endif
         /* if not then the state is not linked. Maybe the user swithced to
          * ad-hoc mode just after being in monitor mode, or just after
          * being very few time in managed mode (so the card have had no
@@ -2483,7 +2452,6 @@ inline void ieee80211_start_ibss(struct ieee80211_device *ieee)
 void ieee80211_start_bss(struct ieee80211_device *ieee)
 {
         unsigned long flags;
-#ifdef ENABLE_DOT11D
         //
         // Ref: 802.11d 11.1.3.3
         // STA shall not start a BSS unless properly formed Beacon frame including a Country IE.
@@ -2495,7 +2463,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee)
                         return;
                 }
         }
-#endif
         /* check if we have already found the net we
          * are interested in (if any).
          * if not (we are disassociated and we are not
@@ -2530,10 +2497,8 @@ void ieee80211_disassociate(struct ieee80211_device *ieee)
 
         if (ieee->data_hard_stop)
                         ieee->data_hard_stop(ieee->dev);
-#ifdef ENABLE_DOT11D
         if(IS_DOT11D_ENABLE(ieee))
                 Dot11d_Reset(ieee);
-#endif
         ieee->state = IEEE80211_NOLINK;
         ieee->is_set_key = false;
         ieee->link_change(ieee->dev);
@@ -2669,11 +2634,7 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)
                         ch++;
                         if (ch > MAX_CHANNEL_NUMBER)
                                 return; /* no channel found */
-#ifdef ENABLE_DOT11D
                 }while(!GET_DOT11D_INFO(ieee)->channel_map[ch]);
-#else
-                }while(!ieee->channel_map[ch]);
-#endif
                 ieee->current_network.channel = ch;
         }
 
@@ -2721,11 +2682,9 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
         for(i = 0; i < 5; i++) {
           ieee->seq_ctrl[i] = 0;
         }
-#ifdef ENABLE_DOT11D
         ieee->pDot11dInfo = kzalloc(sizeof(RT_DOT11D_INFO), GFP_ATOMIC);
         if (!ieee->pDot11dInfo)
                 IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for DOT11D\n");
-#endif
         //added for  AP roaming
         ieee->LinkDetectInfo.SlotNum = 2;
         ieee->LinkDetectInfo.NumRecvBcnInPeriod=0;
@@ -2796,13 +2755,11 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
 void ieee80211_softmac_free(struct ieee80211_device *ieee)
 {
         down(&ieee->wx_sem);
-#ifdef ENABLE_DOT11D
         if(NULL != ieee->pDot11dInfo)
         {
                 kfree(ieee->pDot11dInfo);
                 ieee->pDot11dInfo = NULL;
         }
-#endif
         del_timer_sync(&ieee->associate_timer);
 
         cancel_delayed_work(&ieee->associate_retry_wq);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index f335c258ba84..cb5a3c32974e 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -15,9 +15,7 @@
 
 
 #include "ieee80211.h"
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 /* FIXME: add A freqs */
 
 const long ieee80211_wlan_frequencies[] = {
@@ -63,12 +61,10 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info
 
         }else { /* Set the channel */
 
-#ifdef ENABLE_DOT11D
                 if (!(GET_DOT11D_INFO(ieee)->channel_map)[fwrq->m]) {
                         ret = -EINVAL;
                         goto out;
                 }
-#endif
                 ieee->current_network.channel = fwrq->m;
                 ieee->set_chan(ieee->dev, ieee->current_network.channel);
 
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 81aa2ed226ac..ec7845ecdb7e 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -754,7 +754,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
                 {
                         txb->queue_index = UP2AC(skb->priority);
                 } else {
-                        txb->queue_index = WME_AC_BK;;
+                        txb->queue_index = WME_AC_BK;
                 }
 
 
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 494f180acc26..ae4f2b9d9e8f 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -77,9 +77,7 @@ double __extendsfdf2(float a) {return a;}
 #include "r8192_pm.h"
 #endif
 
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 //set here to open your trace code. //WB
 u32 rt_global_debug_component = \
                         //      COMP_INIT       |
@@ -166,7 +164,6 @@ static struct usb_driver rtl8192_usb_driver = {
 #endif
 };
 
-#ifdef ENABLE_DOT11D
 
 typedef struct _CHANNEL_LIST
 {
@@ -242,9 +239,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
         }
         return;
 }
-#endif
 
-#define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 )
 
 #define         rx_hal_is_cck_rate(_pdrvinfo)\
                         (_pdrvinfo->RxRate == DESC90_RATE1M ||\
@@ -1507,7 +1502,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
         {
                 //
                 // Handle HW Beacon:
-                // We had transfer our beacon frame to host controler at this moment.
+                // We had transfer our beacon frame to host controller at this moment.
                 //
                 //
                 // Caution:
@@ -2203,6 +2198,8 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
 
         priv->rx_urb = kmalloc(sizeof(struct urb *) * (MAX_RX_URB+1),
                                 GFP_KERNEL);
+        if (priv->rx_urb == NULL)
+                return -ENOMEM;
 
 #ifndef JACKSON_NEW_RX
         for(i=0;i<(MAX_RX_URB+1);i++){
@@ -3155,7 +3152,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 short rtl8192_get_channel_map(struct net_device * dev)
 {
         struct r8192_priv *priv = ieee80211_priv(dev);
-#ifdef ENABLE_DOT11D
         if(priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){
                 printk("rtl8180_init:Error channel plan! Set to default.\n");
                 priv->ChannelPlan= 0;
@@ -3163,21 +3159,6 @@ short rtl8192_get_channel_map(struct net_device * dev)
         RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan);
 
         rtl819x_set_channel_map(priv->ChannelPlan, priv);
-#else
-        int ch,i;
-        //Set Default Channel Plan
-        if(!channels){
-                DMESG("No channels, aborting");
-                return -1;
-        }
-        ch=channels;
-        priv->ChannelPlan= 0;//hikaru
-         // set channels 1..14 allowed in given locale
-        for (i=1; i<=14; i++) {
-                (priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01);
-                ch >>= 1;
-        }
-#endif
         return 0;
 }
 
@@ -5085,7 +5066,7 @@ static void rtl8192_query_rxphystatus(
                         //Get Rx snr value in DB
                         tmp_rxsnr =     pofdm_buf->rxsnr_X[i];
                         rx_snrX = (char)(tmp_rxsnr);
-                        //rx_snrX >>= 1;;
+                        //rx_snrX >>= 1;
                         rx_snrX /= 2;
                         priv->stats.rxSNRdB[i] = (long)rx_snrX;
 
diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c
index 25d5c870b0fb..f6408f98ede6 100644
--- a/drivers/staging/rtl8192u/r8192U_wx.c
+++ b/drivers/staging/rtl8192u/r8192U_wx.c
@@ -21,9 +21,7 @@
 #include "r8192U.h"
 #include "r8192U_hw.h"
 
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 
 #define RATE_COUNT 12
 u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000,
@@ -458,11 +456,7 @@ static int rtl8180_wx_get_range(struct net_device *dev,
         for (i = 0, val = 0; i < 14; i++) {
 
                 // Include only legal frequencies for some countries
-#ifdef ENABLE_DOT11D
                 if ((GET_DOT11D_INFO(priv->ieee80211)->channel_map)[i+1]) {
-#else
-                if ((priv->ieee80211->channel_map)[i+1]) {
-#endif
                         range->freq[val].i = i + 1;
                         range->freq[val].m = ieee80211_wlan_frequencies[i] * 100000;
                         range->freq[val].e = 1;
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index a3adaedece9a..41684e8fcf4c 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -6,9 +6,7 @@
 #include "r8192U_dm.h"
 #include "r819xU_firmware_img.h"
 
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
         0,
         0x085c, //2412 1
@@ -1011,7 +1009,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_E
                         break;
         }
 
-        return ret;;
+        return ret;
 
 }
 /******************************************************************************
@@ -1257,13 +1255,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u
 
         RT_TRACE(COMP_CH, "====>%s()====stage:%d, step:%d, channel:%d\n", __FUNCTION__, *stage, *step, channel);
 //      RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel));
-#ifdef ENABLE_DOT11D
         if (!IsLegalChannel(priv->ieee80211, channel))
         {
                 RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel);
                 return true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop.
         }
-#endif
 //FIXME:need to check whether channel is legal or not here.WB
 
 
diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
index 5c888214666e..2aa5deb3af7b 100644
--- a/drivers/staging/rtl8712/TODO
+++ b/drivers/staging/rtl8712/TODO
@@ -3,7 +3,6 @@ TODO:
 - switch to use LIB80211
 - switch to use MAC80211
 - checkpatch.pl fixes - only a few remain
-- sparse fixes
 - switch from large inline firmware file to use the firmware interface
   and add the file to the linux-firmware package.
 
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 831d81e0e429..36eeb5a1b5a5 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -195,10 +195,7 @@ static inline void sleep_schedulable(int ms)
 
 static inline u8 *_malloc(u32 sz)
 {
-        u8 *pbuf;
-
-        pbuf =  kmalloc(sz, GFP_ATOMIC);
-        return pbuf;
+        return  kmalloc(sz, GFP_ATOMIC);
 }
 
 static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)
@@ -220,34 +217,22 @@ static inline void flush_signals_thread(void)
 
 static inline u32 _RND8(u32 sz)
 {
-        u32     val;
-
-        val = ((sz >> 3) + ((sz & 7) ? 1 : 0)) << 3;
-        return val;
+        return ((sz >> 3) + ((sz & 7) ? 1 : 0)) << 3;
 }
 
 static inline u32 _RND128(u32 sz)
 {
-        u32     val;
-
-        val = ((sz >> 7) + ((sz & 127) ? 1 : 0)) << 7;
-        return val;
+        return ((sz >> 7) + ((sz & 127) ? 1 : 0)) << 7;
 }
 
 static inline u32 _RND256(u32 sz)
 {
-        u32     val;
-
-        val = ((sz >> 8) + ((sz & 255) ? 1 : 0)) << 8;
-        return val;
+        return ((sz >> 8) + ((sz & 255) ? 1 : 0)) << 8;
 }
 
 static inline u32 _RND512(u32 sz)
 {
-        u32     val;
-
-        val = ((sz >> 9) + ((sz & 511) ? 1 : 0)) << 9;
-        return val;
+        return ((sz >> 9) + ((sz & 511) ? 1 : 0)) << 9;
 }
 
 #define STRUCT_PACKED __attribute__ ((packed))
diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c
index 9730ae1c58d5..1dc12b7a2f52 100644
--- a/drivers/staging/rtl8712/rtl8712_efuse.c
+++ b/drivers/staging/rtl8712/rtl8712_efuse.c
@@ -428,7 +428,7 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,
                       u16 cnts, u8 *data)
 {
         int i;
-        u8 res = true;;
+        u8 res = true;
 
         if (start_addr > EFUSE_MAX_SIZE)
                 return false;
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 8edc518536f9..88a15049bc2a 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -148,7 +148,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe)
                 case 0x11:
                 case 0x12:
                 case 0x13:
-                        addr = RTL8712_DMA_H2CCMD;;
+                        addr = RTL8712_DMA_H2CCMD;
                         break;
                 default:
                         addr = RTL8712_DMA_BEQ;/*RTL8712_EP_LO;*/
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index b8195e3a72d4..75f1a6bba2f6 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
                                            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                                            0x0, 0x0};
                         datalen = pattrib->pktlen - pattrib->hdrlen;
-                        pframe = pxmitframe->buf_addr + TXDESC_OFFSET;;
+                        pframe = pxmitframe->buf_addr + TXDESC_OFFSET;
                         if (bmcst) {
                                 if (!memcmp(psecuritypriv->XGrptxmickey
                                    [psecuritypriv->XGrpKeyid].skey,
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index f1f0c63e5bbc..a692ee88b9e9 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -527,7 +527,7 @@ error:
 static void r871xu_dev_remove(struct usb_interface *pusb_intf)
 {
         struct net_device *pnetdev = usb_get_intfdata(pusb_intf);
-        struct _adapter *padapter = (struct _adapter *)netdev_priv(pnetdev);
+        struct _adapter *padapter = netdev_priv(pnetdev);
         struct usb_device *udev = interface_to_usbdev(pusb_intf);
 
         if (padapter) {
diff --git a/drivers/staging/sep/Kconfig b/drivers/staging/sep/Kconfig
new file mode 100644
index 000000000000..92bf16667d04
--- /dev/null
+++ b/drivers/staging/sep/Kconfig
@@ -0,0 +1,10 @@
+config DX_SEP
+        tristate "Discretix SEP driver"
+        depends on PCI
+        help
+          Discretix SEP driver; used for the security processor subsystem
+          on bard the Intel Mobile Internet Device.
+
+          The driver's name is sep_driver.
+
+          If unsure, select N.
diff --git a/drivers/staging/sep/Makefile b/drivers/staging/sep/Makefile
new file mode 100644
index 000000000000..628d5f919414
--- /dev/null
+++ b/drivers/staging/sep/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_DX_SEP) := sep_driver.o
+
diff --git a/drivers/staging/sep/TODO b/drivers/staging/sep/TODO
new file mode 100644
index 000000000000..089c2406345e
--- /dev/null
+++ b/drivers/staging/sep/TODO
@@ -0,0 +1,5 @@
+Todo's so far (from Alan Cox)
+- Check whether it can be plugged into any of the kernel crypto API
+  interfaces - Crypto API 'glue' is still not ready to submit
+- Clean up unused ioctls - Needs vendor help
+- Clean up unused fields in ioctl structures - Needs vendor help
diff --git a/drivers/staging/sep/sep_dev.h b/drivers/staging/sep/sep_dev.h
new file mode 100644
index 000000000000..0ffe68cb7140
--- /dev/null
+++ b/drivers/staging/sep/sep_dev.h
@@ -0,0 +1,156 @@
+#ifndef __SEP_DEV_H__
+#define __SEP_DEV_H__
+
+/*
+ *
+ *  sep_dev.h - Security Processor Device Structures
+ *
+ *  Copyright(c) 2009,2010 Intel Corporation. All rights reserved.
+ *  Contributions(c) 2009,2010 Discretix. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; version 2 of the License.
+ *
+ *  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., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *  CONTACTS:
+ *
+ *  Mark Allyn          mark.a.allyn@intel.com
+ *  Jayant Mangalampalli jayant.mangalampalli@intel.com
+ *
+ *  CHANGES
+ *  2010.09.14  upgrade to Medfield
+ */
+
+struct sep_device {
+        /* pointer to pci dev */
+        struct pci_dev *pdev;
+
+        /* character device file */
+        struct cdev sep_cdev;
+        struct cdev sep_daemon_cdev;
+        struct cdev sep_singleton_cdev;
+
+        /* devices (using misc dev) */
+        struct miscdevice miscdev_sep;
+        struct miscdevice miscdev_singleton;
+        struct miscdevice miscdev_daemon;
+
+        /* major / minor numbers of device */
+        dev_t sep_devno;
+        dev_t sep_daemon_devno;
+        dev_t sep_singleton_devno;
+
+        struct mutex sep_mutex;
+        struct mutex ioctl_mutex;
+        spinlock_t snd_rply_lck;
+
+        /* flags to indicate use and lock status of sep */
+        u32 pid_doing_transaction;
+        unsigned long in_use_flags;
+
+        /* request daemon alread open */
+        unsigned long request_daemon_open;
+
+        /* 1 = Moorestown; 0 = Medfield */
+        int mrst;
+
+        /* address of the shared memory allocated during init for SEP driver
+           (coherent alloc) */
+        dma_addr_t shared_bus;
+        size_t shared_size;
+        void *shared_addr;
+
+        /* restricted access region (coherent alloc) */
+        dma_addr_t rar_bus;
+        size_t rar_size;
+        void *rar_addr;
+
+        /* Firmware regions; cache is at rar for Moorestown and
+           resident is at rar for Medfield */
+        dma_addr_t cache_bus;
+        size_t cache_size;
+        void *cache_addr;
+
+        dma_addr_t resident_bus;
+        size_t resident_size;
+        void *resident_addr;
+
+        /* sep's scratchpad */
+        dma_addr_t dcache_bus;
+        size_t dcache_size;
+        void *dcache_addr;
+
+        /* Only used on Medfield */
+        dma_addr_t extapp_bus;
+        size_t extapp_size;
+        void *extapp_addr;
+
+        /* start address of the access to the SEP registers from driver */
+        dma_addr_t reg_physical_addr;
+        dma_addr_t reg_physical_end;
+        void __iomem *reg_addr;
+
+        /* wait queue head (event) of the driver */
+        wait_queue_head_t event;
+        wait_queue_head_t event_request_daemon;
+        wait_queue_head_t event_mmap;
+
+        struct sep_caller_id_entry
+                caller_id_table[SEP_CALLER_ID_TABLE_NUM_ENTRIES];
+
+        /* access flag for singleton device */
+        unsigned long singleton_access_flag;
+
+        /* transaction counter that coordinates the
+           transactions between SEP and HOST */
+        unsigned long send_ct;
+        /* counter for the messages from sep */
+        unsigned long reply_ct;
+        /* counter for the number of bytes allocated in the pool for the
+           current transaction */
+        long data_pool_bytes_allocated;
+
+        u32 num_of_data_allocations;
+
+        /* number of the lli tables created in the current transaction */
+        u32     num_lli_tables_created;
+
+        /* number of data control blocks */
+        u32 nr_dcb_creat;
+
+        struct sep_dma_resource dma_res_arr[SEP_MAX_NUM_SYNC_DMA_OPS];
+
+};
+
+static inline void sep_write_reg(struct sep_device *dev, int reg, u32 value)
+{
+        void __iomem *addr = dev->reg_addr + reg;
+        writel(value, addr);
+}
+
+static inline u32 sep_read_reg(struct sep_device *dev, int reg)
+{
+        void __iomem *addr = dev->reg_addr + reg;
+        return readl(addr);
+}
+
+/* wait for SRAM write complete(indirect write */
+static inline void sep_wait_sram_write(struct sep_device *dev)
+{
+        u32 reg_val;
+        do {
+                reg_val = sep_read_reg(dev, HW_SRAM_DATA_READY_REG_ADDR);
+        } while (!(reg_val & 1));
+}
+
+
+#endif
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
new file mode 100644
index 000000000000..ac5d56943d4b
--- /dev/null
+++ b/drivers/staging/sep/sep_driver.c
@@ -0,0 +1,3577 @@
+/*
+ *
+ *  sep_driver.c - Security Processor Driver main group of functions
+ *
+ *  Copyright(c) 2009,2010 Intel Corporation. All rights reserved.
+ *  Contributions(c) 2009,2010 Discretix. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; version 2 of the License.
+ *
+ *  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., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *  CONTACTS:
+ *
+ *  Mark Allyn          mark.a.allyn@intel.com
+ *  Jayant Mangalampalli jayant.mangalampalli@intel.com
+ *
+ *  CHANGES:
+ *
+ *  2009.06.26  Initial publish
+ *  2010.09.14  Upgrade to Medfield
+ *
+ */
+#define DEBUG
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <linux/kdev_t.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/poll.h>
+#include <linux/wait.h>
+#include <linux/pci.h>
+#include <linux/firmware.h>
+#include <linux/slab.h>
+#include <linux/ioctl.h>
+#include <asm/current.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/pagemap.h>
+#include <asm/cacheflush.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/rar_register.h>
+
+#include "../memrar/memrar.h"
+
+#include "sep_driver_hw_defs.h"
+#include "sep_driver_config.h"
+#include "sep_driver_api.h"
+#include "sep_dev.h"
+
+/*----------------------------------------
+        DEFINES
+-----------------------------------------*/
+
+#define SEP_RAR_IO_MEM_REGION_SIZE 0x40000
+
+/*--------------------------------------------
+        GLOBAL variables
+--------------------------------------------*/
+
+/* Keep this a single static object for now to keep the conversion easy */
+
+static struct sep_device *sep_dev;
+
+/**
+ *      sep_load_firmware - copy firmware cache/resident
+ *      @sep: pointer to struct sep_device we are loading
+ *
+ *      This functions copies the cache and resident from their source
+ *      location into destination shared memory.
+ */
+static int sep_load_firmware(struct sep_device *sep)
+{
+        const struct firmware *fw;
+        char *cache_name = "cache.image.bin";
+        char *res_name = "resident.image.bin";
+        char *extapp_name = "extapp.image.bin";
+        int error ;
+        unsigned long work1, work2, work3;
+
+        /* Set addresses and load resident */
+        sep->resident_bus = sep->rar_bus;
+        sep->resident_addr = sep->rar_addr;
+
+        error = request_firmware(&fw, res_name, &sep->pdev->dev);
+        if (error) {
+                dev_warn(&sep->pdev->dev, "can't request resident fw\n");
+                return error;
+        }
+
+        memcpy(sep->resident_addr, (void *)fw->data, fw->size);
+        sep->resident_size = fw->size;
+        release_firmware(fw);
+
+        dev_dbg(&sep->pdev->dev, "resident virtual is %p\n",
+                sep->resident_addr);
+        dev_dbg(&sep->pdev->dev, "resident bus is %lx\n",
+                (unsigned long)sep->resident_bus);
+        dev_dbg(&sep->pdev->dev, "resident size is %08zx\n",
+                sep->resident_size);
+
+        /* Set addresses for dcache (no loading needed) */
+        work1 = (unsigned long)sep->resident_bus;
+        work2 = (unsigned long)sep->resident_size;
+        work3 = (work1 + work2 + (1024 * 4)) & 0xfffff000;
+        sep->dcache_bus = (dma_addr_t)work3;
+
+        work1 = (unsigned long)sep->resident_addr;
+        work2 = (unsigned long)sep->resident_size;
+        work3 = (work1 + work2 + (1024 * 4)) & 0xfffff000;
+        sep->dcache_addr = (void *)work3;
+
+        sep->dcache_size = 1024 * 128;
+
+        /* Set addresses and load cache */
+        sep->cache_bus = sep->dcache_bus + sep->dcache_size;
+        sep->cache_addr = sep->dcache_addr + sep->dcache_size;
+
+        error = request_firmware(&fw, cache_name, &sep->pdev->dev);
+        if (error) {
+                dev_warn(&sep->pdev->dev, "Unable to request cache firmware\n");
+                return error;
+        }
+
+        memcpy(sep->cache_addr, (void *)fw->data, fw->size);
+        sep->cache_size = fw->size;
+        release_firmware(fw);
+
+        dev_dbg(&sep->pdev->dev, "cache virtual is %p\n",
+                sep->cache_addr);
+        dev_dbg(&sep->pdev->dev, "cache bus is %08lx\n",
+                (unsigned long)sep->cache_bus);
+        dev_dbg(&sep->pdev->dev, "cache size is %08zx\n",
+                sep->cache_size);
+
+        /* Set addresses and load extapp */
+        sep->extapp_bus = sep->cache_bus + (1024 * 370);
+        sep->extapp_addr = sep->cache_addr + (1024 * 370);
+
+        error = request_firmware(&fw, extapp_name, &sep->pdev->dev);
+        if (error) {
+                dev_warn(&sep->pdev->dev, "Unable to request extapp firmware\n");
+                return error;
+        }
+
+        memcpy(sep->extapp_addr, (void *)fw->data, fw->size);
+        sep->extapp_size = fw->size;
+        release_firmware(fw);
+
+        dev_dbg(&sep->pdev->dev, "extapp virtual is %p\n",
+                sep->extapp_addr);
+        dev_dbg(&sep->pdev->dev, "extapp bus is %08llx\n",
+                (unsigned long long)sep->extapp_bus);
+        dev_dbg(&sep->pdev->dev, "extapp size is %08zx\n",
+                sep->extapp_size);
+
+        return error;
+}
+
+MODULE_FIRMWARE("sep/cache.image.bin");
+MODULE_FIRMWARE("sep/resident.image.bin");
+MODULE_FIRMWARE("sep/extapp.image.bin");
+
+/**
+ *      sep_dump_message - dump the message that is pending
+ *      @sep: SEP device
+ */
+static void sep_dump_message(struct sep_device *sep)
+{
+        int count;
+        u32 *p = sep->shared_addr;
+        for (count = 0; count < 12 * 4; count += 4)
+                dev_dbg(&sep->pdev->dev, "Word %d of the message is %x\n",
+                                                                count, *p++);
+}
+
+/**
+ *      sep_map_and_alloc_shared_area - allocate shared block
+ *      @sep: security processor
+ *      @size: size of shared area
+ */
+static int sep_map_and_alloc_shared_area(struct sep_device *sep)
+{
+        sep->shared_addr = dma_alloc_coherent(&sep->pdev->dev,
+                sep->shared_size,
+                &sep->shared_bus, GFP_KERNEL);
+
+        if (!sep->shared_addr) {
+                dev_warn(&sep->pdev->dev,
+                        "shared memory dma_alloc_coherent failed\n");
+                return -ENOMEM;
+        }
+        dev_dbg(&sep->pdev->dev,
+                "shared_addr %zx bytes @%p (bus %llx)\n",
+                                sep->shared_size, sep->shared_addr,
+                                (unsigned long long)sep->shared_bus);
+        return 0;
+}
+
+/**
+ *      sep_unmap_and_free_shared_area - free shared block
+ *      @sep: security processor
+ */
+static void sep_unmap_and_free_shared_area(struct sep_device *sep)
+{
+        dev_dbg(&sep->pdev->dev, "shared area unmap and free\n");
+        dma_free_coherent(&sep->pdev->dev, sep->shared_size,
+                                sep->shared_addr, sep->shared_bus);
+}
+
+/**
+ *      sep_shared_bus_to_virt - convert bus/virt addresses
+ *      @sep: pointer to struct sep_device
+ *      @bus_address: address to convert
+ *
+ *      Returns virtual address inside the shared area according
+ *      to the bus address.
+ */
+static void *sep_shared_bus_to_virt(struct sep_device *sep,
+                                                dma_addr_t bus_address)
+{
+        return sep->shared_addr + (bus_address - sep->shared_bus);
+}
+
+/**
+ *      open function for the singleton driver
+ *      @inode_ptr struct inode *
+ *      @file_ptr struct file *
+ *
+ *      Called when the user opens the singleton device interface
+ */
+static int sep_singleton_open(struct inode *inode_ptr, struct file *file_ptr)
+{
+        int error = 0;
+        struct sep_device *sep;
+
+        /*
+         * Get the SEP device structure and use it for the
+         * private_data field in filp for other methods
+         */
+        sep = sep_dev;
+
+        file_ptr->private_data = sep;
+
+        dev_dbg(&sep->pdev->dev, "Singleton open for pid %d\n", current->pid);
+
+        dev_dbg(&sep->pdev->dev, "calling test and set for singleton 0\n");
+        if (test_and_set_bit(0, &sep->singleton_access_flag)) {
+                error = -EBUSY;
+                goto end_function;
+        }
+
+        dev_dbg(&sep->pdev->dev, "sep_singleton_open end\n");
+end_function:
+        return error;
+}
+
+/**
+ *      sep_open - device open method
+ *      @inode: inode of SEP device
+ *      @filp: file handle to SEP device
+ *
+ *      Open method for the SEP device. Called when userspace opens
+ *      the SEP device node.
+ *
+ *      Returns zero on success otherwise an error code.
+ */
+static int sep_open(struct inode *inode, struct file *filp)
+{
+        struct sep_device *sep;
+
+        /*
+         * Get the SEP device structure and use it for the
+         * private_data field in filp for other methods
+         */
+        sep = sep_dev;
+        filp->private_data = sep;
+
+        dev_dbg(&sep->pdev->dev, "Open for pid %d\n", current->pid);
+
+        /* Anyone can open; locking takes place at transaction level */
+        return 0;
+}
+
+/**
+ *      sep_singleton_release - close a SEP singleton device
+ *      @inode: inode of SEP device
+ *      @filp: file handle being closed
+ *
+ *      Called on the final close of a SEP device. As the open protects against
+ *      multiple simultaenous opens that means this method is called when the
+ *      final reference to the open handle is dropped.
+ */
+static int sep_singleton_release(struct inode *inode, struct file *filp)
+{
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "Singleton release for pid %d\n",
+                                                        current->pid);
+        clear_bit(0, &sep->singleton_access_flag);
+        return 0;
+}
+
+/**
+ *      sep_request_daemonopen - request daemon open method
+ *      @inode: inode of SEP device
+ *      @filp: file handle to SEP device
+ *
+ *      Open method for the SEP request daemon. Called when
+ *      request daemon in userspace opens the SEP device node.
+ *
+ *      Returns zero on success otherwise an error code.
+ */
+static int sep_request_daemon_open(struct inode *inode, struct file *filp)
+{
+        struct sep_device *sep = sep_dev;
+        int error = 0;
+
+        filp->private_data = sep;
+
+        dev_dbg(&sep->pdev->dev, "Request daemon open for pid %d\n",
+                current->pid);
+
+        /* There is supposed to be only one request daemon */
+        dev_dbg(&sep->pdev->dev, "calling test and set for req_dmon open 0\n");
+        if (test_and_set_bit(0, &sep->request_daemon_open))
+                error = -EBUSY;
+        return error;
+}
+
+/**
+ *      sep_request_daemon_release - close a SEP daemon
+ *      @inode: inode of SEP device
+ *      @filp: file handle being closed
+ *
+ *      Called on the final close of a SEP daemon.
+ */
+static int sep_request_daemon_release(struct inode *inode, struct file *filp)
+{
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "Reques daemon release for pid %d\n",
+                current->pid);
+
+        /* Clear the request_daemon_open flag */
+        clear_bit(0, &sep->request_daemon_open);
+        return 0;
+}
+
+/**
+ *      sep_req_daemon_send_reply_command_handler - poke the SEP
+ *      @sep: struct sep_device *
+ *
+ *      This function raises interrupt to SEPm that signals that is has a
+ *      new command from HOST
+ */
+static int sep_req_daemon_send_reply_command_handler(struct sep_device *sep)
+{
+        unsigned long lck_flags;
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_req_daemon_send_reply_command_handler start\n");
+
+        sep_dump_message(sep);
+
+        /* Counters are lockable region */
+        spin_lock_irqsave(&sep->snd_rply_lck, lck_flags);
+        sep->send_ct++;
+        sep->reply_ct++;
+
+        /* Send the interrupt to SEP */
+        sep_write_reg(sep, HW_HOST_HOST_SEP_GPR2_REG_ADDR, sep->send_ct);
+        sep->send_ct++;
+
+        spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_req_daemon_send_reply send_ct %lx reply_ct %lx\n",
+                sep->send_ct, sep->reply_ct);
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_req_daemon_send_reply_command_handler end\n");
+
+        return 0;
+}
+
+
+/**
+ *      sep_free_dma_table_data_handler - free DMA table
+ *      @sep: pointere to struct sep_device
+ *
+ *      Handles the request to  free DMA table for synchronic actions
+ */
+static int sep_free_dma_table_data_handler(struct sep_device *sep)
+{
+        int count;
+        int dcb_counter;
+        /* Pointer to the current dma_resource struct */
+        struct sep_dma_resource *dma;
+
+        dev_dbg(&sep->pdev->dev, "sep_free_dma_table_data_handler start\n");
+
+        for (dcb_counter = 0; dcb_counter < sep->nr_dcb_creat; dcb_counter++) {
+                dma = &sep->dma_res_arr[dcb_counter];
+
+                /* Unmap and free input map array */
+                if (dma->in_map_array) {
+                        for (count = 0; count < dma->in_num_pages; count++) {
+                                dma_unmap_page(&sep->pdev->dev,
+                                        dma->in_map_array[count].dma_addr,
+                                        dma->in_map_array[count].size,
+                                        DMA_TO_DEVICE);
+                        }
+                        kfree(dma->in_map_array);
+                }
+
+                /* Unmap output map array, DON'T free it yet */
+                if (dma->out_map_array) {
+                        for (count = 0; count < dma->out_num_pages; count++) {
+                                dma_unmap_page(&sep->pdev->dev,
+                                        dma->out_map_array[count].dma_addr,
+                                        dma->out_map_array[count].size,
+                                        DMA_FROM_DEVICE);
+                        }
+                        kfree(dma->out_map_array);
+                }
+
+                /* Free page cache for output */
+                if (dma->in_page_array) {
+                        for (count = 0; count < dma->in_num_pages; count++) {
+                                flush_dcache_page(dma->in_page_array[count]);
+                                page_cache_release(dma->in_page_array[count]);
+                        }
+                        kfree(dma->in_page_array);
+                }
+
+                if (dma->out_page_array) {
+                        for (count = 0; count < dma->out_num_pages; count++) {
+                                if (!PageReserved(dma->out_page_array[count]))
+                                        SetPageDirty(dma->out_page_array[count]);
+                                flush_dcache_page(dma->out_page_array[count]);
+                                page_cache_release(dma->out_page_array[count]);
+                        }
+                        kfree(dma->out_page_array);
+                }
+
+                /* Reset all the values */
+                dma->in_page_array = NULL;
+                dma->out_page_array = NULL;
+                dma->in_num_pages = 0;
+                dma->out_num_pages = 0;
+                dma->in_map_array = NULL;
+                dma->out_map_array = NULL;
+                dma->in_map_num_entries = 0;
+                dma->out_map_num_entries = 0;
+        }
+
+        sep->nr_dcb_creat = 0;
+        sep->num_lli_tables_created = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_free_dma_table_data_handler end\n");
+        return 0;
+}
+
+/**
+ *      sep_request_daemon_mmap - maps the shared area to user space
+ *      @filp: pointer to struct file
+ *      @vma: pointer to vm_area_struct
+ *
+ *      Called by the kernel when the daemon attempts an mmap() syscall
+ *      using our handle.
+ */
+static int sep_request_daemon_mmap(struct file  *filp,
+        struct vm_area_struct  *vma)
+{
+        struct sep_device *sep = filp->private_data;
+        dma_addr_t bus_address;
+        int error = 0;
+
+        dev_dbg(&sep->pdev->dev, "daemon mmap start\n");
+
+        if ((vma->vm_end - vma->vm_start) > SEP_DRIVER_MMMAP_AREA_SIZE) {
+                error = -EINVAL;
+                goto end_function;
+        }
+
+        /* Get physical address */
+        bus_address = sep->shared_bus;
+
+        dev_dbg(&sep->pdev->dev, "bus_address is %08lx\n",
+                                        (unsigned long)bus_address);
+
+        if (remap_pfn_range(vma, vma->vm_start, bus_address >> PAGE_SHIFT,
+                vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
+
+                dev_warn(&sep->pdev->dev, "remap_page_range failed\n");
+                error = -EAGAIN;
+                goto end_function;
+        }
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "daemon mmap end\n");
+        return error;
+}
+
+/**
+ *      sep_request_daemon_poll - poll implementation
+ *      @sep: struct sep_device * for current SEP device
+ *      @filp: struct file * for open file
+ *      @wait: poll_table * for poll
+ *
+ *      Called when our device is part of a poll() or select() syscall
+ */
+static unsigned int sep_request_daemon_poll(struct file *filp,
+        poll_table  *wait)
+{
+        u32     mask = 0;
+        /* GPR2 register */
+        u32     retval2;
+        unsigned long lck_flags;
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "daemon poll: start\n");
+
+        poll_wait(filp, &sep->event_request_daemon, wait);
+
+        dev_dbg(&sep->pdev->dev, "daemon poll: send_ct is %lx reply ct is %lx\n",
+                                                sep->send_ct, sep->reply_ct);
+
+        spin_lock_irqsave(&sep->snd_rply_lck, lck_flags);
+        /* Check if the data is ready */
+        if (sep->send_ct == sep->reply_ct) {
+                spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+
+                retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR2_REG_ADDR);
+                dev_dbg(&sep->pdev->dev,
+                        "daemon poll: data check (GPR2) is %x\n", retval2);
+
+                /* Check if PRINT request */
+                if ((retval2 >> 30) & 0x1) {
+                        dev_dbg(&sep->pdev->dev, "daemon poll: PRINTF request in\n");
+                        mask |= POLLIN;
+                        goto end_function;
+                }
+                /* Check if NVS request */
+                if (retval2 >> 31) {
+                        dev_dbg(&sep->pdev->dev, "daemon poll: NVS request in\n");
+                        mask |= POLLPRI | POLLWRNORM;
+                }
+        } else {
+                spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+                dev_dbg(&sep->pdev->dev,
+                        "daemon poll: no reply received; returning 0\n");
+                mask = 0;
+        }
+end_function:
+        dev_dbg(&sep->pdev->dev, "daemon poll: exit\n");
+        return mask;
+}
+
+/**
+ *      sep_release - close a SEP device
+ *      @inode: inode of SEP device
+ *      @filp: file handle being closed
+ *
+ *      Called on the final close of a SEP device.
+ */
+static int sep_release(struct inode *inode, struct file *filp)
+{
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "Release for pid %d\n", current->pid);
+
+        mutex_lock(&sep->sep_mutex);
+        /* Is this the process that has a transaction open?
+         * If so, lets reset pid_doing_transaction to 0 and
+         * clear the in use flags, and then wake up sep_event
+         * so that other processes can do transactions
+         */
+        dev_dbg(&sep->pdev->dev, "waking up event and mmap_event\n");
+        if (sep->pid_doing_transaction == current->pid) {
+                clear_bit(SEP_MMAP_LOCK_BIT, &sep->in_use_flags);
+                clear_bit(SEP_SEND_MSG_LOCK_BIT, &sep->in_use_flags);
+                sep_free_dma_table_data_handler(sep);
+                wake_up(&sep->event);
+                sep->pid_doing_transaction = 0;
+        }
+
+        mutex_unlock(&sep->sep_mutex);
+        return 0;
+}
+
+/**
+ *      sep_mmap -  maps the shared area to user space
+ *      @filp: pointer to struct file
+ *      @vma: pointer to vm_area_struct
+ *
+ *      Called on an mmap of our space via the normal SEP device
+ */
+static int sep_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        dma_addr_t bus_addr;
+        struct sep_device *sep = filp->private_data;
+        unsigned long error = 0;
+
+        dev_dbg(&sep->pdev->dev, "mmap start\n");
+
+        /* Set the transaction busy (own the device) */
+        wait_event_interruptible(sep->event,
+                test_and_set_bit(SEP_MMAP_LOCK_BIT,
+                &sep->in_use_flags) == 0);
+
+        if (signal_pending(current)) {
+                error = -EINTR;
+                goto end_function_with_error;
+        }
+        /*
+         * The pid_doing_transaction indicates that this process
+         * now owns the facilities to performa a transaction with
+         * the SEP. While this process is performing a transaction,
+         * no other process who has the SEP device open can perform
+         * any transactions. This method allows more than one process
+         * to have the device open at any given time, which provides
+         * finer granularity for device utilization by multiple
+         * processes.
+         */
+        mutex_lock(&sep->sep_mutex);
+        sep->pid_doing_transaction = current->pid;
+        mutex_unlock(&sep->sep_mutex);
+
+        /* Zero the pools and the number of data pool alocation pointers */
+        sep->data_pool_bytes_allocated = 0;
+        sep->num_of_data_allocations = 0;
+
+        /*
+         * Check that the size of the mapped range is as the size of the message
+         * shared area
+         */
+        if ((vma->vm_end - vma->vm_start) > SEP_DRIVER_MMMAP_AREA_SIZE) {
+                error = -EINVAL;
+                goto end_function_with_error;
+        }
+
+        dev_dbg(&sep->pdev->dev, "shared_addr is %p\n", sep->shared_addr);
+
+        /* Get bus address */
+        bus_addr = sep->shared_bus;
+
+        dev_dbg(&sep->pdev->dev,
+                "bus_address is %lx\n", (unsigned long)bus_addr);
+
+        if (remap_pfn_range(vma, vma->vm_start, bus_addr >> PAGE_SHIFT,
+                vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
+                dev_warn(&sep->pdev->dev, "remap_page_range failed\n");
+                error = -EAGAIN;
+                goto end_function_with_error;
+        }
+        dev_dbg(&sep->pdev->dev, "mmap end\n");
+        goto end_function;
+
+end_function_with_error:
+        /* Clear the bit */
+        clear_bit(SEP_MMAP_LOCK_BIT, &sep->in_use_flags);
+        mutex_lock(&sep->sep_mutex);
+        sep->pid_doing_transaction = 0;
+        mutex_unlock(&sep->sep_mutex);
+
+        /* Raise event for stuck contextes */
+
+        dev_warn(&sep->pdev->dev, "mmap error - waking up event\n");
+        wake_up(&sep->event);
+
+end_function:
+        return error;
+}
+
+/**
+ *      sep_poll - poll handler
+ *      @filp: pointer to struct file
+ *      @wait: pointer to poll_table
+ *
+ *      Called by the OS when the kernel is asked to do a poll on
+ *      a SEP file handle.
+ */
+static unsigned int sep_poll(struct file *filp, poll_table *wait)
+{
+        u32 mask = 0;
+        u32 retval = 0;
+        u32 retval2 = 0;
+        unsigned long lck_flags;
+
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "poll: start\n");
+
+        /* Am I the process that owns the transaction? */
+        mutex_lock(&sep->sep_mutex);
+        if (current->pid != sep->pid_doing_transaction) {
+                dev_warn(&sep->pdev->dev, "poll; wrong pid\n");
+                mask = POLLERR;
+                mutex_unlock(&sep->sep_mutex);
+                goto end_function;
+        }
+        mutex_unlock(&sep->sep_mutex);
+
+        /* Check if send command or send_reply were activated previously */
+        if (!test_bit(SEP_SEND_MSG_LOCK_BIT, &sep->in_use_flags)) {
+                dev_warn(&sep->pdev->dev, "poll; lock bit set\n");
+                mask = POLLERR;
+                goto end_function;
+        }
+
+        /* Add the event to the polling wait table */
+        dev_dbg(&sep->pdev->dev, "poll: calling wait sep_event\n");
+
+        poll_wait(filp, &sep->event, wait);
+
+        dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n",
+                sep->send_ct, sep->reply_ct);
+
+        /* Check if error occured during poll */
+        retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+        if (retval2 != 0x0) {
+                dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2);
+                mask |= POLLERR;
+                goto end_function;
+        }
+
+        spin_lock_irqsave(&sep->snd_rply_lck, lck_flags);
+
+        if (sep->send_ct == sep->reply_ct) {
+                spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+                retval = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR2_REG_ADDR);
+                dev_dbg(&sep->pdev->dev, "poll: data ready check (GPR2)  %x\n",
+                        retval);
+
+                /* Check if printf request  */
+                if ((retval >> 30) & 0x1) {
+                        dev_dbg(&sep->pdev->dev, "poll: SEP printf request\n");
+                        wake_up(&sep->event_request_daemon);
+                        goto end_function;
+                }
+
+                /* Check if the this is SEP reply or request */
+                if (retval >> 31) {
+                        dev_dbg(&sep->pdev->dev, "poll: SEP request\n");
+                        wake_up(&sep->event_request_daemon);
+                } else {
+                        dev_dbg(&sep->pdev->dev, "poll: normal return\n");
+                        /* In case it is again by send_reply_comand */
+                        clear_bit(SEP_SEND_MSG_LOCK_BIT, &sep->in_use_flags);
+                        sep_dump_message(sep);
+                        dev_dbg(&sep->pdev->dev,
+                                "poll; SEP reply POLLIN | POLLRDNORM\n");
+                        mask |= POLLIN | POLLRDNORM;
+                }
+        } else {
+                spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+                dev_dbg(&sep->pdev->dev,
+                        "poll; no reply received; returning mask of 0\n");
+                mask = 0;
+        }
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "poll: end\n");
+        return mask;
+}
+
+/**
+ *      sep_time_address - address in SEP memory of time
+ *      @sep: SEP device we want the address from
+ *
+ *      Return the address of the two dwords in memory used for time
+ *      setting.
+ */
+static u32 *sep_time_address(struct sep_device *sep)
+{
+        return sep->shared_addr + SEP_DRIVER_SYSTEM_TIME_MEMORY_OFFSET_IN_BYTES;
+}
+
+/**
+ *      sep_set_time - set the SEP time
+ *      @sep: the SEP we are setting the time for
+ *
+ *      Calculates time and sets it at the predefined address.
+ *      Called with the SEP mutex held.
+ */
+static unsigned long sep_set_time(struct sep_device *sep)
+{
+        struct timeval time;
+        u32 *time_addr; /* Address of time as seen by the kernel */
+
+
+        dev_dbg(&sep->pdev->dev, "sep_set_time start\n");
+
+        do_gettimeofday(&time);
+
+        /* Set value in the SYSTEM MEMORY offset */
+        time_addr = sep_time_address(sep);
+
+        time_addr[0] = SEP_TIME_VAL_TOKEN;
+        time_addr[1] = time.tv_sec;
+
+        dev_dbg(&sep->pdev->dev, "time.tv_sec is %lu\n", time.tv_sec);
+        dev_dbg(&sep->pdev->dev, "time_addr is %p\n", time_addr);
+        dev_dbg(&sep->pdev->dev, "sep->shared_addr is %p\n", sep->shared_addr);
+
+        return time.tv_sec;
+}
+
+/**
+ *      sep_set_caller_id_handler - insert caller id entry
+ *      @sep: SEP device
+ *      @arg: pointer to struct caller_id_struct
+ *
+ *      Inserts the data into the caller id table. Note that this function
+ *      falls under the ioctl lock
+ */
+static int sep_set_caller_id_handler(struct sep_device *sep, unsigned long arg)
+{
+        void __user *hash;
+        int   error = 0;
+        int   i;
+        struct caller_id_struct command_args;
+
+        dev_dbg(&sep->pdev->dev, "sep_set_caller_id_handler start\n");
+
+        for (i = 0; i < SEP_CALLER_ID_TABLE_NUM_ENTRIES; i++) {
+                if (sep->caller_id_table[i].pid == 0)
+                        break;
+        }
+
+        if (i == SEP_CALLER_ID_TABLE_NUM_ENTRIES) {
+                dev_warn(&sep->pdev->dev, "no more caller id entries left\n");
+                dev_warn(&sep->pdev->dev, "maximum number is %d\n",
+                                        SEP_CALLER_ID_TABLE_NUM_ENTRIES);
+                error = -EUSERS;
+                goto end_function;
+        }
+
+        /* Copy the data */
+        if (copy_from_user(&command_args, (void __user *)arg,
+                sizeof(command_args))) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        hash = (void __user *)(unsigned long)command_args.callerIdAddress;
+
+        if (!command_args.pid || !command_args.callerIdSizeInBytes) {
+                error = -EINVAL;
+                goto end_function;
+        }
+
+        dev_dbg(&sep->pdev->dev, "pid is %x\n", command_args.pid);
+        dev_dbg(&sep->pdev->dev, "callerIdSizeInBytes is %x\n",
+                command_args.callerIdSizeInBytes);
+
+        if (command_args.callerIdSizeInBytes >
+                                        SEP_CALLER_ID_HASH_SIZE_IN_BYTES) {
+                error = -EMSGSIZE;
+                goto end_function;
+        }
+
+        sep->caller_id_table[i].pid = command_args.pid;
+
+        if (copy_from_user(sep->caller_id_table[i].callerIdHash,
+                hash, command_args.callerIdSizeInBytes))
+                error = -EFAULT;
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_set_caller_id_handler end\n");
+        return error;
+}
+
+/**
+ *      sep_set_current_caller_id - set the caller id
+ *      @sep: pointer to struct_sep_device
+ *
+ *      Set the caller ID (if it exists) to the SEP. Note that this
+ *      function falls under the ioctl lock
+ */
+static int sep_set_current_caller_id(struct sep_device *sep)
+{
+        int i;
+        u32 *hash_buf_ptr;
+
+        dev_dbg(&sep->pdev->dev, "sep_set_current_caller_id start\n");
+        dev_dbg(&sep->pdev->dev, "current process is %d\n", current->pid);
+
+        /* Zero the previous value */
+        memset(sep->shared_addr + SEP_CALLER_ID_OFFSET_BYTES,
+                                        0, SEP_CALLER_ID_HASH_SIZE_IN_BYTES);
+
+        for (i = 0; i < SEP_CALLER_ID_TABLE_NUM_ENTRIES; i++) {
+                if (sep->caller_id_table[i].pid == current->pid) {
+                        dev_dbg(&sep->pdev->dev, "Caller Id found\n");
+
+                        memcpy(sep->shared_addr + SEP_CALLER_ID_OFFSET_BYTES,
+                                (void *)(sep->caller_id_table[i].callerIdHash),
+                                SEP_CALLER_ID_HASH_SIZE_IN_BYTES);
+                        break;
+                }
+        }
+        /* Ensure data is in little endian */
+        hash_buf_ptr = (u32 *)sep->shared_addr +
+                SEP_CALLER_ID_OFFSET_BYTES;
+
+        for (i = 0; i < SEP_CALLER_ID_HASH_SIZE_IN_WORDS; i++)
+                hash_buf_ptr[i] = cpu_to_le32(hash_buf_ptr[i]);
+
+        dev_dbg(&sep->pdev->dev, "sep_set_current_caller_id end\n");
+        return 0;
+}
+
+/**
+ *      sep_send_command_handler - kick off a command
+ *      @sep: SEP being signalled
+ *
+ *      This function raises interrupt to SEP that signals that is has a new
+ *      command from the host
+ *
+ *      Note that this function does fall under the ioctl lock
+ */
+static int sep_send_command_handler(struct sep_device *sep)
+{
+        unsigned long lck_flags;
+        int error = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_send_command_handler start\n");
+
+        if (test_and_set_bit(SEP_SEND_MSG_LOCK_BIT, &sep->in_use_flags)) {
+                error = -EPROTO;
+                goto end_function;
+        }
+        sep_set_time(sep);
+
+        sep_set_current_caller_id(sep);
+
+        sep_dump_message(sep);
+
+        /* Update counter */
+        spin_lock_irqsave(&sep->snd_rply_lck, lck_flags);
+        sep->send_ct++;
+        spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_send_command_handler send_ct %lx reply_ct %lx\n",
+                                                sep->send_ct, sep->reply_ct);
+
+        /* Send interrupt to SEP */
+        sep_write_reg(sep, HW_HOST_HOST_SEP_GPR0_REG_ADDR, 0x2);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_send_command_handler end\n");
+        return error;
+}
+
+/**
+ *      sep_allocate_data_pool_memory_handler -allocate pool memory
+ *      @sep: pointer to struct sep_device
+ *      @arg: pointer to struct alloc_struct
+ *
+ *      This function handles the allocate data pool memory request
+ *      This function returns calculates the bus address of the
+ *      allocated memory, and the offset of this area from the mapped address.
+ *      Therefore, the FVOs in user space can calculate the exact virtual
+ *      address of this allocated memory
+ */
+static int sep_allocate_data_pool_memory_handler(struct sep_device *sep,
+        unsigned long arg)
+{
+        int error = 0;
+        struct alloc_struct command_args;
+
+        /* Holds the allocated buffer address in the system memory pool */
+        u32 *token_addr;
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_allocate_data_pool_memory_handler start\n");
+
+        if (copy_from_user(&command_args, (void __user *)arg,
+                                        sizeof(struct alloc_struct))) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        /* Allocate memory */
+        if ((sep->data_pool_bytes_allocated + command_args.num_bytes) >
+                SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES) {
+                error = -ENOMEM;
+                goto end_function;
+        }
+
+        dev_dbg(&sep->pdev->dev,
+                "bytes_allocated: %x\n", (int)sep->data_pool_bytes_allocated);
+        dev_dbg(&sep->pdev->dev,
+                "offset: %x\n", SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES);
+        /* Set the virtual and bus address */
+        command_args.offset = SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES +
+                sep->data_pool_bytes_allocated;
+
+        dev_dbg(&sep->pdev->dev,
+                "command_args.offset: %x\n", command_args.offset);
+
+        /* Place in the shared area that is known by the SEP */
+        token_addr = (u32 *)(sep->shared_addr +
+                SEP_DRIVER_DATA_POOL_ALLOCATION_OFFSET_IN_BYTES +
+                (sep->num_of_data_allocations)*2*sizeof(u32));
+
+        dev_dbg(&sep->pdev->dev, "allocation offset: %x\n",
+                SEP_DRIVER_DATA_POOL_ALLOCATION_OFFSET_IN_BYTES);
+        dev_dbg(&sep->pdev->dev, "data pool token addr is %p\n", token_addr);
+
+        token_addr[0] = SEP_DATA_POOL_POINTERS_VAL_TOKEN;
+        token_addr[1] = (u32)sep->shared_bus +
+                SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES +
+                sep->data_pool_bytes_allocated;
+
+        dev_dbg(&sep->pdev->dev, "data pool token [0] %x\n", token_addr[0]);
+        dev_dbg(&sep->pdev->dev, "data pool token [1] %x\n", token_addr[1]);
+
+        /* Write the memory back to the user space */
+        error = copy_to_user((void *)arg, (void *)&command_args,
+                sizeof(struct alloc_struct));
+        if (error) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        /* Update the allocation */
+        sep->data_pool_bytes_allocated += command_args.num_bytes;
+        sep->num_of_data_allocations += 1;
+
+        dev_dbg(&sep->pdev->dev, "data_allocations %d\n",
+                sep->num_of_data_allocations);
+        dev_dbg(&sep->pdev->dev, "bytes allocated  %d\n",
+                (int)sep->data_pool_bytes_allocated);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_allocate_data_pool_memory_handler end\n");
+        return error;
+}
+
+/**
+ *      sep_lock_kernel_pages - map kernel pages for DMA
+ *      @sep: pointer to struct sep_device
+ *      @kernel_virt_addr: address of data buffer in kernel
+ *      @data_size: size of data
+ *      @lli_array_ptr: lli array
+ *      @in_out_flag: input into device or output from device
+ *
+ *      This function locks all the physical pages of the kernel virtual buffer
+ *      and construct a basic lli  array, where each entry holds the physical
+ *      page address and the size that application data holds in this page
+ *      This function is used only during kernel crypto mod calls from within
+ *      the kernel (when ioctl is not used)
+ */
+static int sep_lock_kernel_pages(struct sep_device *sep,
+        unsigned long kernel_virt_addr,
+        u32 data_size,
+        struct sep_lli_entry **lli_array_ptr,
+        int in_out_flag)
+
+{
+        int error = 0;
+        /* Array of lli */
+        struct sep_lli_entry *lli_array;
+        /* Map array */
+        struct sep_dma_map *map_array;
+
+        dev_dbg(&sep->pdev->dev, "sep_lock_kernel_pages start\n");
+        dev_dbg(&sep->pdev->dev, "kernel_virt_addr is %08lx\n",
+                                (unsigned long)kernel_virt_addr);
+        dev_dbg(&sep->pdev->dev, "data_size is %x\n", data_size);
+
+        lli_array = kmalloc(sizeof(struct sep_lli_entry), GFP_ATOMIC);
+        if (!lli_array) {
+                error = -ENOMEM;
+                goto end_function;
+        }
+        map_array = kmalloc(sizeof(struct sep_dma_map), GFP_ATOMIC);
+        if (!map_array) {
+                error = -ENOMEM;
+                goto end_function_with_error;
+        }
+
+        map_array[0].dma_addr =
+                dma_map_single(&sep->pdev->dev, (void *)kernel_virt_addr,
+                data_size, DMA_BIDIRECTIONAL);
+        map_array[0].size = data_size;
+
+
+        /*
+         * Set the start address of the first page - app data may start not at
+         * the beginning of the page
+         */
+        lli_array[0].bus_address = (u32)map_array[0].dma_addr;
+        lli_array[0].block_size = map_array[0].size;
+
+        dev_dbg(&sep->pdev->dev,
+        "lli_array[0].bus_address is %08lx, lli_array[0].block_size is %x\n",
+                (unsigned long)lli_array[0].bus_address,
+                lli_array[0].block_size);
+
+        /* Set the output parameters */
+        if (in_out_flag == SEP_DRIVER_IN_FLAG) {
+                *lli_array_ptr = lli_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = 1;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_page_array = NULL;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_map_array = map_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_map_num_entries = 1;
+        } else {
+                *lli_array_ptr = lli_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_num_pages = 1;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_page_array = NULL;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_map_array = map_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_map_num_entries = 1;
+        }
+        goto end_function;
+
+end_function_with_error:
+        kfree(lli_array);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_lock_kernel_pages end\n");
+        return error;
+}
+
+/**
+ *      sep_lock_user_pages - lock and map user pages for DMA
+ *      @sep: pointer to struct sep_device
+ *      @app_virt_addr: user memory data buffer
+ *      @data_size: size of data buffer
+ *      @lli_array_ptr: lli array
+ *      @in_out_flag: input or output to device
+ *
+ *      This function locks all the physical pages of the application
+ *      virtual buffer and construct a basic lli  array, where each entry
+ *      holds the physical page address and the size that application
+ *      data holds in this physical pages
+ */
+static int sep_lock_user_pages(struct sep_device *sep,
+        u32 app_virt_addr,
+        u32 data_size,
+        struct sep_lli_entry **lli_array_ptr,
+        int in_out_flag)
+
+{
+        int error = 0;
+        u32 count;
+        int result;
+        /* The the page of the end address of the user space buffer */
+        u32 end_page;
+        /* The page of the start address of the user space buffer */
+        u32 start_page;
+        /* The range in pages */
+        u32 num_pages;
+        /* Array of pointers to page */
+        struct page **page_array;
+        /* Array of lli */
+        struct sep_lli_entry *lli_array;
+        /* Map array */
+        struct sep_dma_map *map_array;
+        /* Direction of the DMA mapping for locked pages */
+        enum dma_data_direction dir;
+
+        dev_dbg(&sep->pdev->dev, "sep_lock_user_pages start\n");
+
+        /* Set start and end pages  and num pages */
+        end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT;
+        start_page = app_virt_addr >> PAGE_SHIFT;
+        num_pages = end_page - start_page + 1;
+
+        dev_dbg(&sep->pdev->dev, "app_virt_addr is %x\n", app_virt_addr);
+        dev_dbg(&sep->pdev->dev, "data_size is %x\n", data_size);
+        dev_dbg(&sep->pdev->dev, "start_page is %x\n", start_page);
+        dev_dbg(&sep->pdev->dev, "end_page is %x\n", end_page);
+        dev_dbg(&sep->pdev->dev, "num_pages is %x\n", num_pages);
+
+        dev_dbg(&sep->pdev->dev, "starting page_array malloc\n");
+
+        /* Allocate array of pages structure pointers */
+        page_array = kmalloc(sizeof(struct page *) * num_pages, GFP_ATOMIC);
+        if (!page_array) {
+                error = -ENOMEM;
+                goto end_function;
+        }
+        map_array = kmalloc(sizeof(struct sep_dma_map) * num_pages, GFP_ATOMIC);
+        if (!map_array) {
+                dev_warn(&sep->pdev->dev, "kmalloc for map_array failed\n");
+                error = -ENOMEM;
+                goto end_function_with_error1;
+        }
+
+        lli_array = kmalloc(sizeof(struct sep_lli_entry) * num_pages,
+                GFP_ATOMIC);
+
+        if (!lli_array) {
+                dev_warn(&sep->pdev->dev, "kmalloc for lli_array failed\n");
+                error = -ENOMEM;
+                goto end_function_with_error2;
+        }
+
+        dev_dbg(&sep->pdev->dev, "starting get_user_pages\n");
+
+        /* Convert the application virtual address into a set of physical */
+        down_read(&current->mm->mmap_sem);
+        result = get_user_pages(current, current->mm, app_virt_addr,
+                num_pages,
+                ((in_out_flag == SEP_DRIVER_IN_FLAG) ? 0 : 1),
+                0, page_array, NULL);
+
+        up_read(&current->mm->mmap_sem);
+
+        /* Check the number of pages locked - if not all then exit with error */
+        if (result != num_pages) {
+                dev_warn(&sep->pdev->dev,
+                        "not all pages locked by get_user_pages\n");
+                error = -ENOMEM;
+                goto end_function_with_error3;
+        }
+
+        dev_dbg(&sep->pdev->dev, "get_user_pages succeeded\n");
+
+        /* Set direction */
+        if (in_out_flag == SEP_DRIVER_IN_FLAG)
+                dir = DMA_TO_DEVICE;
+        else
+                dir = DMA_FROM_DEVICE;
+
+        /*
+         * Fill the array using page array data and
+         * map the pages - this action will also flush the cache as needed
+         */
+        for (count = 0; count < num_pages; count++) {
+                /* Fill the map array */
+                map_array[count].dma_addr =
+                        dma_map_page(&sep->pdev->dev, page_array[count],
+                        0, PAGE_SIZE, /*dir*/DMA_BIDIRECTIONAL);
+
+                map_array[count].size = PAGE_SIZE;
+
+                /* Fill the lli array entry */
+                lli_array[count].bus_address = (u32)map_array[count].dma_addr;
+                lli_array[count].block_size = PAGE_SIZE;
+
+                dev_warn(&sep->pdev->dev, "lli_array[%x].bus_address is %08lx, lli_array[%x].block_size is %x\n",
+                        count, (unsigned long)lli_array[count].bus_address,
+                        count, lli_array[count].block_size);
+        }
+
+        /* Check the offset for the first page */
+        lli_array[0].bus_address =
+                lli_array[0].bus_address + (app_virt_addr & (~PAGE_MASK));
+
+        /* Check that not all the data is in the first page only */
+        if ((PAGE_SIZE - (app_virt_addr & (~PAGE_MASK))) >= data_size)
+                lli_array[0].block_size = data_size;
+        else
+                lli_array[0].block_size =
+                        PAGE_SIZE - (app_virt_addr & (~PAGE_MASK));
+
+        dev_dbg(&sep->pdev->dev,
+                "lli_array[0].bus_address is %08lx, lli_array[0].block_size is %x\n",
+                (unsigned long)lli_array[count].bus_address,
+                lli_array[count].block_size);
+
+        /* Check the size of the last page */
+        if (num_pages > 1) {
+                lli_array[num_pages - 1].block_size =
+                        (app_virt_addr + data_size) & (~PAGE_MASK);
+
+                dev_warn(&sep->pdev->dev,
+                        "lli_array[%x].bus_address is %08lx, lli_array[%x].block_size is %x\n",
+                        num_pages - 1,
+                        (unsigned long)lli_array[count].bus_address,
+                        num_pages - 1,
+                        lli_array[count].block_size);
+        }
+
+        /* Set output params acording to the in_out flag */
+        if (in_out_flag == SEP_DRIVER_IN_FLAG) {
+                *lli_array_ptr = lli_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_page_array = page_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_map_array = map_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].in_map_num_entries =
+                                                                num_pages;
+        } else {
+                *lli_array_ptr = lli_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_num_pages = num_pages;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_page_array =
+                                                                page_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_map_array = map_array;
+                sep->dma_res_arr[sep->nr_dcb_creat].out_map_num_entries =
+                                                                num_pages;
+        }
+        goto end_function;
+
+end_function_with_error3:
+        /* Free lli array */
+        kfree(lli_array);
+
+end_function_with_error2:
+        kfree(map_array);
+
+end_function_with_error1:
+        /* Free page array */
+        kfree(page_array);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_lock_user_pages end\n");
+        return error;
+}
+
+/**
+ *      u32 sep_calculate_lli_table_max_size - size the LLI table
+ *      @sep: pointer to struct sep_device
+ *      @lli_in_array_ptr
+ *      @num_array_entries
+ *      @last_table_flag
+ *
+ *      This function calculates the size of data that can be inserted into
+ *      the lli table from this array, such that either the table is full
+ *      (all entries are entered), or there are no more entries in the
+ *      lli array
+ */
+static u32 sep_calculate_lli_table_max_size(struct sep_device *sep,
+        struct sep_lli_entry *lli_in_array_ptr,
+        u32 num_array_entries,
+        u32 *last_table_flag)
+{
+        u32 counter;
+        /* Table data size */
+        u32 table_data_size = 0;
+        /* Data size for the next table */
+        u32 next_table_data_size;
+
+        *last_table_flag = 0;
+
+        /*
+         * Calculate the data in the out lli table till we fill the whole
+         * table or till the data has ended
+         */
+        for (counter = 0;
+                (counter < (SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP - 1)) &&
+                        (counter < num_array_entries); counter++)
+                table_data_size += lli_in_array_ptr[counter].block_size;
+
+        /*
+         * Check if we reached the last entry,
+         * meaning this ia the last table to build,
+         * and no need to check the block alignment
+         */
+        if (counter == num_array_entries) {
+                /* Set the last table flag */
+                *last_table_flag = 1;
+                goto end_function;
+        }
+
+        /*
+         * Calculate the data size of the next table.
+         * Stop if no entries left or if data size is more the DMA restriction
+         */
+        next_table_data_size = 0;
+        for (; counter < num_array_entries; counter++) {
+                next_table_data_size += lli_in_array_ptr[counter].block_size;
+                if (next_table_data_size >= SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE)
+                        break;
+        }
+
+        /*
+         * Check if the next table data size is less then DMA rstriction.
+         * if it is - recalculate the current table size, so that the next
+         * table data size will be adaquete for DMA
+         */
+        if (next_table_data_size &&
+                next_table_data_size < SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE)
+
+                table_data_size -= (SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE -
+                        next_table_data_size);
+
+        dev_dbg(&sep->pdev->dev, "table data size is %x\n",
+                                                        table_data_size);
+end_function:
+        return table_data_size;
+}
+
+/**
+ *      sep_build_lli_table - build an lli array for the given table
+ *      @sep: pointer to struct sep_device
+ *      @lli_array_ptr: pointer to lli array
+ *      @lli_table_ptr: pointer to lli table
+ *      @num_processed_entries_ptr: pointer to number of entries
+ *      @num_table_entries_ptr: pointer to number of tables
+ *      @table_data_size: total data size
+ *
+ *      Builds ant lli table from the lli_array according to
+ *      the given size of data
+ */
+static void sep_build_lli_table(struct sep_device *sep,
+        struct sep_lli_entry    *lli_array_ptr,
+        struct sep_lli_entry    *lli_table_ptr,
+        u32 *num_processed_entries_ptr,
+        u32 *num_table_entries_ptr,
+        u32 table_data_size)
+{
+        /* Current table data size */
+        u32 curr_table_data_size;
+        /* Counter of lli array entry */
+        u32 array_counter;
+
+        dev_dbg(&sep->pdev->dev, "sep_build_lli_table start\n");
+
+        /* Init currrent table data size and lli array entry counter */
+        curr_table_data_size = 0;
+        array_counter = 0;
+        *num_table_entries_ptr = 1;
+
+        dev_dbg(&sep->pdev->dev, "table_data_size is %x\n", table_data_size);
+
+        /* Fill the table till table size reaches the needed amount */
+        while (curr_table_data_size < table_data_size) {
+                /* Update the number of entries in table */
+                (*num_table_entries_ptr)++;
+
+                lli_table_ptr->bus_address =
+                        cpu_to_le32(lli_array_ptr[array_counter].bus_address);
+
+                lli_table_ptr->block_size =
+                        cpu_to_le32(lli_array_ptr[array_counter].block_size);
+
+                curr_table_data_size += lli_array_ptr[array_counter].block_size;
+
+                dev_dbg(&sep->pdev->dev, "lli_table_ptr is %p\n",
+                                                                lli_table_ptr);
+                dev_dbg(&sep->pdev->dev, "lli_table_ptr->bus_address is %08lx\n",
+                                (unsigned long)lli_table_ptr->bus_address);
+                dev_dbg(&sep->pdev->dev, "lli_table_ptr->block_size is %x\n",
+                        lli_table_ptr->block_size);
+
+                /* Check for overflow of the table data */
+                if (curr_table_data_size > table_data_size) {
+                        dev_dbg(&sep->pdev->dev,
+                                "curr_table_data_size too large\n");
+
+                        /* Update the size of block in the table */
+                        lli_table_ptr->block_size -=
+                        cpu_to_le32((curr_table_data_size - table_data_size));
+
+                        /* Update the physical address in the lli array */
+                        lli_array_ptr[array_counter].bus_address +=
+                        cpu_to_le32(lli_table_ptr->block_size);
+
+                        /* Update the block size left in the lli array */
+                        lli_array_ptr[array_counter].block_size =
+                                (curr_table_data_size - table_data_size);
+                } else
+                        /* Advance to the next entry in the lli_array */
+                        array_counter++;
+
+                dev_dbg(&sep->pdev->dev,
+                        "lli_table_ptr->bus_address is %08lx\n",
+                                (unsigned long)lli_table_ptr->bus_address);
+                dev_dbg(&sep->pdev->dev,
+                        "lli_table_ptr->block_size is %x\n",
+                        lli_table_ptr->block_size);
+
+                /* Move to the next entry in table */
+                lli_table_ptr++;
+        }
+
+        /* Set the info entry to default */
+        lli_table_ptr->bus_address = 0xffffffff;
+        lli_table_ptr->block_size = 0;
+
+        dev_dbg(&sep->pdev->dev, "lli_table_ptr is %p\n", lli_table_ptr);
+        dev_dbg(&sep->pdev->dev, "lli_table_ptr->bus_address is %08lx\n",
+                                (unsigned long)lli_table_ptr->bus_address);
+        dev_dbg(&sep->pdev->dev, "lli_table_ptr->block_size is %x\n",
+                                                lli_table_ptr->block_size);
+
+        /* Set the output parameter */
+        *num_processed_entries_ptr += array_counter;
+
+        dev_dbg(&sep->pdev->dev, "num_processed_entries_ptr is %x\n",
+                *num_processed_entries_ptr);
+
+        dev_dbg(&sep->pdev->dev, "sep_build_lli_table end\n");
+}
+
+/**
+ *      sep_shared_area_virt_to_bus - map shared area to bus address
+ *      @sep: pointer to struct sep_device
+ *      @virt_address: virtual address to convert
+ *
+ *      This functions returns the physical address inside shared area according
+ *      to the virtual address. It can be either on the externa RAM device
+ *      (ioremapped), or on the system RAM
+ *      This implementation is for the external RAM
+ */
+static dma_addr_t sep_shared_area_virt_to_bus(struct sep_device *sep,
+        void *virt_address)
+{
+        dev_dbg(&sep->pdev->dev, "sh virt to phys v %p\n", virt_address);
+        dev_dbg(&sep->pdev->dev, "sh virt to phys p %08lx\n",
+                (unsigned long)
+                sep->shared_bus + (virt_address - sep->shared_addr));
+
+        return sep->shared_bus + (size_t)(virt_address - sep->shared_addr);
+}
+
+/**
+ *      sep_shared_area_bus_to_virt - map shared area bus address to kernel
+ *      @sep: pointer to struct sep_device
+ *      @bus_address: bus address to convert
+ *
+ *      This functions returns the virtual address inside shared area
+ *      according to the physical address. It can be either on the
+ *      externa RAM device (ioremapped), or on the system RAM
+ *      This implementation is for the external RAM
+ */
+static void *sep_shared_area_bus_to_virt(struct sep_device *sep,
+        dma_addr_t bus_address)
+{
+        dev_dbg(&sep->pdev->dev, "shared bus to virt b=%lx v=%lx\n",
+                (unsigned long)bus_address, (unsigned long)(sep->shared_addr +
+                        (size_t)(bus_address - sep->shared_bus)));
+
+        return sep->shared_addr + (size_t)(bus_address - sep->shared_bus);
+}
+
+/**
+ *      sep_debug_print_lli_tables - dump LLI table
+ *      @sep: pointer to struct sep_device
+ *      @lli_table_ptr: pointer to sep_lli_entry
+ *      @num_table_entries: number of entries
+ *      @table_data_size: total data size
+ *
+ *      Walk the the list of the print created tables and print all the data
+ */
+static void sep_debug_print_lli_tables(struct sep_device *sep,
+        struct sep_lli_entry *lli_table_ptr,
+        unsigned long num_table_entries,
+        unsigned long table_data_size)
+{
+        unsigned long table_count = 1;
+        unsigned long entries_count = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_debug_print_lli_tables start\n");
+
+        while ((unsigned long) lli_table_ptr->bus_address != 0xffffffff) {
+                dev_dbg(&sep->pdev->dev,
+                        "lli table %08lx, table_data_size is %lu\n",
+                        table_count, table_data_size);
+                dev_dbg(&sep->pdev->dev, "num_table_entries is %lu\n",
+                                                        num_table_entries);
+
+                /* Print entries of the table (without info entry) */
+                for (entries_count = 0; entries_count < num_table_entries;
+                        entries_count++, lli_table_ptr++) {
+
+                        dev_dbg(&sep->pdev->dev,
+                                "lli_table_ptr address is %08lx\n",
+                                (unsigned long) lli_table_ptr);
+
+                        dev_dbg(&sep->pdev->dev,
+                                "phys address is %08lx block size is %x\n",
+                                (unsigned long)lli_table_ptr->bus_address,
+                                lli_table_ptr->block_size);
+                }
+                /* Point to the info entry */
+                lli_table_ptr--;
+
+                dev_dbg(&sep->pdev->dev,
+                        "phys lli_table_ptr->block_size is %x\n",
+                        lli_table_ptr->block_size);
+
+                dev_dbg(&sep->pdev->dev,
+                        "phys lli_table_ptr->physical_address is %08lu\n",
+                        (unsigned long)lli_table_ptr->bus_address);
+
+
+                table_data_size = lli_table_ptr->block_size & 0xffffff;
+                num_table_entries = (lli_table_ptr->block_size >> 24) & 0xff;
+
+                dev_dbg(&sep->pdev->dev,
+                        "phys table_data_size is %lu num_table_entries is"
+                        " %lu bus_address is%lu\n", table_data_size,
+                        num_table_entries, (unsigned long)lli_table_ptr->bus_address);
+
+                if ((unsigned long)lli_table_ptr->bus_address != 0xffffffff)
+                        lli_table_ptr = (struct sep_lli_entry *)
+                                sep_shared_bus_to_virt(sep,
+                                (unsigned long)lli_table_ptr->bus_address);
+
+                table_count++;
+        }
+        dev_dbg(&sep->pdev->dev, "sep_debug_print_lli_tables end\n");
+}
+
+
+/**
+ *      sep_prepare_empty_lli_table - create a blank LLI table
+ *      @sep: pointer to struct sep_device
+ *      @lli_table_addr_ptr: pointer to lli table
+ *      @num_entries_ptr: pointer to number of entries
+ *      @table_data_size_ptr: point to table data size
+ *
+ *      This function creates empty lli tables when there is no data
+ */
+static void sep_prepare_empty_lli_table(struct sep_device *sep,
+                dma_addr_t *lli_table_addr_ptr,
+                u32 *num_entries_ptr,
+                u32 *table_data_size_ptr)
+{
+        struct sep_lli_entry *lli_table_ptr;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_empty_lli_table start\n");
+
+        /* Find the area for new table */
+        lli_table_ptr =
+                (struct sep_lli_entry *)(sep->shared_addr +
+                SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                sep->num_lli_tables_created * sizeof(struct sep_lli_entry) *
+                        SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP);
+
+        lli_table_ptr->bus_address = 0;
+        lli_table_ptr->block_size = 0;
+
+        lli_table_ptr++;
+        lli_table_ptr->bus_address = 0xFFFFFFFF;
+        lli_table_ptr->block_size = 0;
+
+        /* Set the output parameter value */
+        *lli_table_addr_ptr = sep->shared_bus +
+                SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                sep->num_lli_tables_created *
+                sizeof(struct sep_lli_entry) *
+                SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP;
+
+        /* Set the num of entries and table data size for empty table */
+        *num_entries_ptr = 2;
+        *table_data_size_ptr = 0;
+
+        /* Update the number of created tables */
+        sep->num_lli_tables_created++;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_empty_lli_table start\n");
+
+}
+
+/**
+ *      sep_prepare_input_dma_table - prepare input DMA mappings
+ *      @sep: pointer to struct sep_device
+ *      @data_size:
+ *      @block_size:
+ *      @lli_table_ptr:
+ *      @num_entries_ptr:
+ *      @table_data_size_ptr:
+ *      @is_kva: set for kernel data (kernel cryptio call)
+ *
+ *      This function prepares only input DMA table for synhronic symmetric
+ *      operations (HASH)
+ *      Note that all bus addresses that are passed to the SEP
+ *      are in 32 bit format; the SEP is a 32 bit device
+ */
+static int sep_prepare_input_dma_table(struct sep_device *sep,
+        unsigned long app_virt_addr,
+        u32 data_size,
+        u32 block_size,
+        dma_addr_t *lli_table_ptr,
+        u32 *num_entries_ptr,
+        u32 *table_data_size_ptr,
+        bool is_kva)
+{
+        int error = 0;
+        /* Pointer to the info entry of the table - the last entry */
+        struct sep_lli_entry *info_entry_ptr;
+        /* Array of pointers to page */
+        struct sep_lli_entry *lli_array_ptr;
+        /* Points to the first entry to be processed in the lli_in_array */
+        u32 current_entry = 0;
+        /* Num entries in the virtual buffer */
+        u32 sep_lli_entries = 0;
+        /* Lli table pointer */
+        struct sep_lli_entry *in_lli_table_ptr;
+        /* The total data in one table */
+        u32 table_data_size = 0;
+        /* Flag for last table */
+        u32 last_table_flag = 0;
+        /* Number of entries in lli table */
+        u32 num_entries_in_table = 0;
+        /* Next table address */
+        void *lli_table_alloc_addr = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_input_dma_table start\n");
+        dev_dbg(&sep->pdev->dev, "data_size is %x\n", data_size);
+        dev_dbg(&sep->pdev->dev, "block_size is %x\n", block_size);
+
+        /* Initialize the pages pointers */
+        sep->dma_res_arr[sep->nr_dcb_creat].in_page_array = NULL;
+        sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = 0;
+
+        /* Set the kernel address for first table to be allocated */
+        lli_table_alloc_addr = (void *)(sep->shared_addr +
+                SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                sep->num_lli_tables_created * sizeof(struct sep_lli_entry) *
+                SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP);
+
+        if (data_size == 0) {
+                /* Special case  - create meptu table - 2 entries, zero data */
+                sep_prepare_empty_lli_table(sep, lli_table_ptr,
+                                num_entries_ptr, table_data_size_ptr);
+                goto update_dcb_counter;
+        }
+
+        /* Check if the pages are in Kernel Virtual Address layout */
+        if (is_kva == true)
+                /* Lock the pages in the kernel */
+                error = sep_lock_kernel_pages(sep, app_virt_addr,
+                        data_size, &lli_array_ptr, SEP_DRIVER_IN_FLAG);
+        else
+                /*
+                 * Lock the pages of the user buffer
+                 * and translate them to pages
+                 */
+                error = sep_lock_user_pages(sep, app_virt_addr,
+                        data_size, &lli_array_ptr, SEP_DRIVER_IN_FLAG);
+
+        if (error)
+                goto end_function;
+
+        dev_dbg(&sep->pdev->dev, "output sep_in_num_pages is %x\n",
+                sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages);
+
+        current_entry = 0;
+        info_entry_ptr = NULL;
+
+        sep_lli_entries = sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages;
+
+        /* Loop till all the entries in in array are not processed */
+        while (current_entry < sep_lli_entries) {
+
+                /* Set the new input and output tables */
+                in_lli_table_ptr =
+                        (struct sep_lli_entry *)lli_table_alloc_addr;
+
+                lli_table_alloc_addr += sizeof(struct sep_lli_entry) *
+                        SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP;
+
+                if (lli_table_alloc_addr >
+                        ((void *)sep->shared_addr +
+                        SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                        SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES)) {
+
+                        error = -ENOMEM;
+                        goto end_function_error;
+
+                }
+
+                /* Update the number of created tables */
+                sep->num_lli_tables_created++;
+
+                /* Calculate the maximum size of data for input table */
+                table_data_size = sep_calculate_lli_table_max_size(sep,
+                        &lli_array_ptr[current_entry],
+                        (sep_lli_entries - current_entry),
+                        &last_table_flag);
+
+                /*
+                 * If this is not the last table -
+                 * then allign it to the block size
+                 */
+                if (!last_table_flag)
+                        table_data_size =
+                                (table_data_size / block_size) * block_size;
+
+                dev_dbg(&sep->pdev->dev, "output table_data_size is %x\n",
+                                                        table_data_size);
+
+                /* Construct input lli table */
+                sep_build_lli_table(sep, &lli_array_ptr[current_entry],
+                        in_lli_table_ptr,
+                        &current_entry, &num_entries_in_table, table_data_size);
+
+                if (info_entry_ptr == NULL) {
+
+                        /* Set the output parameters to physical addresses */
+                        *lli_table_ptr = sep_shared_area_virt_to_bus(sep,
+                                in_lli_table_ptr);
+                        *num_entries_ptr = num_entries_in_table;
+                        *table_data_size_ptr = table_data_size;
+
+                        dev_dbg(&sep->pdev->dev,
+                                "output lli_table_in_ptr is %08lx\n",
+                                (unsigned long)*lli_table_ptr);
+
+                } else {
+                        /* Update the info entry of the previous in table */
+                        info_entry_ptr->bus_address =
+                                sep_shared_area_virt_to_bus(sep,
+                                                        in_lli_table_ptr);
+                        info_entry_ptr->block_size =
+                                ((num_entries_in_table) << 24) |
+                                (table_data_size);
+                }
+                /* Save the pointer to the info entry of the current tables */
+                info_entry_ptr = in_lli_table_ptr + num_entries_in_table - 1;
+        }
+        /* Print input tables */
+        sep_debug_print_lli_tables(sep, (struct sep_lli_entry *)
+                sep_shared_area_bus_to_virt(sep, *lli_table_ptr),
+                *num_entries_ptr, *table_data_size_ptr);
+        /* The array of the pages */
+        kfree(lli_array_ptr);
+
+update_dcb_counter:
+        /* Update DCB counter */
+        sep->nr_dcb_creat++;
+        goto end_function;
+
+end_function_error:
+        /* Free all the allocated resources */
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].in_map_array);
+        kfree(lli_array_ptr);
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].in_page_array);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_prepare_input_dma_table end\n");
+        return error;
+
+}
+/**
+ *      sep_construct_dma_tables_from_lli - prepare AES/DES mappings
+ *      @sep: pointer to struct sep_device
+ *      @lli_in_array:
+ *      @sep_in_lli_entries:
+ *      @lli_out_array:
+ *      @sep_out_lli_entries
+ *      @block_size
+ *      @lli_table_in_ptr
+ *      @lli_table_out_ptr
+ *      @in_num_entries_ptr
+ *      @out_num_entries_ptr
+ *      @table_data_size_ptr
+ *
+ *      This function creates the input and output DMA tables for
+ *      symmetric operations (AES/DES) according to the block
+ *      size from LLI arays
+ *      Note that all bus addresses that are passed to the SEP
+ *      are in 32 bit format; the SEP is a 32 bit device
+ */
+static int sep_construct_dma_tables_from_lli(
+        struct sep_device *sep,
+        struct sep_lli_entry *lli_in_array,
+        u32     sep_in_lli_entries,
+        struct sep_lli_entry *lli_out_array,
+        u32     sep_out_lli_entries,
+        u32     block_size,
+        dma_addr_t *lli_table_in_ptr,
+        dma_addr_t *lli_table_out_ptr,
+        u32     *in_num_entries_ptr,
+        u32     *out_num_entries_ptr,
+        u32     *table_data_size_ptr)
+{
+        /* Points to the area where next lli table can be allocated */
+        void *lli_table_alloc_addr = 0;
+        /* Input lli table */
+        struct sep_lli_entry *in_lli_table_ptr = NULL;
+        /* Output lli table */
+        struct sep_lli_entry *out_lli_table_ptr = NULL;
+        /* Pointer to the info entry of the table - the last entry */
+        struct sep_lli_entry *info_in_entry_ptr = NULL;
+        /* Pointer to the info entry of the table - the last entry */
+        struct sep_lli_entry *info_out_entry_ptr = NULL;
+        /* Points to the first entry to be processed in the lli_in_array */
+        u32 current_in_entry = 0;
+        /* Points to the first entry to be processed in the lli_out_array */
+        u32 current_out_entry = 0;
+        /* Max size of the input table */
+        u32 in_table_data_size = 0;
+        /* Max size of the output table */
+        u32 out_table_data_size = 0;
+        /* Flag te signifies if this is the last tables build */
+        u32 last_table_flag = 0;
+        /* The data size that should be in table */
+        u32 table_data_size = 0;
+        /* Number of etnries in the input table */
+        u32 num_entries_in_table = 0;
+        /* Number of etnries in the output table */
+        u32 num_entries_out_table = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_construct_dma_tables_from_lli start\n");
+
+        /* Initiate to point after the message area */
+        lli_table_alloc_addr = (void *)(sep->shared_addr +
+                SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                (sep->num_lli_tables_created *
+                (sizeof(struct sep_lli_entry) *
+                SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP)));
+
+        /* Loop till all the entries in in array are not processed */
+        while (current_in_entry < sep_in_lli_entries) {
+                /* Set the new input and output tables */
+                in_lli_table_ptr =
+                        (struct sep_lli_entry *)lli_table_alloc_addr;
+
+                lli_table_alloc_addr += sizeof(struct sep_lli_entry) *
+                        SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP;
+
+                /* Set the first output tables */
+                out_lli_table_ptr =
+                        (struct sep_lli_entry *)lli_table_alloc_addr;
+
+                /* Check if the DMA table area limit was overrun */
+                if ((lli_table_alloc_addr + sizeof(struct sep_lli_entry) *
+                        SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP) >
+                        ((void *)sep->shared_addr +
+                        SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES +
+                        SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES)) {
+
+                        dev_warn(&sep->pdev->dev, "dma table limit overrun\n");
+                        return -ENOMEM;
+                }
+
+                /* Update the number of the lli tables created */
+                sep->num_lli_tables_created += 2;
+
+                lli_table_alloc_addr += sizeof(struct sep_lli_entry) *
+                        SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP;
+
+                /* Calculate the maximum size of data for input table */
+                in_table_data_size =
+                        sep_calculate_lli_table_max_size(sep,
+                        &lli_in_array[current_in_entry],
+                        (sep_in_lli_entries - current_in_entry),
+                        &last_table_flag);
+
+                /* Calculate the maximum size of data for output table */
+                out_table_data_size =
+                        sep_calculate_lli_table_max_size(sep,
+                        &lli_out_array[current_out_entry],
+                        (sep_out_lli_entries - current_out_entry),
+                        &last_table_flag);
+
+                dev_dbg(&sep->pdev->dev,
+                        "in_table_data_size is %x\n",
+                        in_table_data_size);
+
+                dev_dbg(&sep->pdev->dev,
+                        "out_table_data_size is %x\n",
+                        out_table_data_size);
+
+                table_data_size = in_table_data_size;
+
+                if (!last_table_flag) {
+                        /*
+                         * If this is not the last table,
+                         * then must check where the data is smallest
+                         * and then align it to the block size
+                         */
+                        if (table_data_size > out_table_data_size)
+                                table_data_size = out_table_data_size;
+
+                        /*
+                         * Now calculate the table size so that
+                         * it will be module block size
+                         */
+                        table_data_size = (table_data_size / block_size) *
+                                block_size;
+                }
+
+                dev_dbg(&sep->pdev->dev, "table_data_size is %x\n",
+                                                        table_data_size);
+
+                /* Construct input lli table */
+                sep_build_lli_table(sep, &lli_in_array[current_in_entry],
+                        in_lli_table_ptr,
+                        &current_in_entry,
+                        &num_entries_in_table,
+                        table_data_size);
+
+                /* Construct output lli table */
+                sep_build_lli_table(sep, &lli_out_array[current_out_entry],
+                        out_lli_table_ptr,
+                        &current_out_entry,
+                        &num_entries_out_table,
+                        table_data_size);
+
+                /* If info entry is null - this is the first table built */
+                if (info_in_entry_ptr == NULL) {
+                        /* Set the output parameters to physical addresses */
+                        *lli_table_in_ptr =
+                        sep_shared_area_virt_to_bus(sep, in_lli_table_ptr);
+
+                        *in_num_entries_ptr = num_entries_in_table;
+
+                        *lli_table_out_ptr =
+                                sep_shared_area_virt_to_bus(sep,
+                                out_lli_table_ptr);
+
+                        *out_num_entries_ptr = num_entries_out_table;
+                        *table_data_size_ptr = table_data_size;
+
+                        dev_dbg(&sep->pdev->dev,
+                        "output lli_table_in_ptr is %08lx\n",
+                                (unsigned long)*lli_table_in_ptr);
+                        dev_dbg(&sep->pdev->dev,
+                        "output lli_table_out_ptr is %08lx\n",
+                                (unsigned long)*lli_table_out_ptr);
+                } else {
+                        /* Update the info entry of the previous in table */
+                        info_in_entry_ptr->bus_address =
+                                sep_shared_area_virt_to_bus(sep,
+                                in_lli_table_ptr);
+
+                        info_in_entry_ptr->block_size =
+                                ((num_entries_in_table) << 24) |
+                                (table_data_size);
+
+                        /* Update the info entry of the previous in table */
+                        info_out_entry_ptr->bus_address =
+                                sep_shared_area_virt_to_bus(sep,
+                                out_lli_table_ptr);
+
+                        info_out_entry_ptr->block_size =
+                                ((num_entries_out_table) << 24) |
+                                (table_data_size);
+
+                        dev_dbg(&sep->pdev->dev,
+                                "output lli_table_in_ptr:%08lx %08x\n",
+                                (unsigned long)info_in_entry_ptr->bus_address,
+                                info_in_entry_ptr->block_size);
+
+                        dev_dbg(&sep->pdev->dev,
+                                "output lli_table_out_ptr:%08lx  %08x\n",
+                                (unsigned long)info_out_entry_ptr->bus_address,
+                                info_out_entry_ptr->block_size);
+                }
+
+                /* Save the pointer to the info entry of the current tables */
+                info_in_entry_ptr = in_lli_table_ptr +
+                        num_entries_in_table - 1;
+                info_out_entry_ptr = out_lli_table_ptr +
+                        num_entries_out_table - 1;
+
+                dev_dbg(&sep->pdev->dev,
+                        "output num_entries_out_table is %x\n",
+                        (u32)num_entries_out_table);
+                dev_dbg(&sep->pdev->dev,
+                        "output info_in_entry_ptr is %lx\n",
+                        (unsigned long)info_in_entry_ptr);
+                dev_dbg(&sep->pdev->dev,
+                        "output info_out_entry_ptr is %lx\n",
+                        (unsigned long)info_out_entry_ptr);
+        }
+
+        /* Print input tables */
+        sep_debug_print_lli_tables(sep,
+        (struct sep_lli_entry *)
+        sep_shared_area_bus_to_virt(sep, *lli_table_in_ptr),
+        *in_num_entries_ptr,
+        *table_data_size_ptr);
+
+        /* Print output tables */
+        sep_debug_print_lli_tables(sep,
+        (struct sep_lli_entry *)
+        sep_shared_area_bus_to_virt(sep, *lli_table_out_ptr),
+        *out_num_entries_ptr,
+        *table_data_size_ptr);
+
+        dev_dbg(&sep->pdev->dev, "sep_construct_dma_tables_from_lli end\n");
+        return 0;
+}
+
+/**
+ *      sep_prepare_input_output_dma_table - prepare DMA I/O table
+ *      @app_virt_in_addr:
+ *      @app_virt_out_addr:
+ *      @data_size:
+ *      @block_size:
+ *      @lli_table_in_ptr:
+ *      @lli_table_out_ptr:
+ *      @in_num_entries_ptr:
+ *      @out_num_entries_ptr:
+ *      @table_data_size_ptr:
+ *      @is_kva: set for kernel data; used only for kernel crypto module
+ *
+ *      This function builds input and output DMA tables for synhronic
+ *      symmetric operations (AES, DES, HASH). It also checks that each table
+ *      is of the modular block size
+ *      Note that all bus addresses that are passed to the SEP
+ *      are in 32 bit format; the SEP is a 32 bit device
+ */
+static int sep_prepare_input_output_dma_table(struct sep_device *sep,
+        unsigned long app_virt_in_addr,
+        unsigned long app_virt_out_addr,
+        u32 data_size,
+        u32 block_size,
+        dma_addr_t *lli_table_in_ptr,
+        dma_addr_t *lli_table_out_ptr,
+        u32 *in_num_entries_ptr,
+        u32 *out_num_entries_ptr,
+        u32 *table_data_size_ptr,
+        bool is_kva)
+
+{
+        int error = 0;
+        /* Array of pointers of page */
+        struct sep_lli_entry *lli_in_array;
+        /* Array of pointers of page */
+        struct sep_lli_entry *lli_out_array;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_input_output_dma_table start\n");
+
+        if (data_size == 0) {
+                /* Prepare empty table for input and output */
+                sep_prepare_empty_lli_table(sep, lli_table_in_ptr,
+                        in_num_entries_ptr, table_data_size_ptr);
+
+                sep_prepare_empty_lli_table(sep, lli_table_out_ptr,
+                        out_num_entries_ptr, table_data_size_ptr);
+
+                goto update_dcb_counter;
+        }
+
+        /* Initialize the pages pointers */
+        sep->dma_res_arr[sep->nr_dcb_creat].in_page_array = NULL;
+        sep->dma_res_arr[sep->nr_dcb_creat].out_page_array = NULL;
+
+        /* Lock the pages of the buffer and translate them to pages */
+        if (is_kva == true) {
+                error = sep_lock_kernel_pages(sep, app_virt_in_addr,
+                        data_size, &lli_in_array, SEP_DRIVER_IN_FLAG);
+
+                if (error) {
+                        dev_warn(&sep->pdev->dev,
+                                "lock kernel for in failed\n");
+                        goto end_function;
+                }
+
+                error = sep_lock_kernel_pages(sep, app_virt_out_addr,
+                        data_size, &lli_out_array, SEP_DRIVER_OUT_FLAG);
+
+                if (error) {
+                        dev_warn(&sep->pdev->dev,
+                                "lock kernel for out failed\n");
+                        goto end_function;
+                }
+        }
+
+        else {
+                error = sep_lock_user_pages(sep, app_virt_in_addr,
+                                data_size, &lli_in_array, SEP_DRIVER_IN_FLAG);
+                if (error) {
+                        dev_warn(&sep->pdev->dev,
+                                "sep_lock_user_pages for input virtual buffer failed\n");
+                        goto end_function;
+                }
+
+                error = sep_lock_user_pages(sep, app_virt_out_addr,
+                        data_size, &lli_out_array, SEP_DRIVER_OUT_FLAG);
+
+                if (error) {
+                        dev_warn(&sep->pdev->dev,
+                                "sep_lock_user_pages for output virtual buffer failed\n");
+                        goto end_function_free_lli_in;
+                }
+        }
+
+        dev_dbg(&sep->pdev->dev, "sep_in_num_pages is %x\n",
+                sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages);
+        dev_dbg(&sep->pdev->dev, "sep_out_num_pages is %x\n",
+                sep->dma_res_arr[sep->nr_dcb_creat].out_num_pages);
+        dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n",
+                SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP);
+
+        /* Call the fucntion that creates table from the lli arrays */
+        error = sep_construct_dma_tables_from_lli(sep, lli_in_array,
+                sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages,
+                lli_out_array,
+                sep->dma_res_arr[sep->nr_dcb_creat].out_num_pages,
+                block_size, lli_table_in_ptr, lli_table_out_ptr,
+                in_num_entries_ptr, out_num_entries_ptr, table_data_size_ptr);
+
+        if (error) {
+                dev_warn(&sep->pdev->dev,
+                        "sep_construct_dma_tables_from_lli failed\n");
+                goto end_function_with_error;
+        }
+
+        kfree(lli_out_array);
+        kfree(lli_in_array);
+
+update_dcb_counter:
+        /* Update DCB counter */
+        sep->nr_dcb_creat++;
+        /* Fall through - free the lli entry arrays */
+        dev_dbg(&sep->pdev->dev, "in_num_entries_ptr is %08x\n",
+                                                *in_num_entries_ptr);
+        dev_dbg(&sep->pdev->dev, "out_num_entries_ptr is %08x\n",
+                                                *out_num_entries_ptr);
+        dev_dbg(&sep->pdev->dev, "table_data_size_ptr is %08x\n",
+                                                *table_data_size_ptr);
+
+        goto end_function;
+
+end_function_with_error:
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].out_map_array);
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].out_page_array);
+        kfree(lli_out_array);
+
+
+end_function_free_lli_in:
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].in_map_array);
+        kfree(sep->dma_res_arr[sep->nr_dcb_creat].in_page_array);
+        kfree(lli_in_array);
+
+end_function:
+        dev_dbg(&sep->pdev->dev,
+                "sep_prepare_input_output_dma_table end result = %d\n", error);
+
+        return error;
+
+}
+
+/**
+ *      sep_prepare_input_output_dma_table_in_dcb - prepare control blocks
+ *      @app_in_address: unsigned long; for data buffer in (user space)
+ *      @app_out_address: unsigned long; for data buffer out (user space)
+ *      @data_in_size: u32; for size of data
+ *      @block_size: u32; for block size
+ *      @tail_block_size: u32; for size of tail block
+ *      @isapplet: bool; to indicate external app
+ *      @is_kva: bool; kernel buffer; only used for kernel crypto module
+ *
+ *      This function prepares the linked DMA tables and puts the
+ *      address for the linked list of tables inta a DCB (data control
+ *      block) the address of which is known by the SEP hardware
+ *      Note that all bus addresses that are passed to the SEP
+ *      are in 32 bit format; the SEP is a 32 bit device
+ */
+static int sep_prepare_input_output_dma_table_in_dcb(struct sep_device *sep,
+        unsigned long  app_in_address,
+        unsigned long  app_out_address,
+        u32  data_in_size,
+        u32  block_size,
+        u32  tail_block_size,
+        bool isapplet,
+        bool    is_kva)
+{
+        int error = 0;
+        /* Size of tail */
+        u32 tail_size = 0;
+        /* Address of the created DCB table */
+        struct sep_dcblock *dcb_table_ptr = NULL;
+        /* The physical address of the first input DMA table */
+        dma_addr_t in_first_mlli_address = 0;
+        /* Number of entries in the first input DMA table */
+        u32  in_first_num_entries = 0;
+        /* The physical address of the first output DMA table */
+        dma_addr_t  out_first_mlli_address = 0;
+        /* Number of entries in the first output DMA table */
+        u32  out_first_num_entries = 0;
+        /* Data in the first input/output table */
+        u32  first_data_size = 0;
+
+        dev_dbg(&sep->pdev->dev, "prepare_input_output_dma_table_in_dcb start\n");
+
+        if (sep->nr_dcb_creat == SEP_MAX_NUM_SYNC_DMA_OPS) {
+                /* No more DCBs to allocate */
+                dev_warn(&sep->pdev->dev, "no more DCBs available\n");
+                error = -ENOSPC;
+                goto end_function;
+        }
+
+        /* Allocate new DCB */
+        dcb_table_ptr = (struct sep_dcblock *)(sep->shared_addr +
+                SEP_DRIVER_SYSTEM_DCB_MEMORY_OFFSET_IN_BYTES +
+                (sep->nr_dcb_creat * sizeof(struct sep_dcblock)));
+
+        /* Set the default values in the DCB */
+        dcb_table_ptr->input_mlli_address = 0;
+        dcb_table_ptr->input_mlli_num_entries = 0;
+        dcb_table_ptr->input_mlli_data_size = 0;
+        dcb_table_ptr->output_mlli_address = 0;
+        dcb_table_ptr->output_mlli_num_entries = 0;
+        dcb_table_ptr->output_mlli_data_size = 0;
+        dcb_table_ptr->tail_data_size = 0;
+        dcb_table_ptr->out_vr_tail_pt = 0;
+
+        if (isapplet == true) {
+                tail_size = data_in_size % block_size;
+                if (tail_size) {
+                        if (data_in_size < tail_block_size) {
+                                dev_warn(&sep->pdev->dev, "data in size smaller than tail block size\n");
+                                error = -ENOSPC;
+                                goto end_function;
+                        }
+                        if (tail_block_size)
+                                /*
+                                 * Case the tail size should be
+                                 * bigger than the real block size
+                                 */
+                                tail_size = tail_block_size +
+                                        ((data_in_size -
+                                                tail_block_size) % block_size);
+                }
+
+                /* Check if there is enough data for DMA operation */
+                if (data_in_size < SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE) {
+                        if (is_kva == true) {
+                                memcpy(dcb_table_ptr->tail_data,
+                                        (void *)app_in_address, data_in_size);
+                        } else {
+                                if (copy_from_user(dcb_table_ptr->tail_data,
+                                        (void __user *)app_in_address,
+                                        data_in_size)) {
+                                        error = -EFAULT;
+                                        goto end_function;
+                                }
+                        }
+
+                        dcb_table_ptr->tail_data_size = data_in_size;
+
+                        /* Set the output user-space address for mem2mem op */
+                        if (app_out_address)
+                                dcb_table_ptr->out_vr_tail_pt =
+                                                        (u32)app_out_address;
+
+                        /*
+                         * Update both data length parameters in order to avoid
+                         * second data copy and allow building of empty mlli
+                         * tables
+                         */
+                        tail_size = 0x0;
+                        data_in_size = 0x0;
+                }
+                if (tail_size) {
+                        if (is_kva == true) {
+                                memcpy(dcb_table_ptr->tail_data,
+                                        (void *)(app_in_address + data_in_size -
+                                        tail_size), tail_size);
+                        } else {
+                                /* We have tail data - copy it to DCB */
+                                if (copy_from_user(dcb_table_ptr->tail_data,
+                                        (void *)(app_in_address +
+                                        data_in_size - tail_size), tail_size)) {
+                                        error = -EFAULT;
+                                        goto end_function;
+                                }
+                        }
+                        if (app_out_address)
+                                /*
+                                 * Calculate the output address
+                                 * according to tail data size
+                                 */
+                                dcb_table_ptr->out_vr_tail_pt =
+                                        (u32)app_out_address + data_in_size
+                                        - tail_size;
+
+                        /* Save the real tail data size */
+                        dcb_table_ptr->tail_data_size = tail_size;
+                        /*
+                         * Update the data size without the tail
+                         * data size AKA data for the dma
+                         */
+                        data_in_size = (data_in_size - tail_size);
+                }
+        }
+        /* Check if we need to build only input table or input/output */
+        if (app_out_address) {
+                /* Prepare input/output tables */
+                error = sep_prepare_input_output_dma_table(sep,
+                        app_in_address,
+                        app_out_address,
+                        data_in_size,
+                        block_size,
+                        &in_first_mlli_address,
+                        &out_first_mlli_address,
+                        &in_first_num_entries,
+                        &out_first_num_entries,
+                        &first_data_size,
+                        is_kva);
+        } else {
+                /* Prepare input tables */
+                error = sep_prepare_input_dma_table(sep,
+                        app_in_address,
+                        data_in_size,
+                        block_size,
+                        &in_first_mlli_address,
+                        &in_first_num_entries,
+                        &first_data_size,
+                        is_kva);
+        }
+
+        if (error) {
+                dev_warn(&sep->pdev->dev, "prepare DMA table call failed from prepare DCB call\n");
+                goto end_function;
+        }
+
+        /* Set the DCB values */
+        dcb_table_ptr->input_mlli_address = in_first_mlli_address;
+        dcb_table_ptr->input_mlli_num_entries = in_first_num_entries;
+        dcb_table_ptr->input_mlli_data_size = first_data_size;
+        dcb_table_ptr->output_mlli_address = out_first_mlli_address;
+        dcb_table_ptr->output_mlli_num_entries = out_first_num_entries;
+        dcb_table_ptr->output_mlli_data_size = first_data_size;
+
+end_function:
+        dev_dbg(&sep->pdev->dev,
+                "sep_prepare_input_output_dma_table_in_dcb end\n");
+        return error;
+
+}
+
+
+/**
+ *      sep_create_sync_dma_tables_handler - create sync DMA tables
+ *      @sep: pointer to struct sep_device
+ *      @arg: pointer to struct bld_syn_tab_struct
+ *
+ *      Handle the request for creation of the DMA tables for the synchronic
+ *      symmetric operations (AES,DES). Note that all bus addresses that are
+ *      passed to the SEP are in 32 bit format; the SEP is a 32 bit device
+ */
+static int sep_create_sync_dma_tables_handler(struct sep_device *sep,
+                                                unsigned long arg)
+{
+        int error = 0;
+
+        /* Command arguments */
+        struct bld_syn_tab_struct command_args;
+
+        dev_dbg(&sep->pdev->dev,
+                "sep_create_sync_dma_tables_handler start\n");
+
+        if (copy_from_user(&command_args, (void __user *)arg,
+                                        sizeof(struct bld_syn_tab_struct))) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        dev_dbg(&sep->pdev->dev, "app_in_address is %08llx\n",
+                                                command_args.app_in_address);
+        dev_dbg(&sep->pdev->dev, "app_out_address is %08llx\n",
+                                                command_args.app_out_address);
+        dev_dbg(&sep->pdev->dev, "data_size is %u\n",
+                                                command_args.data_in_size);
+        dev_dbg(&sep->pdev->dev, "block_size is %u\n",
+                                                command_args.block_size);
+
+        /* Validate user parameters */
+        if (!command_args.app_in_address) {
+                error = -EINVAL;
+                goto end_function;
+        }
+
+        error = sep_prepare_input_output_dma_table_in_dcb(sep,
+                (unsigned long)command_args.app_in_address,
+                (unsigned long)command_args.app_out_address,
+                command_args.data_in_size,
+                command_args.block_size,
+                0x0,
+                false,
+                false);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_create_sync_dma_tables_handler end\n");
+        return error;
+}
+
+/**
+ *      sep_free_dma_tables_and_dcb - free DMA tables and DCBs
+ *      @sep: pointer to struct sep_device
+ *      @isapplet: indicates external application (used for kernel access)
+ *      @is_kva: indicates kernel addresses (only used for kernel crypto)
+ *
+ *      This function frees the DMA tables and DCB
+ */
+static int sep_free_dma_tables_and_dcb(struct sep_device *sep, bool isapplet,
+        bool is_kva)
+{
+        int i = 0;
+        int error = 0;
+        int error_temp = 0;
+        struct sep_dcblock *dcb_table_ptr;
+        unsigned long pt_hold;
+        void *tail_pt;
+
+        dev_dbg(&sep->pdev->dev, "sep_free_dma_tables_and_dcb start\n");
+
+        if (isapplet == true) {
+                /* Set pointer to first DCB table */
+                dcb_table_ptr = (struct sep_dcblock *)
+                        (sep->shared_addr +
+                        SEP_DRIVER_SYSTEM_DCB_MEMORY_OFFSET_IN_BYTES);
+
+                /* Go over each DCB and see if tail pointer must be updated */
+                for (i = 0; i < sep->nr_dcb_creat; i++, dcb_table_ptr++) {
+                        if (dcb_table_ptr->out_vr_tail_pt) {
+                                pt_hold = (unsigned long)dcb_table_ptr->out_vr_tail_pt;
+                                tail_pt = (void *)pt_hold;
+                                if (is_kva == true) {
+                                        memcpy(tail_pt,
+                                                dcb_table_ptr->tail_data,
+                                                dcb_table_ptr->tail_data_size);
+                                } else {
+                                        error_temp = copy_to_user(
+                                                tail_pt,
+                                                dcb_table_ptr->tail_data,
+                                                dcb_table_ptr->tail_data_size);
+                                }
+                                if (error_temp) {
+                                        /* Release the DMA resource */
+                                        error = -EFAULT;
+                                        break;
+                                }
+                        }
+                }
+        }
+        /* Free the output pages, if any */
+        sep_free_dma_table_data_handler(sep);
+
+        dev_dbg(&sep->pdev->dev, "sep_free_dma_tables_and_dcb end\n");
+        return error;
+}
+
+/**
+ *      sep_get_static_pool_addr_handler - get static pool address
+ *      @sep: pointer to struct sep_device
+ *
+ *      This function sets the bus and virtual addresses of the static pool
+ */
+static int sep_get_static_pool_addr_handler(struct sep_device *sep)
+{
+        u32 *static_pool_addr = NULL;
+
+        dev_dbg(&sep->pdev->dev, "sep_get_static_pool_addr_handler start\n");
+
+        static_pool_addr = (u32 *)(sep->shared_addr +
+                SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES);
+
+        static_pool_addr[0] = SEP_STATIC_POOL_VAL_TOKEN;
+        static_pool_addr[1] = (u32)sep->shared_bus +
+                SEP_DRIVER_STATIC_AREA_OFFSET_IN_BYTES;
+
+        dev_dbg(&sep->pdev->dev, "static pool: physical %x\n",
+                (u32)static_pool_addr[1]);
+
+        dev_dbg(&sep->pdev->dev, "sep_get_static_pool_addr_handler end\n");
+
+        return 0;
+}
+
+/**
+ *      sep_start_handler - start device
+ *      @sep: pointer to struct sep_device
+ */
+static int sep_start_handler(struct sep_device *sep)
+{
+        unsigned long reg_val;
+        unsigned long error = 0;
+
+        dev_dbg(&sep->pdev->dev, "sep_start_handler start\n");
+
+        /* Wait in polling for message from SEP */
+        do {
+                reg_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+        } while (!reg_val);
+
+        /* Check the value */
+        if (reg_val == 0x1)
+                /* Fatal error - read error status from GPRO */
+                error = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+        dev_dbg(&sep->pdev->dev, "sep_start_handler end\n");
+        return error;
+}
+
+/**
+ *      ep_check_sum_calc - checksum messages
+ *      @data: buffer to checksum
+ *      @length: buffer size
+ *
+ *      This function performs a checksum for messages that are sent
+ *      to the SEP.
+ */
+static u32 sep_check_sum_calc(u8 *data, u32 length)
+{
+        u32 sum = 0;
+        u16 *Tdata = (u16 *)data;
+
+        while (length > 1) {
+                /*  This is the inner loop */
+                sum += *Tdata++;
+                length -= 2;
+        }
+
+        /*  Add left-over byte, if any */
+        if (length > 0)
+                sum += *(u8 *)Tdata;
+
+        /*  Fold 32-bit sum to 16 bits */
+        while (sum>>16)
+                sum = (sum & 0xffff) + (sum >> 16);
+
+        return ~sum & 0xFFFF;
+}
+
+/**
+ *      sep_init_handler -
+ *      @sep: pointer to struct sep_device
+ *      @arg: parameters from user space application
+ *
+ *      Handles the request for SEP initialization
+ *      Note that this will go away for Medfield once the SCU
+ *      SEP initialization is complete
+ *      Also note that the message to the SEP has components
+ *      from user space as well as components written by the driver
+ *      This is becuase the portions of the message that pertain to
+ *      physical addresses must be set by the driver after the message
+ *      leaves custody of the user space application for security
+ *      reasons.
+ */
+static int sep_init_handler(struct sep_device *sep, unsigned long arg)
+{
+        u32 message_buff[14];
+        u32 counter;
+        int error = 0;
+        u32 reg_val;
+        dma_addr_t new_base_addr;
+        unsigned long addr_hold;
+        struct init_struct command_args;
+
+        dev_dbg(&sep->pdev->dev, "sep_init_handler start\n");
+
+        /* Make sure that we have not initialized already */
+        reg_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+
+        if (reg_val != 0x2) {
+                error = SEP_ALREADY_INITIALIZED_ERR;
+                dev_warn(&sep->pdev->dev, "init; device already initialized\n");
+                goto end_function;
+        }
+
+        /* Only root can initialize */
+        if (!capable(CAP_SYS_ADMIN)) {
+                error = -EACCES;
+                goto end_function;
+        }
+
+        /* Copy in the parameters */
+        error = copy_from_user(&command_args, (void __user *)arg,
+                sizeof(struct init_struct));
+
+        if (error) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        /* Validate parameters */
+        if (!command_args.message_addr || !command_args.sep_sram_addr ||
+                command_args.message_size_in_words > 14) {
+                error = -EINVAL;
+                goto end_function;
+        }
+
+        /* Copy in the SEP init message */
+        addr_hold = (unsigned long)command_args.message_addr;
+        error = copy_from_user(message_buff,
+                (void __user *)addr_hold,
+                command_args.message_size_in_words*sizeof(u32));
+
+        if (error) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        /* Load resident, cache, and extapp firmware */
+        error = sep_load_firmware(sep);
+
+        if (error) {
+                dev_warn(&sep->pdev->dev,
+                        "init; copy SEP init message failed %x\n", error);
+                goto end_function;
+        }
+
+        /* Compute the base address */
+        new_base_addr = sep->shared_bus;
+
+        if (sep->resident_bus < new_base_addr)
+                new_base_addr = sep->resident_bus;
+
+        if (sep->cache_bus < new_base_addr)
+                new_base_addr = sep->cache_bus;
+
+        if (sep->dcache_bus < new_base_addr)
+                new_base_addr = sep->dcache_bus;
+
+        /* Put physical addresses in SEP message */
+        message_buff[3] = (u32)new_base_addr;
+        message_buff[4] = (u32)sep->shared_bus;
+        message_buff[6] = (u32)sep->resident_bus;
+        message_buff[7] = (u32)sep->cache_bus;
+        message_buff[8] = (u32)sep->dcache_bus;
+
+        message_buff[command_args.message_size_in_words - 1] = 0x0;
+        message_buff[command_args.message_size_in_words - 1] =
+                sep_check_sum_calc((u8 *)message_buff,
+                command_args.message_size_in_words*sizeof(u32));
+
+        /* Debug print of message */
+        for (counter = 0; counter < command_args.message_size_in_words;
+                                                                counter++)
+                dev_dbg(&sep->pdev->dev, "init; SEP message word %d is %x\n",
+                        counter, message_buff[counter]);
+
+        /* Tell the SEP the sram address */
+        sep_write_reg(sep, HW_SRAM_ADDR_REG_ADDR, command_args.sep_sram_addr);
+
+        /* Push the message to the SEP */
+        for (counter = 0; counter < command_args.message_size_in_words;
+                                                                counter++) {
+                sep_write_reg(sep, HW_SRAM_DATA_REG_ADDR,
+                                                message_buff[counter]);
+                sep_wait_sram_write(sep);
+        }
+
+        /* Signal SEP that message is ready and to init */
+        sep_write_reg(sep, HW_HOST_HOST_SEP_GPR0_REG_ADDR, 0x1);
+
+        /* Wait for acknowledge */
+        dev_dbg(&sep->pdev->dev, "init; waiting for msg response\n");
+
+        do {
+                reg_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+        } while (!(reg_val & 0xFFFFFFFD));
+
+        if (reg_val == 0x1) {
+                dev_warn(&sep->pdev->dev, "init; device int failed\n");
+                error = sep_read_reg(sep, 0x8060);
+                dev_warn(&sep->pdev->dev, "init; sw monitor is %x\n", error);
+                error = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+                dev_warn(&sep->pdev->dev, "init; error is %x\n", error);
+                goto end_function;
+        }
+        dev_dbg(&sep->pdev->dev, "init; end CC INIT, reg_val is %x\n", reg_val);
+
+        /* Signal SEP to zero the GPR3 */
+        sep_write_reg(sep, HW_HOST_HOST_SEP_GPR0_REG_ADDR, 0x10);
+
+        /* Wait for response */
+        dev_dbg(&sep->pdev->dev, "init; waiting for zero set response\n");
+
+        do {
+                reg_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+        } while (reg_val != 0);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "init is done\n");
+        return error;
+}
+
+/**
+ *      sep_end_transaction_handler - end transaction
+ *      @sep: pointer to struct sep_device
+ *
+ *      This API handles the end transaction request
+ */
+static int sep_end_transaction_handler(struct sep_device *sep)
+{
+        dev_dbg(&sep->pdev->dev, "sep_end_transaction_handler start\n");
+
+        /* Clear the data pool pointers Token */
+        memset((void *)(sep->shared_addr +
+                SEP_DRIVER_DATA_POOL_ALLOCATION_OFFSET_IN_BYTES),
+                0, sep->num_of_data_allocations*2*sizeof(u32));
+
+        /* Check that all the DMA resources were freed */
+        sep_free_dma_table_data_handler(sep);
+
+        clear_bit(SEP_MMAP_LOCK_BIT, &sep->in_use_flags);
+
+        /*
+         * We are now through with the transaction. Let's
+         * allow other processes who have the device open
+         * to perform transactions
+         */
+        mutex_lock(&sep->sep_mutex);
+        sep->pid_doing_transaction = 0;
+        mutex_unlock(&sep->sep_mutex);
+        /* Raise event for stuck contextes */
+        wake_up(&sep->event);
+
+        dev_dbg(&sep->pdev->dev, "waking up event\n");
+        dev_dbg(&sep->pdev->dev, "sep_end_transaction_handler end\n");
+
+        return 0;
+}
+
+/**
+ *      sep_prepare_dcb_handler - prepare a control block
+ *      @sep: pointer to struct sep_device
+ *      @arg: pointer to user parameters
+ *
+ *      This function will retrieve the RAR buffer physical addresses, type
+ *      & size corresponding to the RAR handles provided in the buffers vector.
+ */
+static int sep_prepare_dcb_handler(struct sep_device *sep, unsigned long arg)
+{
+        int error;
+        /* Command arguments */
+        struct build_dcb_struct command_args;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_dcb_handler start\n");
+
+        /* Get the command arguments */
+        if (copy_from_user(&command_args, (void __user *)arg,
+                                        sizeof(struct build_dcb_struct))) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        dev_dbg(&sep->pdev->dev, "app_in_address is %08llx\n",
+                                                command_args.app_in_address);
+        dev_dbg(&sep->pdev->dev, "app_out_address is %08llx\n",
+                                                command_args.app_out_address);
+        dev_dbg(&sep->pdev->dev, "data_size is %x\n",
+                                                command_args.data_in_size);
+        dev_dbg(&sep->pdev->dev, "block_size is %x\n",
+                                                command_args.block_size);
+        dev_dbg(&sep->pdev->dev, "tail block_size is %x\n",
+                                                command_args.tail_block_size);
+
+        error = sep_prepare_input_output_dma_table_in_dcb(sep,
+                (unsigned long)command_args.app_in_address,
+                (unsigned long)command_args.app_out_address,
+                command_args.data_in_size, command_args.block_size,
+                command_args.tail_block_size, true, false);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_prepare_dcb_handler end\n");
+        return error;
+
+}
+
+/**
+ *      sep_free_dcb_handler - free control block resources
+ *      @sep: pointer to struct sep_device
+ *
+ *      This function frees the DCB resources and updates the needed
+ *      user-space buffers.
+ */
+static int sep_free_dcb_handler(struct sep_device *sep)
+{
+        int error ;
+
+        dev_dbg(&sep->pdev->dev, "sep_prepare_dcb_handler start\n");
+        dev_dbg(&sep->pdev->dev, "num of DCBs %x\n", sep->nr_dcb_creat);
+
+        error = sep_free_dma_tables_and_dcb(sep, false, false);
+
+        dev_dbg(&sep->pdev->dev, "sep_free_dcb_handler end\n");
+        return error;
+}
+
+/**
+ *      sep_rar_prepare_output_msg_handler - prepare an output message
+ *      @sep: pointer to struct sep_device
+ *      @arg: pointer to user parameters
+ *
+ *      This function will retrieve the RAR buffer physical addresses, type
+ *      & size corresponding to the RAR handles provided in the buffers vector.
+ */
+static int sep_rar_prepare_output_msg_handler(struct sep_device *sep,
+        unsigned long arg)
+{
+        int error = 0;
+        /* Command args */
+        struct rar_hndl_to_bus_struct command_args;
+        struct RAR_buffer rar_buf;
+        /* Bus address */
+        dma_addr_t  rar_bus = 0;
+        /* Holds the RAR address in the system memory offset */
+        u32 *rar_addr;
+
+        dev_dbg(&sep->pdev->dev, "sep_rar_prepare_output_msg_handler start\n");
+
+        /* Copy the data */
+        if (copy_from_user(&command_args, (void __user *)arg,
+                                                sizeof(command_args))) {
+                error = -EFAULT;
+                goto end_function;
+        }
+
+        /* Call to translation function only if user handle is not NULL */
+        if (command_args.rar_handle) {
+                memset(&rar_buf, 0, sizeof(rar_buf));
+                rar_buf.info.handle = (u32)command_args.rar_handle;
+
+                if (rar_handle_to_bus(&rar_buf, 1) != 1) {
+                        dev_dbg(&sep->pdev->dev, "rar_handle_to_bus failure\n");
+                        error = -EFAULT;
+                        goto end_function;
+                }
+                rar_bus = rar_buf.bus_address;
+        }
+        dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus);
+
+        /* Set value in the SYSTEM MEMORY offset */
+        rar_addr = (u32 *)(sep->shared_addr +
+                SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES);
+
+        /* Copy the physical address to the System Area for the SEP */
+        rar_addr[0] = SEP_RAR_VAL_TOKEN;
+        rar_addr[1] = rar_bus;
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "sep_rar_prepare_output_msg_handler start\n");
+        return error;
+}
+
+/**
+ *      sep_realloc_ext_cache_handler - report location of extcache
+ *      @sep: pointer to struct sep_device
+ *      @arg: pointer to user parameters
+ *
+ *      This function tells the SEP where the extapp is located
+ */
+static int sep_realloc_ext_cache_handler(struct sep_device *sep,
+        unsigned long arg)
+{
+        /* Holds the new ext cache address in the system memory offset */
+        u32 *system_addr;
+
+        /* Set value in the SYSTEM MEMORY offset */
+        system_addr = (u32 *)(sep->shared_addr +
+                SEP_DRIVER_SYSTEM_EXT_CACHE_ADDR_OFFSET_IN_BYTES);
+
+        /* Copy the physical address to the System Area for the SEP */
+        system_addr[0] = SEP_EXT_CACHE_ADDR_VAL_TOKEN;
+        dev_dbg(&sep->pdev->dev, "ext cache init; system addr 0 is %x\n",
+                                                        system_addr[0]);
+        system_addr[1] = sep->extapp_bus;
+        dev_dbg(&sep->pdev->dev, "ext cache init; system addr 1 is %x\n",
+                                                        system_addr[1]);
+
+        return 0;
+}
+
+/**
+ *      sep_ioctl - ioctl api
+ *      @filp: pointer to struct file
+ *      @cmd: command
+ *      @arg: pointer to argument structure
+ *
+ *      Implement the ioctl methods availble on the SEP device.
+ */
+static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        int error = 0;
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "ioctl start\n");
+
+        dev_dbg(&sep->pdev->dev, "cmd is %x\n", cmd);
+
+        /* Make sure we own this device */
+        mutex_lock(&sep->sep_mutex);
+        if ((current->pid != sep->pid_doing_transaction) &&
+                                (sep->pid_doing_transaction != 0)) {
+                dev_dbg(&sep->pdev->dev, "ioctl pid is not owner\n");
+                mutex_unlock(&sep->sep_mutex);
+                error = -EACCES;
+                goto end_function;
+        }
+
+        mutex_unlock(&sep->sep_mutex);
+
+        /* Check that the command is for SEP device */
+        if (_IOC_TYPE(cmd) != SEP_IOC_MAGIC_NUMBER) {
+                error = -ENOTTY;
+                goto end_function;
+        }
+
+        /* Lock to prevent the daemon to interfere with operation */
+        mutex_lock(&sep->ioctl_mutex);
+
+        switch (cmd) {
+        case SEP_IOCSENDSEPCOMMAND:
+                /* Send command to SEP */
+                error = sep_send_command_handler(sep);
+                break;
+        case SEP_IOCALLOCDATAPOLL:
+                /* Allocate data pool */
+                error = sep_allocate_data_pool_memory_handler(sep, arg);
+                break;
+        case SEP_IOCCREATESYMDMATABLE:
+                /* Create DMA table for synhronic operation */
+                error = sep_create_sync_dma_tables_handler(sep, arg);
+                break;
+        case SEP_IOCFREEDMATABLEDATA:
+                /* Free the pages */
+                error = sep_free_dma_table_data_handler(sep);
+                break;
+        case SEP_IOCSEPSTART:
+                /* Start command to SEP */
+                if (sep->pdev->revision == 0) /* Only for old chip */
+                        error = sep_start_handler(sep);
+                else
+                        error = -EPERM; /* Not permitted on new chip */
+                break;
+        case SEP_IOCSEPINIT:
+                /* Init command to SEP */
+                if (sep->pdev->revision == 0) /* Only for old chip */
+                        error = sep_init_handler(sep, arg);
+                else
+                        error = -EPERM; /* Not permitted on new chip */
+                break;
+        case SEP_IOCGETSTATICPOOLADDR:
+                /* Inform the SEP the bus address of the static pool */
+                error = sep_get_static_pool_addr_handler(sep);
+                break;
+        case SEP_IOCENDTRANSACTION:
+                error = sep_end_transaction_handler(sep);
+                break;
+        case SEP_IOCREALLOCEXTCACHE:
+                if (sep->pdev->revision == 0) /* Only for old chip */
+                        error = sep_realloc_ext_cache_handler(sep, arg);
+                else
+                        error = -EPERM; /* Not permitted on new chip */
+                break;
+        case SEP_IOCRARPREPAREMESSAGE:
+                error = sep_rar_prepare_output_msg_handler(sep, arg);
+                break;
+        case SEP_IOCPREPAREDCB:
+                error = sep_prepare_dcb_handler(sep, arg);
+                break;
+        case SEP_IOCFREEDCB:
+                error = sep_free_dcb_handler(sep);
+                break;
+        default:
+                dev_dbg(&sep->pdev->dev, "invalid ioctl %x\n", cmd);
+                error = -ENOTTY;
+                break;
+        }
+        mutex_unlock(&sep->ioctl_mutex);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "ioctl end\n");
+        return error;
+}
+
+/**
+ *      sep_singleton_ioctl - ioctl api for singleton interface
+ *      @filp: pointer to struct file
+ *      @cmd: command
+ *      @arg: pointer to argument structure
+ *
+ *      Implement the additional ioctls for the singleton device
+ */
+static long sep_singleton_ioctl(struct file  *filp, u32 cmd, unsigned long arg)
+{
+        long error = 0;
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "singleton_ioctl start\n");
+        dev_dbg(&sep->pdev->dev, "cmd is %x\n", cmd);
+
+        /* Check that the command is for the SEP device */
+        if (_IOC_TYPE(cmd) != SEP_IOC_MAGIC_NUMBER) {
+                error =  -ENOTTY;
+                goto end_function;
+        }
+
+        /* Make sure we own this device */
+        mutex_lock(&sep->sep_mutex);
+        if ((current->pid != sep->pid_doing_transaction) &&
+                                (sep->pid_doing_transaction != 0)) {
+                dev_dbg(&sep->pdev->dev, "singleton ioctl pid is not owner\n");
+                mutex_unlock(&sep->sep_mutex);
+                error = -EACCES;
+                goto end_function;
+        }
+
+        mutex_unlock(&sep->sep_mutex);
+
+        switch (cmd) {
+        case SEP_IOCTLSETCALLERID:
+                mutex_lock(&sep->ioctl_mutex);
+                error = sep_set_caller_id_handler(sep, arg);
+                mutex_unlock(&sep->ioctl_mutex);
+                break;
+        default:
+                error = sep_ioctl(filp, cmd, arg);
+                break;
+        }
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "singleton ioctl end\n");
+        return error;
+}
+
+/**
+ *      sep_request_daemon_ioctl - ioctl for daemon
+ *      @filp: pointer to struct file
+ *      @cmd: command
+ *      @arg: pointer to argument structure
+ *
+ *      Called by the request daemon to perform ioctls on the daemon device
+ */
+static long sep_request_daemon_ioctl(struct file *filp, u32 cmd,
+        unsigned long arg)
+{
+
+        long error;
+        struct sep_device *sep = filp->private_data;
+
+        dev_dbg(&sep->pdev->dev, "daemon ioctl: start\n");
+        dev_dbg(&sep->pdev->dev, "daemon ioctl: cmd is %x\n", cmd);
+
+        /* Check that the command is for SEP device */
+        if (_IOC_TYPE(cmd) != SEP_IOC_MAGIC_NUMBER) {
+                error = -ENOTTY;
+                goto end_function;
+        }
+
+        /* Only one process can access ioctl at any given time */
+        mutex_lock(&sep->ioctl_mutex);
+
+        switch (cmd) {
+        case SEP_IOCSENDSEPRPLYCOMMAND:
+                /* Send reply command to SEP */
+                error = sep_req_daemon_send_reply_command_handler(sep);
+                break;
+        case SEP_IOCENDTRANSACTION:
+                /*
+                 * End req daemon transaction, do nothing
+                 * will be removed upon update in middleware
+                 * API library
+                 */
+                error = 0;
+                break;
+        default:
+                dev_dbg(&sep->pdev->dev, "daemon ioctl: no such IOCTL\n");
+                error = -ENOTTY;
+        }
+        mutex_unlock(&sep->ioctl_mutex);
+
+end_function:
+        dev_dbg(&sep->pdev->dev, "daemon ioctl: end\n");
+        return error;
+
+}
+
+/**
+ *      sep_inthandler - interrupt handler
+ *      @irq: interrupt
+ *      @dev_id: device id
+ */
+static irqreturn_t sep_inthandler(int irq, void *dev_id)
+{
+        irqreturn_t int_error = IRQ_HANDLED;
+        unsigned long lck_flags;
+        u32 reg_val, reg_val2 = 0;
+        struct sep_device *sep = dev_id;
+
+        /* Read the IRR register to check if this is SEP interrupt */
+        reg_val = sep_read_reg(sep, HW_HOST_IRR_REG_ADDR);
+        dev_dbg(&sep->pdev->dev, "SEP Interrupt - reg is %08x\n", reg_val);
+
+        if (reg_val & (0x1 << 13)) {
+                /* Lock and update the counter of reply messages */
+                spin_lock_irqsave(&sep->snd_rply_lck, lck_flags);
+                sep->reply_ct++;
+                spin_unlock_irqrestore(&sep->snd_rply_lck, lck_flags);
+
+                dev_dbg(&sep->pdev->dev, "sep int: send_ct %lx reply_ct %lx\n",
+                                        sep->send_ct, sep->reply_ct);
+
+                /* Is this printf or daemon request? */
+                reg_val2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR2_REG_ADDR);
+                dev_dbg(&sep->pdev->dev,
+                        "SEP Interrupt - reg2 is %08x\n", reg_val2);
+
+                if ((reg_val2 >> 30) & 0x1) {
+                        dev_dbg(&sep->pdev->dev, "int: printf request\n");
+                        wake_up(&sep->event_request_daemon);
+                } else if (reg_val2 >> 31) {
+                        dev_dbg(&sep->pdev->dev, "int: daemon request\n");
+                        wake_up(&sep->event_request_daemon);
+                } else {
+                        dev_dbg(&sep->pdev->dev, "int: SEP reply\n");
+                        wake_up(&sep->event);
+                }
+        } else {
+                dev_dbg(&sep->pdev->dev, "int: not SEP interrupt\n");
+                int_error = IRQ_NONE;
+        }
+        if (int_error == IRQ_HANDLED)
+                sep_write_reg(sep, HW_HOST_ICR_REG_ADDR, reg_val);
+
+        return int_error;
+}
+
+/**
+ *      sep_reconfig_shared_area - reconfigure shared area
+ *      @sep: pointer to struct sep_device
+ *
+ *      Reconfig the shared area between HOST and SEP - needed in case
+ *      the DX_CC_Init function was called before OS loading.
+ */
+static int sep_reconfig_shared_area(struct sep_device *sep)
+{
+        int ret_val;
+
+        /* use to limit waiting for SEP */
+        unsigned long end_time;
+
+        dev_dbg(&sep->pdev->dev, "reconfig shared area start\n");
+
+        /* Send the new SHARED MESSAGE AREA to the SEP */
+        dev_dbg(&sep->pdev->dev, "sending %08llx to sep\n",
+                                (unsigned long long)sep->shared_bus);
+
+        sep_write_reg(sep, HW_HOST_HOST_SEP_GPR1_REG_ADDR, sep->shared_bus);
+
+        /* Poll for SEP response */
+        ret_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR1_REG_ADDR);
+
+        end_time = jiffies + (WAIT_TIME * HZ);
+
+        while ((time_before(jiffies, end_time)) && (ret_val != 0xffffffff) &&
+                (ret_val != sep->shared_bus))
+                ret_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR1_REG_ADDR);
+
+        /* Check the return value (register) */
+        if (ret_val != sep->shared_bus) {
+                dev_warn(&sep->pdev->dev, "could not reconfig shared area\n");
+                dev_warn(&sep->pdev->dev, "result was %x\n", ret_val);
+                ret_val = -ENOMEM;
+        } else
+                ret_val = 0;
+
+        dev_dbg(&sep->pdev->dev, "reconfig shared area end\n");
+        return ret_val;
+}
+
+/* File operation for singleton SEP operations */
+static const struct file_operations singleton_file_operations = {
+        .owner = THIS_MODULE,
+        .unlocked_ioctl = sep_singleton_ioctl,
+        .poll = sep_poll,
+        .open = sep_singleton_open,
+        .release = sep_singleton_release,
+        .mmap = sep_mmap,
+};
+
+/* File operation for daemon operations */
+static const struct file_operations daemon_file_operations = {
+        .owner = THIS_MODULE,
+        .unlocked_ioctl = sep_request_daemon_ioctl,
+        .poll = sep_request_daemon_poll,
+        .open = sep_request_daemon_open,
+        .release = sep_request_daemon_release,
+        .mmap = sep_request_daemon_mmap,
+};
+
+/* The files operations structure of the driver */
+static const struct file_operations sep_file_operations = {
+        .owner = THIS_MODULE,
+        .unlocked_ioctl = sep_ioctl,
+        .poll = sep_poll,
+        .open = sep_open,
+        .release = sep_release,
+        .mmap = sep_mmap,
+};
+
+/**
+ *      sep_register_driver_with_fs - register misc devices
+ *      @sep: pointer to struct sep_device
+ *
+ *      This function registers the driver with the file system
+ */
+static int sep_register_driver_with_fs(struct sep_device *sep)
+{
+        int ret_val;
+
+        sep->miscdev_sep.minor = MISC_DYNAMIC_MINOR;
+        sep->miscdev_sep.name = SEP_DEV_NAME;
+        sep->miscdev_sep.fops = &sep_file_operations;
+
+        sep->miscdev_singleton.minor = MISC_DYNAMIC_MINOR;
+        sep->miscdev_singleton.name = SEP_DEV_SINGLETON;
+        sep->miscdev_singleton.fops = &singleton_file_operations;
+
+        sep->miscdev_daemon.minor = MISC_DYNAMIC_MINOR;
+        sep->miscdev_daemon.name = SEP_DEV_DAEMON;
+        sep->miscdev_daemon.fops = &daemon_file_operations;
+
+        ret_val = misc_register(&sep->miscdev_sep);
+        if (ret_val) {
+                dev_warn(&sep->pdev->dev, "misc reg fails for SEP %x\n",
+                        ret_val);
+                return ret_val;
+        }
+
+        ret_val = misc_register(&sep->miscdev_singleton);
+        if (ret_val) {
+                dev_warn(&sep->pdev->dev, "misc reg fails for sing %x\n",
+                        ret_val);
+                misc_deregister(&sep->miscdev_sep);
+                return ret_val;
+        }
+
+        ret_val = misc_register(&sep->miscdev_daemon);
+        if (ret_val) {
+                dev_warn(&sep->pdev->dev, "misc reg fails for dmn %x\n",
+                        ret_val);
+                misc_deregister(&sep->miscdev_sep);
+                misc_deregister(&sep->miscdev_singleton);
+
+                return ret_val;
+        }
+        return ret_val;
+}
+
+
+/**
+ *      sep_probe - probe a matching PCI device
+ *      @pdev: pci_device
+ *      @end: pci_device_id
+ *
+ *      Attempt to set up and configure a SEP device that has been
+ *      discovered by the PCI layer.
+ */
+static int __devinit sep_probe(struct pci_dev *pdev,
+        const struct pci_device_id *ent)
+{
+        int error = 0;
+        struct sep_device *sep;
+
+        pr_debug("SEP pci probe starting\n");
+        if (sep_dev != NULL) {
+                dev_warn(&pdev->dev, "only one SEP supported.\n");
+                return -EBUSY;
+        }
+
+        /* Enable the device */
+        error = pci_enable_device(pdev);
+        if (error) {
+                dev_warn(&pdev->dev, "error enabling pci device\n");
+                goto end_function;
+        }
+
+        /* Allocate the sep_device structure for this device */
+        sep_dev = kzalloc(sizeof(struct sep_device), GFP_ATOMIC);
+        if (sep_dev == NULL) {
+                dev_warn(&pdev->dev,
+                        "can't kmalloc the sep_device structure\n");
+                error = -ENOMEM;
+                goto end_function_disable_device;
+        }
+
+        /*
+         * We're going to use another variable for actually
+         * working with the device; this way, if we have
+         * multiple devices in the future, it would be easier
+         * to make appropriate changes
+         */
+        sep = sep_dev;
+
+        sep->pdev = pci_dev_get(pdev);
+
+        init_waitqueue_head(&sep->event);
+        init_waitqueue_head(&sep->event_request_daemon);
+        spin_lock_init(&sep->snd_rply_lck);
+        mutex_init(&sep->sep_mutex);
+        mutex_init(&sep->ioctl_mutex);
+
+        dev_dbg(&sep->pdev->dev, "PCI obtained, device being prepared\n");
+        dev_dbg(&sep->pdev->dev, "revision is %d\n", sep->pdev->revision);
+
+        /* Set up our register area */
+        sep->reg_physical_addr = pci_resource_start(sep->pdev, 0);
+        if (!sep->reg_physical_addr) {
+                dev_warn(&sep->pdev->dev, "Error getting register start\n");
+                error = -ENODEV;
+                goto end_function_free_sep_dev;
+        }
+
+        sep->reg_physical_end = pci_resource_end(sep->pdev, 0);
+        if (!sep->reg_physical_end) {
+                dev_warn(&sep->pdev->dev, "Error getting register end\n");
+                error = -ENODEV;
+                goto end_function_free_sep_dev;
+        }
+
+        sep->reg_addr = ioremap_nocache(sep->reg_physical_addr,
+                (size_t)(sep->reg_physical_end - sep->reg_physical_addr + 1));
+        if (!sep->reg_addr) {
+                dev_warn(&sep->pdev->dev, "Error getting register virtual\n");
+                error = -ENODEV;
+                goto end_function_free_sep_dev;
+        }
+
+        dev_dbg(&sep->pdev->dev,
+                "Register area start %llx end %llx virtual %p\n",
+                (unsigned long long)sep->reg_physical_addr,
+                (unsigned long long)sep->reg_physical_end,
+                sep->reg_addr);
+
+        /* Allocate the shared area */
+        sep->shared_size = SEP_DRIVER_MESSAGE_SHARED_AREA_SIZE_IN_BYTES +
+                SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES +
+                SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES +
+                SEP_DRIVER_STATIC_AREA_SIZE_IN_BYTES +
+                SEP_DRIVER_SYSTEM_DATA_MEMORY_SIZE_IN_BYTES;
+
+        if (sep_map_and_alloc_shared_area(sep)) {
+                error = -ENOMEM;
+                /* Allocation failed */
+                goto end_function_error;
+        }
+
+        sep->rar_size = FAKE_RAR_SIZE;
+        sep->rar_addr = dma_alloc_coherent(&sep->pdev->dev,
+                sep->rar_size, &sep->rar_bus, GFP_KERNEL);
+        if (sep->rar_addr == NULL) {
+                dev_warn(&sep->pdev->dev, "can't allocate mfld rar\n");
+                error = -ENOMEM;
+                goto end_function_deallocate_sep_shared_area;
+        }
+
+        dev_dbg(&sep->pdev->dev, "rar start is %p, phy is %llx,"
+                " size is %zx\n", sep->rar_addr,
+                (unsigned long long)sep->rar_bus,
+                sep->rar_size);
+
+        dev_dbg(&sep->pdev->dev, "about to write IMR and ICR REG_ADDR\n");
+
+        /* Clear ICR register */
+        sep_write_reg(sep, HW_HOST_ICR_REG_ADDR, 0xFFFFFFFF);
+
+        /* Set the IMR register - open only GPR 2 */
+        sep_write_reg(sep, HW_HOST_IMR_REG_ADDR, (~(0x1 << 13)));
+
+        /* Read send/receive counters from SEP */
+        sep->reply_ct = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR2_REG_ADDR);
+        sep->reply_ct &= 0x3FFFFFFF;
+        sep->send_ct = sep->reply_ct;
+
+        dev_dbg(&sep->pdev->dev, "about to call request_irq\n");
+        /* Get the interrupt line */
+        error = request_irq(pdev->irq, sep_inthandler, IRQF_SHARED,
+                "sep_driver", sep);
+
+        if (error)
+                goto end_function_dealloc_rar;
+
+        /* The new chip requires ashared area reconfigure */
+        if (sep->pdev->revision == 4) { /* Only for new chip */
+                error = sep_reconfig_shared_area(sep);
+                if (error)
+                        goto end_function_free_irq;
+        }
+        /* Finally magic up the device nodes */
+        /* Register driver with the fs */
+        error = sep_register_driver_with_fs(sep);
+        if (error == 0)
+                /* Success */
+                return 0;
+
+end_function_free_irq:
+        free_irq(pdev->irq, sep);
+
+end_function_dealloc_rar:
+        if (sep->rar_addr)
+                dma_free_coherent(&sep->pdev->dev, sep->rar_size,
+                        sep->rar_addr, sep->rar_bus);
+        goto end_function;
+
+end_function_deallocate_sep_shared_area:
+        /* De-allocate shared area */
+        sep_unmap_and_free_shared_area(sep);
+
+end_function_error:
+        iounmap(sep->reg_addr);
+
+end_function_free_sep_dev:
+        pci_dev_put(sep_dev->pdev);
+        kfree(sep_dev);
+        sep_dev = NULL;
+
+end_function_disable_device:
+        pci_disable_device(pdev);
+
+end_function:
+        return error;
+}
+
+static void sep_remove(struct pci_dev *pdev)
+{
+        struct sep_device *sep = sep_dev;
+
+        /* Unregister from fs */
+        misc_deregister(&sep->miscdev_sep);
+        misc_deregister(&sep->miscdev_singleton);
+        misc_deregister(&sep->miscdev_daemon);
+
+        /* Free the irq */
+        free_irq(sep->pdev->irq, sep);
+
+        /* Free the shared area  */
+        sep_unmap_and_free_shared_area(sep_dev);
+        iounmap((void *) sep_dev->reg_addr);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = {
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MFLD_PCI_DEVICE_ID)},
+        {0}
+};
+
+MODULE_DEVICE_TABLE(pci, sep_pci_id_tbl);
+
+/* Field for registering driver to PCI device */
+static struct pci_driver sep_pci_driver = {
+        .name = "sep_sec_driver",
+        .id_table = sep_pci_id_tbl,
+        .probe = sep_probe,
+        .remove = sep_remove
+};
+
+
+/**
+ *      sep_init - init function
+ *
+ *      Module load time. Register the PCI device driver.
+ */
+static int __init sep_init(void)
+{
+        return pci_register_driver(&sep_pci_driver);
+}
+
+
+/**
+ *      sep_exit - called to unload driver
+ *
+ *      Drop the misc devices then remove and unmap the various resources
+ *      that are not released by the driver remove method.
+ */
+static void __exit sep_exit(void)
+{
+        pci_unregister_driver(&sep_pci_driver);
+}
+
+
+module_init(sep_init);
+module_exit(sep_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/sep/sep_driver_api.h b/drivers/staging/sep/sep_driver_api.h
new file mode 100644
index 000000000000..fbbfa2396555
--- /dev/null
+++ b/drivers/staging/sep/sep_driver_api.h
@@ -0,0 +1,297 @@
+/*
+ *
+ *  sep_driver_api.h - Security Processor Driver api definitions
+ *
+ *  Copyright(c) 2009,2010 Intel Corporation. All rights reserved.
+ *  Contributions(c) 2009,2010 Discretix. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; version 2 of the License.
+ *
+ *  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., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *  CONTACTS:
+ *
+ *  Mark Allyn          mark.a.allyn@intel.com
+ *  Jayant Mangalampalli jayant.mangalampalli@intel.com
+ *
+ *  CHANGES:
+ *
+ *  2010.09.14  Upgrade to Medfield
+ *
+ */
+
+#ifndef __SEP_DRIVER_API_H__
+#define __SEP_DRIVER_API_H__
+
+/* Type of request from device */
+#define SEP_DRIVER_SRC_REPLY            1
+#define SEP_DRIVER_SRC_REQ              2
+#define SEP_DRIVER_SRC_PRINTF           3
+
+
+/*-------------------------------------------
+    TYPEDEFS
+----------------------------------------------*/
+
+/*
+ * Note that several members of these structres are only here
+ * for campatability with the middleware; they are not used
+ * by this driver.
+ * All user space buffer addresses are set to aligned u64
+ * in order to ensure compatibility with 64 bit systems
+ */
+
+/*
+  init command struct; this will go away when SCU does init
+*/
+struct init_struct {
+        /* address that SEP can access for message */
+        aligned_u64   message_addr;
+
+        /* message size */
+        u32   message_size_in_words;
+
+        /* offset of the init message in the sep sram */
+        u32   sep_sram_addr;
+
+        /* -not used- resident size in bytes*/
+        u32   unused_resident_size_in_bytes;
+
+        /* -not used- cache size in bytes*/
+        u32   unused_cache_size_in_bytes;
+
+        /* -not used- ext cache current address */
+        aligned_u64   unused_extcache_addr;
+
+        /* -not used- ext cache size in bytes*/
+        u32   unused_extcache_size_in_bytes;
+};
+
+struct realloc_ext_struct {
+        /* -not used- current external cache address */
+        aligned_u64   unused_ext_cache_addr;
+
+        /* -not used- external cache size in bytes*/
+        u32   unused_ext_cache_size_in_bytes;
+};
+
+struct alloc_struct {
+        /* offset from start of shared pool area */
+        u32  offset;
+        /* number of bytes to allocate */
+        u32  num_bytes;
+};
+
+/*
+        Note that all app addresses are cast as u32; the sep
+        middleware sends them as fixed 32 bit words
+*/
+struct bld_syn_tab_struct {
+        /* address value of the data in (user space addr) */
+        aligned_u64 app_in_address;
+
+        /* size of data in */
+        u32 data_in_size;
+
+        /* address of the data out (user space addr) */
+        aligned_u64 app_out_address;
+
+        /* the size of the block of the operation - if needed,
+           every table will be modulo this parameter */
+        u32 block_size;
+
+        /* -not used- distinct user/kernel layout */
+        bool isKernelVirtualAddress;
+
+};
+
+/* command struct for getting caller id value and address */
+struct caller_id_struct {
+        /* pid of the process */
+        u32 pid;
+        /* virtual address of the caller id hash */
+        aligned_u64 callerIdAddress;
+        /* caller id hash size in bytes */
+        u32 callerIdSizeInBytes;
+};
+
+/*
+  structure that represents DCB
+*/
+struct sep_dcblock {
+        /* physical address of the first input mlli */
+        u32     input_mlli_address;
+        /* num of entries in the first input mlli */
+        u32     input_mlli_num_entries;
+        /* size of data in the first input mlli */
+        u32     input_mlli_data_size;
+        /* physical address of the first output mlli */
+        u32     output_mlli_address;
+        /* num of entries in the first output mlli */
+        u32     output_mlli_num_entries;
+        /* size of data in the first output mlli */
+        u32     output_mlli_data_size;
+        /* pointer to the output virtual tail */
+        u32     out_vr_tail_pt;
+        /* size of tail data */
+        u32     tail_data_size;
+        /* input tail data array */
+        u8      tail_data[64];
+};
+
+struct sep_caller_id_entry {
+        int pid;
+        unsigned char callerIdHash[SEP_CALLER_ID_HASH_SIZE_IN_BYTES];
+};
+
+/*
+        command structure for building dcb block (currently for ext app only
+*/
+struct build_dcb_struct {
+        /* address value of the data in */
+        aligned_u64 app_in_address;
+        /* size of data in */
+        u32  data_in_size;
+        /* address of the data out */
+        aligned_u64 app_out_address;
+        /* the size of the block of the operation - if needed,
+        every table will be modulo this parameter */
+        u32  block_size;
+        /* the size of the block of the operation - if needed,
+        every table will be modulo this parameter */
+        u32  tail_block_size;
+};
+
+/**
+ * @struct sep_dma_map
+ *
+ * Structure that contains all information needed for mapping the user pages
+ *           or kernel buffers for dma operations
+ *
+ *
+ */
+struct sep_dma_map {
+        /* mapped dma address */
+        dma_addr_t    dma_addr;
+        /* size of the mapped data */
+        size_t        size;
+};
+
+struct sep_dma_resource {
+        /* array of pointers to the pages that represent
+        input data for the synchronic DMA action */
+        struct page **in_page_array;
+
+        /* array of pointers to the pages that represent out
+        data for the synchronic DMA action */
+        struct page **out_page_array;
+
+        /* number of pages in the sep_in_page_array */
+        u32 in_num_pages;
+
+        /* number of pages in the sep_out_page_array */
+        u32 out_num_pages;
+
+        /* map array of the input data */
+        struct sep_dma_map *in_map_array;
+
+        /* map array of the output data */
+        struct sep_dma_map *out_map_array;
+
+        /* number of entries of the input mapp array */
+        u32 in_map_num_entries;
+
+        /* number of entries of the output mapp array */
+        u32 out_map_num_entries;
+};
+
+
+/* command struct for translating rar handle to bus address
+   and setting it at predefined location */
+struct rar_hndl_to_bus_struct {
+
+        /* rar handle */
+        aligned_u64 rar_handle;
+};
+
+/*
+  structure that represent one entry in the DMA LLI table
+*/
+struct sep_lli_entry {
+        /* physical address */
+        u32 bus_address;
+
+        /* block size */
+        u32 block_size;
+};
+
+/*----------------------------------------------------------------
+        IOCTL command defines
+        -----------------------------------------------------------------*/
+
+/* magic number 1 of the sep IOCTL command */
+#define SEP_IOC_MAGIC_NUMBER                         's'
+
+/* sends interrupt to sep that message is ready */
+#define SEP_IOCSENDSEPCOMMAND    \
+        _IO(SEP_IOC_MAGIC_NUMBER, 0)
+
+/* sends interrupt to sep that message is ready */
+#define SEP_IOCSENDSEPRPLYCOMMAND        \
+        _IO(SEP_IOC_MAGIC_NUMBER, 1)
+
+/* allocate memory in data pool */
+#define SEP_IOCALLOCDATAPOLL    \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 2, struct alloc_struct)
+
+/* create sym dma lli tables */
+#define SEP_IOCCREATESYMDMATABLE        \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 5, struct bld_syn_tab_struct)
+
+/* free dynamic data aalocated during table creation */
+#define SEP_IOCFREEDMATABLEDATA  \
+        _IO(SEP_IOC_MAGIC_NUMBER, 7)
+
+/* get the static pool area addersses (physical and virtual) */
+#define SEP_IOCGETSTATICPOOLADDR        \
+        _IO(SEP_IOC_MAGIC_NUMBER, 8)
+
+/* start sep command */
+#define SEP_IOCSEPSTART  \
+        _IO(SEP_IOC_MAGIC_NUMBER, 12)
+
+/* init sep command */
+#define SEP_IOCSEPINIT  \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 13, struct init_struct)
+
+/* end transaction command */
+#define SEP_IOCENDTRANSACTION    \
+        _IO(SEP_IOC_MAGIC_NUMBER, 15)
+
+/* reallocate external app; unused structure still needed for
+ * compatability with middleware */
+#define SEP_IOCREALLOCEXTCACHE  \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 18, struct realloc_ext_struct)
+
+#define SEP_IOCRARPREPAREMESSAGE        \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 20, struct rar_hndl_to_bus_struct)
+
+#define SEP_IOCTLSETCALLERID    \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 34, struct caller_id_struct)
+
+#define SEP_IOCPREPAREDCB                                       \
+        _IOW(SEP_IOC_MAGIC_NUMBER, 35, struct build_dcb_struct)
+
+#define SEP_IOCFREEDCB                                  \
+        _IO(SEP_IOC_MAGIC_NUMBER, 36)
+
+#endif
diff --git a/drivers/staging/sep/sep_driver_config.h b/drivers/staging/sep/sep_driver_config.h
new file mode 100644
index 000000000000..b18625d2f7f4
--- /dev/null
+++ b/drivers/staging/sep/sep_driver_config.h
@@ -0,0 +1,239 @@
+/*
+ *
+ *  sep_driver_config.h - Security Processor Driver configuration
+ *
+ *  Copyright(c) 2009,2010 Intel Corporation. All rights reserved.
+ *  Contributions(c) 2009,2010 Discretix. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; version 2 of the License.
+ *
+ *  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., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *  CONTACTS:
+ *
+ *  Mark Allyn          mark.a.allyn@intel.com
+ *  Jayant Mangalampalli jayant.mangalampalli@intel.com
+ *
+ *  CHANGES:
+ *
+ *  2010.06.26  Upgrade to Medfield
+ *
+ */
+
+#ifndef __SEP_DRIVER_CONFIG_H__
+#define __SEP_DRIVER_CONFIG_H__
+
+
+/*--------------------------------------
+  DRIVER CONFIGURATION FLAGS
+  -------------------------------------*/
+
+/* if flag is on , then the driver is running in polling and
+        not interrupt mode */
+#define SEP_DRIVER_POLLING_MODE                         0
+
+/* flag which defines if the shared area address should be
+        reconfiged (send to SEP anew) during init of the driver */
+#define SEP_DRIVER_RECONFIG_MESSAGE_AREA                0
+
+/* the mode for running on the ARM1172 Evaluation platform (flag is 1) */
+#define SEP_DRIVER_ARM_DEBUG_MODE                       0
+
+/*-------------------------------------------
+        INTERNAL DATA CONFIGURATION
+        -------------------------------------------*/
+
+/* flag for the input array */
+#define SEP_DRIVER_IN_FLAG                              0
+
+/* flag for output array */
+#define SEP_DRIVER_OUT_FLAG                             1
+
+/* maximum number of entries in one LLI tables */
+#define SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP             31
+
+/* minimum data size of the MLLI table */
+#define SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE              16
+
+/* flag that signifies tah the lock is
+currently held by the proccess (struct file) */
+#define SEP_DRIVER_OWN_LOCK_FLAG                        1
+
+/* flag that signifies tah the lock is currently NOT
+held by the proccess (struct file) */
+#define SEP_DRIVER_DISOWN_LOCK_FLAG                     0
+
+/* indicates whether driver has mapped/unmapped shared area */
+#define SEP_REQUEST_DAEMON_MAPPED 1
+#define SEP_REQUEST_DAEMON_UNMAPPED 0
+
+/*--------------------------------------------------------
+        SHARED AREA  memory total size is 36K
+        it is divided is following:
+
+        SHARED_MESSAGE_AREA                     8K         }
+                                                                        }
+        STATIC_POOL_AREA                        4K         } MAPPED AREA ( 24 K)
+                                                                        }
+        DATA_POOL_AREA                          12K        }
+
+        SYNCHRONIC_DMA_TABLES_AREA              5K
+
+        placeholder until drver changes
+        FLOW_DMA_TABLES_AREA                    4K
+
+        SYSTEM_MEMORY_AREA                      3k
+
+        SYSTEM_MEMORY total size is 3k
+        it is divided as following:
+
+        TIME_MEMORY_AREA                     8B
+-----------------------------------------------------------*/
+
+#define SEP_DEV_NAME "sep_sec_driver"
+#define SEP_DEV_SINGLETON "sep_sec_singleton_driver"
+#define SEP_DEV_DAEMON "sep_req_daemon_driver"
+
+
+/*
+        the maximum length of the message - the rest of the message shared
+        area will be dedicated to the dma lli tables
+*/
+#define SEP_DRIVER_MAX_MESSAGE_SIZE_IN_BYTES                    (8 * 1024)
+
+/* the size of the message shared area in pages */
+#define SEP_DRIVER_MESSAGE_SHARED_AREA_SIZE_IN_BYTES            (8 * 1024)
+
+/* the size of the data pool static area in pages */
+#define SEP_DRIVER_STATIC_AREA_SIZE_IN_BYTES                    (4 * 1024)
+
+/* the size of the data pool shared area size in pages */
+#define SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES          (16 * 1024)
+
+/* the size of the message shared area in pages */
+#define SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES   (1024 * 5)
+
+/* Placeholder until driver changes */
+#define SEP_DRIVER_FLOW_DMA_TABLES_AREA_SIZE_IN_BYTES           (1024 * 4)
+
+/* system data (time, caller id etc') pool */
+#define SEP_DRIVER_SYSTEM_DATA_MEMORY_SIZE_IN_BYTES             (1024 * 3)
+
+/* the size in bytes of the time memory */
+#define SEP_DRIVER_TIME_MEMORY_SIZE_IN_BYTES                    8
+
+/* the size in bytes of the RAR parameters memory */
+#define SEP_DRIVER_SYSTEM_RAR_MEMORY_SIZE_IN_BYTES              8
+
+/* area size that is mapped  - we map the MESSAGE AREA, STATIC POOL and
+        DATA POOL areas. area must be module 4k */
+#define SEP_DRIVER_MMMAP_AREA_SIZE                              (1024 * 28)
+
+/*-----------------------------------------------
+        offsets of the areas starting from the shared area start address
+*/
+
+/* message area offset */
+#define SEP_DRIVER_MESSAGE_AREA_OFFSET_IN_BYTES                 0
+
+/* static pool area offset */
+#define SEP_DRIVER_STATIC_AREA_OFFSET_IN_BYTES \
+        (SEP_DRIVER_MESSAGE_SHARED_AREA_SIZE_IN_BYTES)
+
+/* data pool area offset */
+#define SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES \
+        (SEP_DRIVER_STATIC_AREA_OFFSET_IN_BYTES + \
+        SEP_DRIVER_STATIC_AREA_SIZE_IN_BYTES)
+
+/* synhronic dma tables area offset */
+#define SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES \
+        (SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES + \
+        SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES)
+
+/* system memory offset in bytes */
+#define SEP_DRIVER_SYSTEM_DATA_MEMORY_OFFSET_IN_BYTES \
+        (SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES + \
+        SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES)
+
+/* offset of the time area */
+#define SEP_DRIVER_SYSTEM_TIME_MEMORY_OFFSET_IN_BYTES \
+        (SEP_DRIVER_SYSTEM_DATA_MEMORY_OFFSET_IN_BYTES)
+
+/* offset of the RAR area */
+#define SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES \
+        (SEP_DRIVER_SYSTEM_TIME_MEMORY_OFFSET_IN_BYTES + \
+        SEP_DRIVER_TIME_MEMORY_SIZE_IN_BYTES)
+
+/* offset of the caller id area */
+#define SEP_CALLER_ID_OFFSET_BYTES \
+        (SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES + \
+    SEP_DRIVER_SYSTEM_RAR_MEMORY_SIZE_IN_BYTES)
+
+/* offset of the DCB area */
+#define SEP_DRIVER_SYSTEM_DCB_MEMORY_OFFSET_IN_BYTES \
+        (SEP_DRIVER_SYSTEM_DATA_MEMORY_OFFSET_IN_BYTES + \
+        0x400)
+
+/* offset of the ext cache area */
+#define SEP_DRIVER_SYSTEM_EXT_CACHE_ADDR_OFFSET_IN_BYTES \
+        SEP_DRIVER_SYSTEM_RAR_MEMORY_OFFSET_IN_BYTES
+
+/* offset of the allocation data pointer area */
+#define SEP_DRIVER_DATA_POOL_ALLOCATION_OFFSET_IN_BYTES \
+        (SEP_CALLER_ID_OFFSET_BYTES + \
+        SEP_CALLER_ID_HASH_SIZE_IN_BYTES)
+
+/* the token that defines the start of time address */
+#define SEP_TIME_VAL_TOKEN                                    0x12345678
+
+#define FAKE_RAR_SIZE (1024*1024) /* used only for mfld */
+/* DEBUG LEVEL MASKS */
+
+/* size of the caller id hash (sha2) */
+#define SEP_CALLER_ID_HASH_SIZE_IN_BYTES                      32
+
+/* size of the caller id hash (sha2) in 32 bit words */
+#define SEP_CALLER_ID_HASH_SIZE_IN_WORDS                8
+
+/* maximum number of entries in the caller id table */
+#define SEP_CALLER_ID_TABLE_NUM_ENTRIES                       20
+
+/* maximum number of symetric operation (that require DMA resource)
+        per one message */
+#define SEP_MAX_NUM_SYNC_DMA_OPS                        16
+
+/* the token that defines the start of time address */
+#define SEP_RAR_VAL_TOKEN                                     0xABABABAB
+
+/* ioctl error that should be returned when trying
+   to realloc the cache/resident second time */
+#define SEP_ALREADY_INITIALIZED_ERR                           12
+
+/* bit that locks access to the shared area */
+#define SEP_MMAP_LOCK_BIT                                     0
+
+/* bit that lock access to the poll  - after send_command */
+#define SEP_SEND_MSG_LOCK_BIT                                 1
+
+/* the token that defines the static pool address address */
+#define SEP_STATIC_POOL_VAL_TOKEN                             0xABBAABBA
+
+/* the token that defines the data pool pointers address */
+#define SEP_DATA_POOL_POINTERS_VAL_TOKEN                      0xEDDEEDDE
+
+/* the token that defines the data pool pointers address */
+#define SEP_EXT_CACHE_ADDR_VAL_TOKEN                          0xBABABABA
+
+/* Time limit for SEP to finish */
+#define WAIT_TIME 10
+
+#endif /* SEP DRIVER CONFIG */
diff --git a/drivers/staging/sep/sep_driver_hw_defs.h b/drivers/staging/sep/sep_driver_hw_defs.h
new file mode 100644
index 000000000000..300f90963de3
--- /dev/null
+++ b/drivers/staging/sep/sep_driver_hw_defs.h
@@ -0,0 +1,233 @@
+/*
+ *
+ *  sep_driver_hw_defs.h - Security Processor Driver hardware definitions
+ *
+ *  Copyright(c) 2009,2010 Intel Corporation. All rights reserved.
+ *  Contributions(c) 2009,2010 Discretix. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; version 2 of the License.
+ *
+ *  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., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *  CONTACTS:
+ *
+ *  Mark Allyn          mark.a.allyn@intel.com
+ *  Jayant Mangalampalli jayant.mangalampalli@intel.com
+ *
+ *  CHANGES:
+ *
+ *  2010.09.20  Upgrade to Medfield
+ *
+ */
+
+#ifndef SEP_DRIVER_HW_DEFS__H
+#define SEP_DRIVER_HW_DEFS__H
+
+/* PCI ID's */
+#define MFLD_PCI_DEVICE_ID 0x0826
+
+/*----------------------- */
+/* HW Registers Defines.  */
+/*                        */
+/*---------------------- -*/
+
+
+/* cf registers */
+#define         HW_R0B_ADDR_0_REG_ADDR                  0x0000UL
+#define         HW_R0B_ADDR_1_REG_ADDR                  0x0004UL
+#define         HW_R0B_ADDR_2_REG_ADDR                  0x0008UL
+#define         HW_R0B_ADDR_3_REG_ADDR                  0x000cUL
+#define         HW_R0B_ADDR_4_REG_ADDR                  0x0010UL
+#define         HW_R0B_ADDR_5_REG_ADDR                  0x0014UL
+#define         HW_R0B_ADDR_6_REG_ADDR                  0x0018UL
+#define         HW_R0B_ADDR_7_REG_ADDR                  0x001cUL
+#define         HW_R0B_ADDR_8_REG_ADDR                  0x0020UL
+#define         HW_R2B_ADDR_0_REG_ADDR                  0x0080UL
+#define         HW_R2B_ADDR_1_REG_ADDR                  0x0084UL
+#define         HW_R2B_ADDR_2_REG_ADDR                  0x0088UL
+#define         HW_R2B_ADDR_3_REG_ADDR                  0x008cUL
+#define         HW_R2B_ADDR_4_REG_ADDR                  0x0090UL
+#define         HW_R2B_ADDR_5_REG_ADDR                  0x0094UL
+#define         HW_R2B_ADDR_6_REG_ADDR                  0x0098UL
+#define         HW_R2B_ADDR_7_REG_ADDR                  0x009cUL
+#define         HW_R2B_ADDR_8_REG_ADDR                  0x00a0UL
+#define         HW_R3B_REG_ADDR                         0x00C0UL
+#define         HW_R4B_REG_ADDR                         0x0100UL
+#define         HW_CSA_ADDR_0_REG_ADDR                  0x0140UL
+#define         HW_CSA_ADDR_1_REG_ADDR                  0x0144UL
+#define         HW_CSA_ADDR_2_REG_ADDR                  0x0148UL
+#define         HW_CSA_ADDR_3_REG_ADDR                  0x014cUL
+#define         HW_CSA_ADDR_4_REG_ADDR                  0x0150UL
+#define         HW_CSA_ADDR_5_REG_ADDR                  0x0154UL
+#define         HW_CSA_ADDR_6_REG_ADDR                  0x0158UL
+#define         HW_CSA_ADDR_7_REG_ADDR                  0x015cUL
+#define         HW_CSA_ADDR_8_REG_ADDR                  0x0160UL
+#define         HW_CSA_REG_ADDR                         0x0140UL
+#define         HW_SINB_REG_ADDR                        0x0180UL
+#define         HW_SOUTB_REG_ADDR                       0x0184UL
+#define         HW_PKI_CONTROL_REG_ADDR                 0x01C0UL
+#define         HW_PKI_STATUS_REG_ADDR                  0x01C4UL
+#define         HW_PKI_BUSY_REG_ADDR                    0x01C8UL
+#define         HW_PKI_A_1025_REG_ADDR                  0x01CCUL
+#define         HW_PKI_SDMA_CTL_REG_ADDR                0x01D0UL
+#define         HW_PKI_SDMA_OFFSET_REG_ADDR             0x01D4UL
+#define         HW_PKI_SDMA_POINTERS_REG_ADDR           0x01D8UL
+#define         HW_PKI_SDMA_DLENG_REG_ADDR              0x01DCUL
+#define         HW_PKI_SDMA_EXP_POINTERS_REG_ADDR       0x01E0UL
+#define         HW_PKI_SDMA_RES_POINTERS_REG_ADDR       0x01E4UL
+#define         HW_PKI_CLR_REG_ADDR                     0x01E8UL
+#define         HW_PKI_SDMA_BUSY_REG_ADDR               0x01E8UL
+#define         HW_PKI_SDMA_FIRST_EXP_N_REG_ADDR        0x01ECUL
+#define         HW_PKI_SDMA_MUL_BY1_REG_ADDR            0x01F0UL
+#define         HW_PKI_SDMA_RMUL_SEL_REG_ADDR           0x01F4UL
+#define         HW_DES_KEY_0_REG_ADDR                   0x0208UL
+#define         HW_DES_KEY_1_REG_ADDR                   0x020CUL
+#define         HW_DES_KEY_2_REG_ADDR                   0x0210UL
+#define         HW_DES_KEY_3_REG_ADDR                   0x0214UL
+#define         HW_DES_KEY_4_REG_ADDR                   0x0218UL
+#define         HW_DES_KEY_5_REG_ADDR                   0x021CUL
+#define         HW_DES_CONTROL_0_REG_ADDR               0x0220UL
+#define         HW_DES_CONTROL_1_REG_ADDR               0x0224UL
+#define         HW_DES_IV_0_REG_ADDR                    0x0228UL
+#define         HW_DES_IV_1_REG_ADDR                    0x022CUL
+#define         HW_AES_KEY_0_ADDR_0_REG_ADDR            0x0400UL
+#define         HW_AES_KEY_0_ADDR_1_REG_ADDR            0x0404UL
+#define         HW_AES_KEY_0_ADDR_2_REG_ADDR            0x0408UL
+#define         HW_AES_KEY_0_ADDR_3_REG_ADDR            0x040cUL
+#define         HW_AES_KEY_0_ADDR_4_REG_ADDR            0x0410UL
+#define         HW_AES_KEY_0_ADDR_5_REG_ADDR            0x0414UL
+#define         HW_AES_KEY_0_ADDR_6_REG_ADDR            0x0418UL
+#define         HW_AES_KEY_0_ADDR_7_REG_ADDR            0x041cUL
+#define         HW_AES_KEY_0_REG_ADDR                   0x0400UL
+#define         HW_AES_IV_0_ADDR_0_REG_ADDR             0x0440UL
+#define         HW_AES_IV_0_ADDR_1_REG_ADDR             0x0444UL
+#define         HW_AES_IV_0_ADDR_2_REG_ADDR             0x0448UL
+#define         HW_AES_IV_0_ADDR_3_REG_ADDR             0x044cUL
+#define         HW_AES_IV_0_REG_ADDR                    0x0440UL
+#define         HW_AES_CTR1_ADDR_0_REG_ADDR             0x0460UL
+#define         HW_AES_CTR1_ADDR_1_REG_ADDR             0x0464UL
+#define         HW_AES_CTR1_ADDR_2_REG_ADDR             0x0468UL
+#define         HW_AES_CTR1_ADDR_3_REG_ADDR             0x046cUL
+#define         HW_AES_CTR1_REG_ADDR                    0x0460UL
+#define         HW_AES_SK_REG_ADDR                      0x0478UL
+#define         HW_AES_MAC_OK_REG_ADDR                  0x0480UL
+#define         HW_AES_PREV_IV_0_ADDR_0_REG_ADDR        0x0490UL
+#define         HW_AES_PREV_IV_0_ADDR_1_REG_ADDR        0x0494UL
+#define         HW_AES_PREV_IV_0_ADDR_2_REG_ADDR        0x0498UL
+#define         HW_AES_PREV_IV_0_ADDR_3_REG_ADDR        0x049cUL
+#define         HW_AES_PREV_IV_0_REG_ADDR               0x0490UL
+#define         HW_AES_CONTROL_REG_ADDR                 0x04C0UL
+#define         HW_HASH_H0_REG_ADDR                     0x0640UL
+#define         HW_HASH_H1_REG_ADDR                     0x0644UL
+#define         HW_HASH_H2_REG_ADDR                     0x0648UL
+#define         HW_HASH_H3_REG_ADDR                     0x064CUL
+#define         HW_HASH_H4_REG_ADDR                     0x0650UL
+#define         HW_HASH_H5_REG_ADDR                     0x0654UL
+#define         HW_HASH_H6_REG_ADDR                     0x0658UL
+#define         HW_HASH_H7_REG_ADDR                     0x065CUL
+#define         HW_HASH_H8_REG_ADDR                     0x0660UL
+#define         HW_HASH_H9_REG_ADDR                     0x0664UL
+#define         HW_HASH_H10_REG_ADDR                    0x0668UL
+#define         HW_HASH_H11_REG_ADDR                    0x066CUL
+#define         HW_HASH_H12_REG_ADDR                    0x0670UL
+#define         HW_HASH_H13_REG_ADDR                    0x0674UL
+#define         HW_HASH_H14_REG_ADDR                    0x0678UL
+#define         HW_HASH_H15_REG_ADDR                    0x067CUL
+#define         HW_HASH_CONTROL_REG_ADDR                0x07C0UL
+#define         HW_HASH_PAD_EN_REG_ADDR                 0x07C4UL
+#define         HW_HASH_PAD_CFG_REG_ADDR                0x07C8UL
+#define         HW_HASH_CUR_LEN_0_REG_ADDR              0x07CCUL
+#define         HW_HASH_CUR_LEN_1_REG_ADDR              0x07D0UL
+#define         HW_HASH_CUR_LEN_2_REG_ADDR              0x07D4UL
+#define         HW_HASH_CUR_LEN_3_REG_ADDR              0x07D8UL
+#define         HW_HASH_PARAM_REG_ADDR                  0x07DCUL
+#define         HW_HASH_INT_BUSY_REG_ADDR               0x07E0UL
+#define         HW_HASH_SW_RESET_REG_ADDR               0x07E4UL
+#define         HW_HASH_ENDIANESS_REG_ADDR              0x07E8UL
+#define         HW_HASH_DATA_REG_ADDR                   0x07ECUL
+#define         HW_DRNG_CONTROL_REG_ADDR                0x0800UL
+#define         HW_DRNG_VALID_REG_ADDR                  0x0804UL
+#define         HW_DRNG_DATA_REG_ADDR                   0x0808UL
+#define         HW_RND_SRC_EN_REG_ADDR                  0x080CUL
+#define         HW_AES_CLK_ENABLE_REG_ADDR              0x0810UL
+#define         HW_DES_CLK_ENABLE_REG_ADDR              0x0814UL
+#define         HW_HASH_CLK_ENABLE_REG_ADDR             0x0818UL
+#define         HW_PKI_CLK_ENABLE_REG_ADDR              0x081CUL
+#define         HW_CLK_STATUS_REG_ADDR                  0x0824UL
+#define         HW_CLK_ENABLE_REG_ADDR                  0x0828UL
+#define         HW_DRNG_SAMPLE_REG_ADDR                 0x0850UL
+#define         HW_RND_SRC_CTL_REG_ADDR                 0x0858UL
+#define         HW_CRYPTO_CTL_REG_ADDR                  0x0900UL
+#define         HW_CRYPTO_STATUS_REG_ADDR               0x090CUL
+#define         HW_CRYPTO_BUSY_REG_ADDR                 0x0910UL
+#define         HW_AES_BUSY_REG_ADDR                    0x0914UL
+#define         HW_DES_BUSY_REG_ADDR                    0x0918UL
+#define         HW_HASH_BUSY_REG_ADDR                   0x091CUL
+#define         HW_CONTENT_REG_ADDR                     0x0924UL
+#define         HW_VERSION_REG_ADDR                     0x0928UL
+#define         HW_CONTEXT_ID_REG_ADDR                  0x0930UL
+#define         HW_DIN_BUFFER_REG_ADDR                  0x0C00UL
+#define         HW_DIN_MEM_DMA_BUSY_REG_ADDR            0x0c20UL
+#define         HW_SRC_LLI_MEM_ADDR_REG_ADDR            0x0c24UL
+#define         HW_SRC_LLI_WORD0_REG_ADDR               0x0C28UL
+#define         HW_SRC_LLI_WORD1_REG_ADDR               0x0C2CUL
+#define         HW_SRAM_SRC_ADDR_REG_ADDR               0x0c30UL
+#define         HW_DIN_SRAM_BYTES_LEN_REG_ADDR          0x0c34UL
+#define         HW_DIN_SRAM_DMA_BUSY_REG_ADDR           0x0C38UL
+#define         HW_WRITE_ALIGN_REG_ADDR                 0x0C3CUL
+#define         HW_OLD_DATA_REG_ADDR                    0x0C48UL
+#define         HW_WRITE_ALIGN_LAST_REG_ADDR            0x0C4CUL
+#define         HW_DOUT_BUFFER_REG_ADDR                 0x0C00UL
+#define         HW_DST_LLI_WORD0_REG_ADDR               0x0D28UL
+#define         HW_DST_LLI_WORD1_REG_ADDR               0x0D2CUL
+#define         HW_DST_LLI_MEM_ADDR_REG_ADDR            0x0D24UL
+#define         HW_DOUT_MEM_DMA_BUSY_REG_ADDR           0x0D20UL
+#define         HW_SRAM_DEST_ADDR_REG_ADDR              0x0D30UL
+#define         HW_DOUT_SRAM_BYTES_LEN_REG_ADDR         0x0D34UL
+#define         HW_DOUT_SRAM_DMA_BUSY_REG_ADDR          0x0D38UL
+#define         HW_READ_ALIGN_REG_ADDR                  0x0D3CUL
+#define         HW_READ_LAST_DATA_REG_ADDR              0x0D44UL
+#define         HW_RC4_THRU_CPU_REG_ADDR                0x0D4CUL
+#define         HW_AHB_SINGLE_REG_ADDR                  0x0E00UL
+#define         HW_SRAM_DATA_REG_ADDR                   0x0F00UL
+#define         HW_SRAM_ADDR_REG_ADDR                   0x0F04UL
+#define         HW_SRAM_DATA_READY_REG_ADDR             0x0F08UL
+#define         HW_HOST_IRR_REG_ADDR                    0x0A00UL
+#define         HW_HOST_IMR_REG_ADDR                    0x0A04UL
+#define         HW_HOST_ICR_REG_ADDR                    0x0A08UL
+#define         HW_HOST_SEP_SRAM_THRESHOLD_REG_ADDR     0x0A10UL
+#define         HW_HOST_SEP_BUSY_REG_ADDR               0x0A14UL
+#define         HW_HOST_SEP_LCS_REG_ADDR                0x0A18UL
+#define         HW_HOST_CC_SW_RST_REG_ADDR              0x0A40UL
+#define         HW_HOST_SEP_SW_RST_REG_ADDR             0x0A44UL
+#define         HW_HOST_FLOW_DMA_SW_INT0_REG_ADDR       0x0A80UL
+#define         HW_HOST_FLOW_DMA_SW_INT1_REG_ADDR       0x0A84UL
+#define         HW_HOST_FLOW_DMA_SW_INT2_REG_ADDR       0x0A88UL
+#define         HW_HOST_FLOW_DMA_SW_INT3_REG_ADDR       0x0A8cUL
+#define         HW_HOST_FLOW_DMA_SW_INT4_REG_ADDR       0x0A90UL
+#define         HW_HOST_FLOW_DMA_SW_INT5_REG_ADDR       0x0A94UL
+#define         HW_HOST_FLOW_DMA_SW_INT6_REG_ADDR       0x0A98UL
+#define         HW_HOST_FLOW_DMA_SW_INT7_REG_ADDR       0x0A9cUL
+#define         HW_HOST_SEP_HOST_GPR0_REG_ADDR          0x0B00UL
+#define         HW_HOST_SEP_HOST_GPR1_REG_ADDR          0x0B04UL
+#define         HW_HOST_SEP_HOST_GPR2_REG_ADDR          0x0B08UL
+#define         HW_HOST_SEP_HOST_GPR3_REG_ADDR          0x0B0CUL
+#define         HW_HOST_HOST_SEP_GPR0_REG_ADDR          0x0B80UL
+#define         HW_HOST_HOST_SEP_GPR1_REG_ADDR          0x0B84UL
+#define         HW_HOST_HOST_SEP_GPR2_REG_ADDR          0x0B88UL
+#define         HW_HOST_HOST_SEP_GPR3_REG_ADDR          0x0B8CUL
+#define         HW_HOST_HOST_ENDIAN_REG_ADDR            0x0B90UL
+#define         HW_HOST_HOST_COMM_CLK_EN_REG_ADDR       0x0B94UL
+#define         HW_CLR_SRAM_BUSY_REG_REG_ADDR           0x0F0CUL
+#define         HW_CC_SRAM_BASE_ADDRESS                 0x5800UL
+
+#endif          /* ifndef HW_DEFS */
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c
index 24f47d6388f4..f4b163f7338a 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -996,7 +996,7 @@ failed_free:
 
 
 /* Jason (08/11/2009) PCI_DRV wrapper essential structs */
-static const struct pci_device_id smtcfb_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
         {0x126f, 0x710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {0x126f, 0x712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
diff --git a/drivers/staging/solo6x10/Kconfig b/drivers/staging/solo6x10/Kconfig
index d96398c701f8..2cf77c940860 100644
--- a/drivers/staging/solo6x10/Kconfig
+++ b/drivers/staging/solo6x10/Kconfig
@@ -1,7 +1,7 @@
 config SOLO6X10
         tristate "Softlogic 6x10 MPEG codec cards"
-        depends on PCI && VIDEO_DEV && SND
-        select VIDEOBUF_DMA_CONTIG
+        depends on PCI && VIDEO_DEV && SND && I2C
+        select VIDEOBUF_DMA_SG
         ---help---
           This driver supports the Softlogic based MPEG-4 and h.264 codec
           codec cards.
diff --git a/drivers/staging/solo6x10/TODO b/drivers/staging/solo6x10/TODO
index e6a2ee226743..7e6c4fa130df 100644
--- a/drivers/staging/solo6x10/TODO
+++ b/drivers/staging/solo6x10/TODO
@@ -1,7 +1,5 @@
 TODO (staging => main):
 
-        * checkpatch.pl (haven't run it yet)
-        * Lindent (should be clean, but check)
         * Motion detection flags need to be moved to v4l2
         * Some private CIDs need to be moved to v4l2
 
@@ -21,8 +19,6 @@ TODO (general):
           - implement playback via external sound jack
           - implement loopback of external sound jack with incoming audio?
           - implement pause/resume
-          - check into jacking sound from tx28xx chips directly (to avoid
-            g.723/8khz limitations)
 
 Plase send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc Ben Collins
 <bcollins@bluecherry.net>
diff --git a/drivers/staging/solo6x10/solo6010-core.c b/drivers/staging/solo6x10/solo6010-core.c
index 4a051cde55da..c433136f972c 100644
--- a/drivers/staging/solo6x10/solo6010-core.c
+++ b/drivers/staging/solo6x10/solo6010-core.c
@@ -136,6 +136,7 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
         int ret;
         int sdram;
         u8 chip_id;
+
         solo_dev = kzalloc(sizeof(*solo_dev), GFP_KERNEL);
         if (solo_dev == NULL)
                 return -ENOMEM;
@@ -163,21 +164,21 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
         chip_id = solo_reg_read(solo_dev, SOLO_CHIP_OPTION) &
                                         SOLO_CHIP_ID_MASK;
         switch (chip_id) {
-                case 7:
-                        solo_dev->nr_chans = 16;
-                        solo_dev->nr_ext = 5;
-                        break;
-                case 6:
-                        solo_dev->nr_chans = 8;
-                        solo_dev->nr_ext = 2;
-                        break;
-                default:
-                        dev_warn(&pdev->dev, "Invalid chip_id 0x%02x, "
-                                 "defaulting to 4 channels\n",
-                                 chip_id);
-                case 5:
-                        solo_dev->nr_chans = 4;
-                        solo_dev->nr_ext = 1;
+        case 7:
+                solo_dev->nr_chans = 16;
+                solo_dev->nr_ext = 5;
+                break;
+        case 6:
+                solo_dev->nr_chans = 8;
+                solo_dev->nr_ext = 2;
+                break;
+        default:
+                dev_warn(&pdev->dev, "Invalid chip_id 0x%02x, "
+                         "defaulting to 4 channels\n",
+                         chip_id);
+        case 5:
+                solo_dev->nr_chans = 4;
+                solo_dev->nr_ext = 1;
         }
 
         /* Disable all interrupts to start */
@@ -261,13 +262,18 @@ static void __devexit solo6010_pci_remove(struct pci_dev *pdev)
 }
 
 static struct pci_device_id solo6010_id_table[] = {
+        /* 6010 based cards */
         {PCI_DEVICE(PCI_VENDOR_ID_SOFTLOGIC, PCI_DEVICE_ID_SOLO6010)},
         {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_NEUSOLO_4)},
         {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_NEUSOLO_9)},
         {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_NEUSOLO_16)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_COMMSOLO_4)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_COMMSOLO_9)},
-        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_COMMSOLO_16)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_SOLO_4)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_SOLO_9)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_SOLO_16)},
+        /* 6110 based cards */
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_6110_4)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_6110_8)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_6110_16)},
         {0,}
 };
 
diff --git a/drivers/staging/solo6x10/solo6010-disp.c b/drivers/staging/solo6x10/solo6010-disp.c
index 555f024f72e7..f866f8438175 100644
--- a/drivers/staging/solo6x10/solo6010-disp.c
+++ b/drivers/staging/solo6x10/solo6010-disp.c
@@ -198,12 +198,12 @@ static void solo_motion_config(struct solo6010_dev *solo_dev)
         }
 
         /* Default motion settings */
-        solo_reg_write(solo_dev, SOLO_VI_MOT_ADR, SOLO_VI_MOTION_EN(0) |
+        solo_reg_write(solo_dev, SOLO_VI_MOT_ADR, SOLO_VI_MOTION_EN(0) |
                        (SOLO_MOTION_EXT_ADDR(solo_dev) >> 16));
         solo_reg_write(solo_dev, SOLO_VI_MOT_CTRL,
                        SOLO_VI_MOTION_FRAME_COUNT(3) |
                        SOLO_VI_MOTION_SAMPLE_LENGTH(solo_dev->video_hsize / 16)
-                       | //SOLO_VI_MOTION_INTR_START_STOP |
+                       | /* SOLO_VI_MOTION_INTR_START_STOP | */
                        SOLO_VI_MOTION_SAMPLE_COUNT(10));
 
         solo_reg_write(solo_dev, SOLO_VI_MOTION_BORDER, 0);
@@ -264,7 +264,7 @@ void solo_disp_exit(struct solo6010_dev *solo_dev)
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_CTRL(0), 0);
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_START(0), 0);
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_STOP(0), 0);
-        
+
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_CTRL(1), 0);
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_START(1), 0);
         solo_reg_write(solo_dev, SOLO_VO_RECTANGLE_STOP(1), 0);
diff --git a/drivers/staging/solo6x10/solo6010-enc.c b/drivers/staging/solo6x10/solo6010-enc.c
index a6cf0a8a3f20..481a49277f77 100644
--- a/drivers/staging/solo6x10/solo6010-enc.c
+++ b/drivers/staging/solo6x10/solo6010-enc.c
@@ -22,7 +22,7 @@
 #include "solo6010.h"
 #include "solo6010-osd-font.h"
 
-#define CAPTURE_MAX_BANDWIDTH           32      // D1 4channel (D1 == 4)
+#define CAPTURE_MAX_BANDWIDTH           32      /* D1 4channel (D1 == 4) */
 #define OSG_BUFFER_SIZE                 1024
 
 #define VI_PROG_HSIZE                   (1280 - 16)
@@ -145,8 +145,8 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
 
         solo_p2m_dma(solo_dev, 0, 1, buf, SOLO_EOSD_EXT_ADDR(solo_dev) +
                      (solo_enc->ch * SOLO_EOSD_EXT_SIZE), SOLO_EOSD_EXT_SIZE);
-        reg |= (1 << solo_enc->ch);
-        solo_reg_write(solo_dev, SOLO_VE_OSD_CH, reg);
+        reg |= (1 << solo_enc->ch);
+        solo_reg_write(solo_dev, SOLO_VE_OSD_CH, reg);
 
         kfree(buf);
 
diff --git a/drivers/staging/solo6x10/solo6010-g723.c b/drivers/staging/solo6x10/solo6010-g723.c
index 82fbcb845878..254b46ab20c5 100644
--- a/drivers/staging/solo6x10/solo6010-g723.c
+++ b/drivers/staging/solo6x10/solo6010-g723.c
@@ -47,7 +47,7 @@
  * is broken down to 20 * 48 byte regions (one for each channel possible)
  * with the rest of the page being dummy data. */
 #define MAX_BUFFER              (G723_PERIOD_BYTES * PERIODS_MAX)
-#define IRQ_PAGES               4 // 0 - 4
+#define IRQ_PAGES               4 /* 0 - 4 */
 #define PERIODS_MIN             (1 << IRQ_PAGES)
 #define PERIODS_MAX             G723_FDMA_PAGES
 
@@ -158,7 +158,7 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss)
         snd_pcm_substream_chip(ss) = solo_pcm->solo_dev;
         kfree(solo_pcm);
 
-        return 0;
+        return 0;
 }
 
 static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
@@ -197,7 +197,7 @@ static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
 
 static int snd_solo_pcm_prepare(struct snd_pcm_substream *ss)
 {
-        return 0;
+        return 0;
 }
 
 static snd_pcm_uframes_t snd_solo_pcm_pointer(struct snd_pcm_substream *ss)
@@ -271,7 +271,7 @@ static int snd_solo_capture_volume_get(struct snd_kcontrol *kcontrol,
 
         value->value.integer.value[0] = tw28_get_audio_gain(solo_dev, ch);
 
-        return 0;
+        return 0;
 }
 
 static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
@@ -279,15 +279,15 @@ static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
 {
         struct solo6010_dev *solo_dev = snd_kcontrol_chip(kcontrol);
         u8 ch = value->id.numid - 1;
-        u8 old_val;
+        u8 old_val;
 
-        old_val = tw28_get_audio_gain(solo_dev, ch);
+        old_val = tw28_get_audio_gain(solo_dev, ch);
         if (old_val == value->value.integer.value[0])
                 return 0;
 
         tw28_set_audio_gain(solo_dev, ch, value->value.integer.value[0]);
 
-        return 1;
+        return 1;
 }
 
 static struct snd_kcontrol_new snd_solo_capture_volume = {
@@ -368,14 +368,16 @@ int solo_g723_init(struct solo6010_dev *solo_dev)
         strcpy(card->mixername, "SOLO-6010");
         kctl = snd_solo_capture_volume;
         kctl.count = solo_dev->nr_chans;
-        ret = snd_ctl_add(card, snd_ctl_new1(&kctl, solo_dev));
+        ret = snd_ctl_add(card, snd_ctl_new1(&kctl, solo_dev));
         if (ret < 0)
                 return ret;
 
-        if ((ret = solo_snd_pcm_init(solo_dev)) < 0)
+        ret = solo_snd_pcm_init(solo_dev);
+        if (ret < 0)
                 goto snd_error;
 
-        if ((ret = snd_card_register(card)) < 0)
+        ret = snd_card_register(card);
+        if (ret < 0)
                 goto snd_error;
 
         solo_g723_config(solo_dev);
diff --git a/drivers/staging/solo6x10/solo6010-gpio.c b/drivers/staging/solo6x10/solo6010-gpio.c
index 46f7a71edabc..8869b88dc307 100644
--- a/drivers/staging/solo6x10/solo6010-gpio.c
+++ b/drivers/staging/solo6x10/solo6010-gpio.c
@@ -92,8 +92,8 @@ static void solo_gpio_config(struct solo6010_dev *solo_dev)
 
 int solo_gpio_init(struct solo6010_dev *solo_dev)
 {
-        solo_gpio_config(solo_dev);
-        return 0;
+        solo_gpio_config(solo_dev);
+        return 0;
 }
 
 void solo_gpio_exit(struct solo6010_dev *solo_dev)
diff --git a/drivers/staging/solo6x10/solo6010-i2c.c b/drivers/staging/solo6x10/solo6010-i2c.c
index cadd5120d575..60b69cd0d09d 100644
--- a/drivers/staging/solo6x10/solo6010-i2c.c
+++ b/drivers/staging/solo6x10/solo6010-i2c.c
@@ -46,7 +46,7 @@ u8 solo_i2c_readbyte(struct solo6010_dev *solo_dev, int id, u8 addr, u8 off)
 
         i2c_transfer(&solo_dev->i2c_adap[id], msgs, 2);
 
-        return data;
+        return data;
 }
 
 void solo_i2c_writebyte(struct solo6010_dev *solo_dev, int id, u8 addr,
@@ -225,9 +225,9 @@ static int solo_i2c_master_xfer(struct i2c_adapter *adap,
         }
 
         if (i == SOLO_I2C_ADAPTERS)
-                return num; // XXX Right return value for failure?
+                return num; /* XXX Right return value for failure? */
 
-        down(&solo_dev->i2c_sem);
+        mutex_lock(&solo_dev->i2c_mutex);
         solo_dev->i2c_id = i;
         solo_dev->i2c_msg = msgs;
         solo_dev->i2c_msg_num = num;
@@ -258,7 +258,7 @@ static int solo_i2c_master_xfer(struct i2c_adapter *adap,
         solo_dev->i2c_state = IIC_STATE_IDLE;
         solo_dev->i2c_id = -1;
 
-        up(&solo_dev->i2c_sem);
+        mutex_unlock(&solo_dev->i2c_mutex);
 
         return ret;
 }
@@ -284,7 +284,7 @@ int solo_i2c_init(struct solo6010_dev *solo_dev)
         solo_dev->i2c_id = -1;
         solo_dev->i2c_state = IIC_STATE_IDLE;
         init_waitqueue_head(&solo_dev->i2c_wait);
-        sema_init(&solo_dev->i2c_sem, 1);
+        mutex_init(&solo_dev->i2c_mutex);
 
         for (i = 0; i < SOLO_I2C_ADAPTERS; i++) {
                 struct i2c_adapter *adap = &solo_dev->i2c_adap[i];
@@ -296,7 +296,8 @@ int solo_i2c_init(struct solo6010_dev *solo_dev)
                 adap->retries = 1;
                 adap->dev.parent = &solo_dev->pdev->dev;
 
-                if ((ret = i2c_add_adapter(adap))) {
+                ret = i2c_add_adapter(adap);
+                if (ret) {
                         adap->algo_data = NULL;
                         break;
                 }
diff --git a/drivers/staging/solo6x10/solo6010-osd-font.h b/drivers/staging/solo6x10/solo6010-osd-font.h
index d6f565bd76cc..d72efbb3bb3d 100644
--- a/drivers/staging/solo6x10/solo6010-osd-font.h
+++ b/drivers/staging/solo6x10/solo6010-osd-font.h
@@ -22,7 +22,7 @@
 
 static const unsigned int solo_osd_font[] = {
         0x00000000, 0x0000c0c8, 0xccfefe0c, 0x08000000,
-        0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000, // 0
+        0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000, /* 0 */
         0x00000000, 0xfefe7c7c, 0x38381010, 0x10000000,
         0x00000000, 0x7c82fefe, 0xfefefe7c, 0x00000000,
         0x00000000, 0x00001038, 0x10000000, 0x00000000,
@@ -54,67 +54,67 @@ static const unsigned int solo_osd_font[] = {
         0x0000003f, 0x7f404c52, 0x524c407f, 0x00000000,
         0x0000007c, 0x82ba82ba, 0x82ba82fe, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x183c3c3c, 0x18180018, 0x18000000, // 32   !
+        0x00000000, 0x183c3c3c, 0x18180018, 0x18000000, /* 32   ! */
         0x00000066, 0x66240000, 0x00000000, 0x00000000,
-        0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000, // 34 " #
+        0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000, /* 34 " # */
         0x00001010, 0x7cd6d616, 0x7cd0d6d6, 0x7c101000,
-        0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000, // 36 $ %
+        0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000, /* 36 $ % */
         0x00000000, 0x386c6c38, 0xdc766666, 0xdc000000,
-        0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000, // 38 & '
+        0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000, /* 38 & ' */
         0x00000000, 0x30180c0c, 0x0c0c0c18, 0x30000000,
-        0x00000000, 0x0c183030, 0x30303018, 0x0c000000, // 40 ( )
+        0x00000000, 0x0c183030, 0x30303018, 0x0c000000, /* 40 ( ) */
         0x00000000, 0x0000663c, 0xff3c6600, 0x00000000,
-        0x00000000, 0x00001818, 0x7e181800, 0x00000000, // 42 * +
+        0x00000000, 0x00001818, 0x7e181800, 0x00000000, /* 42 * + */
         0x00000000, 0x00000000, 0x00000e0e, 0x0c060000,
-        0x00000000, 0x00000000, 0x7e000000, 0x00000000, // 44 , -
+        0x00000000, 0x00000000, 0x7e000000, 0x00000000, /* 44 , - */
         0x00000000, 0x00000000, 0x00000006, 0x06000000,
-        0x00000000, 0x80c06030, 0x180c0602, 0x00000000, // 46 . /
+        0x00000000, 0x80c06030, 0x180c0602, 0x00000000, /* 46 . / */
         0x0000007c, 0xc6e6f6de, 0xcec6c67c, 0x00000000,
-        0x00000030, 0x383c3030, 0x303030fc, 0x00000000, // 48 0 1
+        0x00000030, 0x383c3030, 0x303030fc, 0x00000000, /* 48 0 1 */
         0x0000007c, 0xc6c06030, 0x180cc6fe, 0x00000000,
-        0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000, // 50 2 3
+        0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000, /* 50 2 3 */
         0x00000060, 0x70786c66, 0xfe6060f0, 0x00000000,
-        0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000, // 52 4 5
+        0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000, /* 52 4 5 */
         0x00000038, 0x0c06067e, 0xc6c6c67c, 0x00000000,
-        0x000000fe, 0xc6c06030, 0x18181818, 0x00000000, // 54 6 7
+        0x000000fe, 0xc6c06030, 0x18181818, 0x00000000, /* 54 6 7 */
         0x0000007c, 0xc6c6c67c, 0xc6c6c67c, 0x00000000,
-        0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000, // 56 8 9
+        0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000, /* 56 8 9 */
         0x00000000, 0x18180000, 0x00181800, 0x00000000,
-        0x00000000, 0x18180000, 0x0018180c, 0x00000000, // 58 : ;
+        0x00000000, 0x18180000, 0x0018180c, 0x00000000, /* 58 : ; */
         0x00000060, 0x30180c06, 0x0c183060, 0x00000000,
         0x00000000, 0x007e0000, 0x007e0000, 0x00000000,
         0x00000006, 0x0c183060, 0x30180c06, 0x00000000,
         0x0000007c, 0xc6c66030, 0x30003030, 0x00000000,
         0x0000007c, 0xc6f6d6d6, 0x7606067c, 0x00000000,
-        0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000, // 64 @ A
+        0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000, /* 64 @ A */
         0x0000007e, 0xc6c6c67e, 0xc6c6c67e, 0x00000000,
-        0x00000078, 0xcc060606, 0x0606cc78, 0x00000000, // 66
+        0x00000078, 0xcc060606, 0x0606cc78, 0x00000000, /* 66 */
         0x0000003e, 0x66c6c6c6, 0xc6c6663e, 0x00000000,
-        0x000000fe, 0x0606063e, 0x060606fe, 0x00000000, // 68
+        0x000000fe, 0x0606063e, 0x060606fe, 0x00000000, /* 68 */
         0x000000fe, 0x0606063e, 0x06060606, 0x00000000,
-        0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000, // 70
+        0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000, /* 70 */
         0x000000c6, 0xc6c6c6fe, 0xc6c6c6c6, 0x00000000,
-        0x0000003c, 0x18181818, 0x1818183c, 0x00000000, // 72
+        0x0000003c, 0x18181818, 0x1818183c, 0x00000000, /* 72 */
         0x00000060, 0x60606060, 0x6066663c, 0x00000000,
-        0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000, // 74
+        0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000, /* 74 */
         0x00000006, 0x06060606, 0x060606fe, 0x00000000,
-        0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000, // 76
+        0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000, /* 76 */
         0x000000c6, 0xcedefef6, 0xe6c6c6c6, 0x00000000,
-        0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000, // 78
+        0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000, /* 78 */
         0x0000007e, 0xc6c6c67e, 0x06060606, 0x00000000,
-        0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000, // 80
+        0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000, /* 80 */
         0x0000007e, 0xc6c6c67e, 0x66c6c6c6, 0x00000000,
-        0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000, // 82
+        0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000, /* 82 */
         0x0000007e, 0x18181818, 0x18181818, 0x00000000,
-        0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000, // 84
+        0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000, /* 84 */
         0x000000c6, 0xc6c6c6c6, 0xc66c3810, 0x00000000,
-        0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000, // 86
+        0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000, /* 86 */
         0x000000c6, 0xc6c66c38, 0x6cc6c6c6, 0x00000000,
-        0x00000066, 0x66666666, 0x3c181818, 0x00000000, // 88
+        0x00000066, 0x66666666, 0x3c181818, 0x00000000, /* 88 */
         0x000000fe, 0xc0603018, 0x0c0606fe, 0x00000000,
-        0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000, // 90
+        0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000, /* 90 */
         0x00000002, 0x060c1830, 0x60c08000, 0x00000000,
-        0x0000003c, 0x30303030, 0x3030303c, 0x00000000, // 92
+        0x0000003c, 0x30303030, 0x3030303c, 0x00000000, /* 92 */
         0x00001038, 0x6cc60000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00fe0000,
         0x00001818, 0x30000000, 0x00000000, 0x00000000,
diff --git a/drivers/staging/solo6x10/solo6010-p2m.c b/drivers/staging/solo6x10/solo6010-p2m.c
index 7ed3ed4b8f7e..956dea09348a 100644
--- a/drivers/staging/solo6x10/solo6010-p2m.c
+++ b/drivers/staging/solo6x10/solo6010-p2m.c
@@ -18,10 +18,11 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/scatterlist.h>
 
 #include "solo6010.h"
 
-// #define SOLO_TEST_P2M
+/* #define SOLO_TEST_P2M */
 
 int solo_p2m_dma(struct solo6010_dev *solo_dev, u8 id, int wr,
                  void *sys_addr, u32 ext_addr, u32 size)
@@ -30,8 +31,9 @@ int solo_p2m_dma(struct solo6010_dev *solo_dev, u8 id, int wr,
         int ret;
 
         WARN_ON(!size);
-        WARN_ON(id >= SOLO_NR_P2M);
-        if (!size || id >= SOLO_NR_P2M)
+        BUG_ON(id >= SOLO_NR_P2M);
+
+        if (!size)
                 return -EINVAL;
 
         dma_addr = pci_map_single(solo_dev->pdev, sys_addr, size,
@@ -48,41 +50,136 @@ int solo_p2m_dma(struct solo6010_dev *solo_dev, u8 id, int wr,
 int solo_p2m_dma_t(struct solo6010_dev *solo_dev, u8 id, int wr,
                    dma_addr_t dma_addr, u32 ext_addr, u32 size)
 {
+        struct p2m_desc *desc = kzalloc(sizeof(*desc) * 2, GFP_DMA);
+        int ret;
+
+        if (desc == NULL)
+                return -ENOMEM;
+
+        solo_p2m_push_desc(&desc[1], wr, dma_addr, ext_addr, size, 0, 0);
+        ret = solo_p2m_dma_desc(solo_dev, id, desc, 2);
+        kfree(desc);
+
+        return ret;
+}
+
+void solo_p2m_push_desc(struct p2m_desc *desc, int wr, dma_addr_t dma_addr,
+                        u32 ext_addr, u32 size, int repeat, u32 ext_size)
+{
+        desc->ta = dma_addr;
+        desc->fa = ext_addr;
+
+        desc->ext = SOLO_P2M_COPY_SIZE(size >> 2);
+        desc->ctrl = SOLO_P2M_BURST_SIZE(SOLO_P2M_BURST_256) |
+                (wr ? SOLO_P2M_WRITE : 0) | SOLO_P2M_TRANS_ON;
+
+        /* Ext size only matters when we're repeating */
+        if (repeat) {
+                desc->ext |= SOLO_P2M_EXT_INC(ext_size >> 2);
+                desc->ctrl |=  SOLO_P2M_PCI_INC(size >> 2) |
+                        SOLO_P2M_REPEAT(repeat);
+        }
+}
+
+int solo_p2m_dma_desc(struct solo6010_dev *solo_dev, u8 id,
+                      struct p2m_desc *desc, int desc_count)
+{
         struct solo_p2m_dev *p2m_dev;
-        unsigned int timeout = 0;
+        unsigned int timeout;
+        int ret = 0;
+        u32 config = 0;
+        dma_addr_t desc_dma = 0;
 
-        WARN_ON(!size);
-        WARN_ON(id >= SOLO_NR_P2M);
-        if (!size || id >= SOLO_NR_P2M)
-                return -EINVAL;
+        BUG_ON(id >= SOLO_NR_P2M);
+        BUG_ON(!desc_count || desc_count > SOLO_NR_P2M_DESC);
 
         p2m_dev = &solo_dev->p2m_dev[id];
 
-        down(&p2m_dev->sem);
+        mutex_lock(&p2m_dev->mutex);
+
+        solo_reg_write(solo_dev, SOLO_P2M_CONTROL(id), 0);
 
-start_dma:
         INIT_COMPLETION(p2m_dev->completion);
         p2m_dev->error = 0;
-        solo_reg_write(solo_dev, SOLO_P2M_TAR_ADR(id), dma_addr);
-        solo_reg_write(solo_dev, SOLO_P2M_EXT_ADR(id), ext_addr);
-        solo_reg_write(solo_dev, SOLO_P2M_EXT_CFG(id),
-                       SOLO_P2M_COPY_SIZE(size >> 2));
-        solo_reg_write(solo_dev, SOLO_P2M_CONTROL(id),
-                       SOLO_P2M_BURST_SIZE(SOLO_P2M_BURST_256) |
-                       (wr ? SOLO_P2M_WRITE : 0) | SOLO_P2M_TRANS_ON);
 
+        /* Enable the descriptors */
+        config = solo_reg_read(solo_dev, SOLO_P2M_CONFIG(id));
+        desc_dma = pci_map_single(solo_dev->pdev, desc,
+                                  desc_count * sizeof(*desc),
+                                  PCI_DMA_TODEVICE);
+        solo_reg_write(solo_dev, SOLO_P2M_DES_ADR(id), desc_dma);
+        solo_reg_write(solo_dev, SOLO_P2M_DESC_ID(id), desc_count - 1);
+        solo_reg_write(solo_dev, SOLO_P2M_CONFIG(id), config |
+                       SOLO_P2M_DESC_MODE);
+
+        /* Should have all descriptors completed from one interrupt */
         timeout = wait_for_completion_timeout(&p2m_dev->completion, HZ);
 
         solo_reg_write(solo_dev, SOLO_P2M_CONTROL(id), 0);
 
-        /* XXX Really looks to me like we will get stuck here if a
-         * real PCI P2M error occurs */
+        /* Reset back to non-descriptor mode */
+        solo_reg_write(solo_dev, SOLO_P2M_CONFIG(id), config);
+        solo_reg_write(solo_dev, SOLO_P2M_DESC_ID(id), 0);
+        solo_reg_write(solo_dev, SOLO_P2M_DES_ADR(id), 0);
+        pci_unmap_single(solo_dev->pdev, desc_dma,
+                         desc_count * sizeof(*desc),
+                         PCI_DMA_TODEVICE);
+
         if (p2m_dev->error)
-                goto start_dma;
+                ret = -EIO;
+        else if (timeout == 0)
+                ret = -EAGAIN;
+
+        mutex_unlock(&p2m_dev->mutex);
+
+        WARN_ON_ONCE(ret);
 
-        up(&p2m_dev->sem);
+        return ret;
+}
+
+int solo_p2m_dma_sg(struct solo6010_dev *solo_dev, u8 id,
+                    struct p2m_desc *pdesc, int wr,
+                    struct scatterlist *sg, u32 sg_off,
+                    u32 ext_addr, u32 size)
+{
+        int i;
+        int idx;
+
+        BUG_ON(id >= SOLO_NR_P2M);
+
+        if (WARN_ON_ONCE(!size))
+                return -EINVAL;
+
+        memset(pdesc, 0, sizeof(*pdesc));
+
+        /* Should rewrite this to handle > SOLO_NR_P2M_DESC transactions */
+        for (i = 0, idx = 1; idx < SOLO_NR_P2M_DESC && sg && size > 0;
+             i++, sg = sg_next(sg)) {
+                struct p2m_desc *desc = &pdesc[idx];
+                u32 sg_len = sg_dma_len(sg);
+                u32 len;
 
-        return (timeout == 0) ? -EAGAIN : 0;
+                if (sg_off >= sg_len) {
+                        sg_off -= sg_len;
+                        continue;
+                }
+
+                sg_len -= sg_off;
+                len = min(sg_len, size);
+
+                solo_p2m_push_desc(desc, wr, sg_dma_address(sg) + sg_off,
+                                   ext_addr, len, 0, 0);
+
+                size -= len;
+                ext_addr += len;
+                idx++;
+
+                sg_off = 0;
+        }
+
+        WARN_ON_ONCE(size || i >= SOLO_NR_P2M_DESC);
+
+        return solo_p2m_dma_desc(solo_dev, id, pdesc, idx);
 }
 
 #ifdef SOLO_TEST_P2M
@@ -147,13 +244,16 @@ static void run_p2m_test(struct solo6010_dev *solo_dev)
         return;
 }
 #else
-#define run_p2m_test(__solo)    do{}while(0)
+#define run_p2m_test(__solo)    do {} while (0)
 #endif
 
 void solo_p2m_isr(struct solo6010_dev *solo_dev, int id)
 {
+        struct solo_p2m_dev *p2m_dev = &solo_dev->p2m_dev[id];
+
         solo_reg_write(solo_dev, SOLO_IRQ_STAT, SOLO_IRQ_P2M(id));
-        complete(&solo_dev->p2m_dev[id].completion);
+
+        complete(&p2m_dev->completion);
 }
 
 void solo_p2m_error_isr(struct solo6010_dev *solo_dev, u32 status)
@@ -188,16 +288,14 @@ int solo_p2m_init(struct solo6010_dev *solo_dev)
         for (i = 0; i < SOLO_NR_P2M; i++) {
                 p2m_dev = &solo_dev->p2m_dev[i];
 
-                sema_init(&p2m_dev->sem, 1);
+                mutex_init(&p2m_dev->mutex);
                 init_completion(&p2m_dev->completion);
 
-                solo_reg_write(solo_dev, SOLO_P2M_DES_ADR(i),
-                               __pa(p2m_dev->desc));
-
                 solo_reg_write(solo_dev, SOLO_P2M_CONTROL(i), 0);
                 solo_reg_write(solo_dev, SOLO_P2M_CONFIG(i),
                                SOLO_P2M_CSC_16BIT_565 |
-                               SOLO_P2M_DMA_INTERVAL(0) |
+                               SOLO_P2M_DMA_INTERVAL(3) |
+                               SOLO_P2M_DESC_INTR_OPT |
                                SOLO_P2M_PCI_MASTER_MODE);
                 solo6010_irq_on(solo_dev, SOLO_IRQ_P2M(i));
         }
diff --git a/drivers/staging/solo6x10/solo6010-tw28.c b/drivers/staging/solo6x10/solo6010-tw28.c
index 0159c8392436..905a6ad23a37 100644
--- a/drivers/staging/solo6x10/solo6010-tw28.c
+++ b/drivers/staging/solo6x10/solo6010-tw28.c
@@ -35,107 +35,107 @@
 #define DEFAULT_VACTIVE_PAL             (312-DEFAULT_VDELAY_PAL)
 
 static u8 tbl_tw2864_template[] = {
-        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, // 0x00
+        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, /* 0x00 */
         0x12, 0xf5, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, // 0x10
+        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, /* 0x10 */
         0x12, 0xf5, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, // 0x20
+        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, /* 0x20 */
         0x12, 0xf5, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, // 0x30
+        0x00, 0x00, 0x80, 0x10, 0x80, 0x80, 0x00, 0x02, /* 0x30 */
         0x12, 0xf5, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x40
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x50
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x70
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x00,
-        0x00, 0x02, 0x00, 0xcc, 0x00, 0x80, 0x44, 0x50, // 0x80
+        0x00, 0x02, 0x00, 0xcc, 0x00, 0x80, 0x44, 0x50, /* 0x80 */
         0x22, 0x01, 0xd8, 0xbc, 0xb8, 0x44, 0x38, 0x00,
-        0x00, 0x78, 0x72, 0x3e, 0x14, 0xa5, 0xe4, 0x05, // 0x90
+        0x00, 0x78, 0x72, 0x3e, 0x14, 0xa5, 0xe4, 0x05, /* 0x90 */
         0x00, 0x28, 0x44, 0x44, 0xa0, 0x88, 0x5a, 0x01,
-        0x08, 0x08, 0x08, 0x08, 0x1a, 0x1a, 0x1a, 0x1a, // 0xa0
+        0x08, 0x08, 0x08, 0x08, 0x1a, 0x1a, 0x1a, 0x1a, /* 0xa0 */
         0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xf0, 0x44,
-        0x44, 0x0a, 0x00, 0xff, 0xef, 0xef, 0xef, 0xef, // 0xb0
+        0x44, 0x0a, 0x00, 0xff, 0xef, 0xef, 0xef, 0xef, /* 0xb0 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xc0
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0 */
         0x00, 0x00, 0x55, 0x00, 0xb1, 0xe4, 0x40, 0x00,
-        0x77, 0x77, 0x01, 0x13, 0x57, 0x9b, 0xdf, 0x20, // 0xd0
+        0x77, 0x77, 0x01, 0x13, 0x57, 0x9b, 0xdf, 0x20, /* 0xd0 */
         0x64, 0xa8, 0xec, 0xd1, 0x0f, 0x11, 0x11, 0x81,
-        0x10, 0xe0, 0xbb, 0xbb, 0x00, 0x11, 0x00, 0x00, // 0xe0
+        0x10, 0xe0, 0xbb, 0xbb, 0x00, 0x11, 0x00, 0x00, /* 0xe0 */
         0x11, 0x00, 0x00, 0x11, 0x00, 0x00, 0x11, 0x00,
-        0x83, 0xb5, 0x09, 0x78, 0x85, 0x00, 0x01, 0x20, // 0xf0
+        0x83, 0xb5, 0x09, 0x78, 0x85, 0x00, 0x01, 0x20, /* 0xf0 */
         0x64, 0x11, 0x40, 0xaf, 0xff, 0x00, 0x00, 0x00,
 };
 
 static u8 tbl_tw2865_ntsc_template[] = {
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, // 0x00
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, /* 0x00 */
         0x12, 0xff, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, // 0x10
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, /* 0x10 */
         0x12, 0xff, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, // 0x20
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x02, /* 0x20 */
         0x12, 0xff, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0xf0, 0x70, 0x48, 0x80, 0x80, 0x00, 0x02, // 0x30
+        0x00, 0xf0, 0x70, 0x48, 0x80, 0x80, 0x00, 0x02, /* 0x30 */
         0x12, 0xff, 0x09, 0xd0, 0x00, 0x00, 0x00, 0x7f,
-        0x00, 0x00, 0x90, 0x68, 0x00, 0x38, 0x80, 0x80, // 0x40
+        0x00, 0x00, 0x90, 0x68, 0x00, 0x38, 0x80, 0x80, /* 0x40 */
         0x80, 0x80, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x50
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x45, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60
+        0x45, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x43,
-        0x08, 0x00, 0x00, 0x01, 0xf1, 0x03, 0xEF, 0x03, // 0x70
+        0x08, 0x00, 0x00, 0x01, 0xf1, 0x03, 0xEF, 0x03, /* 0x70 */
         0xE9, 0x03, 0xD9, 0x15, 0x15, 0xE4, 0xA3, 0x80,
-        0x00, 0x02, 0x00, 0xCC, 0x00, 0x80, 0x44, 0x50, // 0x80
+        0x00, 0x02, 0x00, 0xCC, 0x00, 0x80, 0x44, 0x50, /* 0x80 */
         0x22, 0x01, 0xD8, 0xBC, 0xB8, 0x44, 0x38, 0x00,
-        0x00, 0x78, 0x44, 0x3D, 0x14, 0xA5, 0xE0, 0x05, // 0x90
+        0x00, 0x78, 0x44, 0x3D, 0x14, 0xA5, 0xE0, 0x05, /* 0x90 */
         0x00, 0x28, 0x44, 0x44, 0xA0, 0x90, 0x52, 0x13,
-        0x08, 0x08, 0x08, 0x08, 0x1A, 0x1A, 0x1B, 0x1A, // 0xa0
+        0x08, 0x08, 0x08, 0x08, 0x1A, 0x1A, 0x1B, 0x1A, /* 0xa0 */
         0x00, 0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF0, 0x44,
-        0x44, 0x4A, 0x00, 0xFF, 0xEF, 0xEF, 0xEF, 0xEF, // 0xb0
+        0x44, 0x4A, 0x00, 0xFF, 0xEF, 0xEF, 0xEF, 0xEF, /* 0xb0 */
         0xFF, 0xE7, 0xE9, 0xE9, 0xEB, 0xFF, 0xD6, 0xD8,
-        0xD8, 0xD7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xc0
+        0xD8, 0xD7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0 */
         0x00, 0x00, 0x55, 0x00, 0xE4, 0x39, 0x00, 0x80,
-        0x77, 0x77, 0x03, 0x20, 0x57, 0x9b, 0xdf, 0x31, // 0xd0
+        0x77, 0x77, 0x03, 0x20, 0x57, 0x9b, 0xdf, 0x31, /* 0xd0 */
         0x64, 0xa8, 0xec, 0xd1, 0x0f, 0x11, 0x11, 0x81,
-        0x10, 0xC0, 0xAA, 0xAA, 0x00, 0x11, 0x00, 0x00, // 0xe0
+        0x10, 0xC0, 0xAA, 0xAA, 0x00, 0x11, 0x00, 0x00, /* 0xe0 */
         0x11, 0x00, 0x00, 0x11, 0x00, 0x00, 0x11, 0x00,
-        0x83, 0xB5, 0x09, 0x78, 0x85, 0x00, 0x01, 0x20, // 0xf0
+        0x83, 0xB5, 0x09, 0x78, 0x85, 0x00, 0x01, 0x20, /* 0xf0 */
         0x64, 0x51, 0x40, 0xaf, 0xFF, 0xF0, 0x00, 0xC0,
 };
 
 static u8 tbl_tw2865_pal_template[] = {
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, // 0x00
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, /* 0x00 */
         0x11, 0xff, 0x01, 0xc3, 0x00, 0x00, 0x01, 0x7f,
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, // 0x10
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, /* 0x10 */
         0x11, 0xff, 0x01, 0xc3, 0x00, 0x00, 0x01, 0x7f,
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, // 0x20
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, /* 0x20 */
         0x11, 0xff, 0x01, 0xc3, 0x00, 0x00, 0x01, 0x7f,
-        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, // 0x30
+        0x00, 0xf0, 0x70, 0x30, 0x80, 0x80, 0x00, 0x12, /* 0x30 */
         0x11, 0xff, 0x01, 0xc3, 0x00, 0x00, 0x01, 0x7f,
-        0x00, 0x94, 0x90, 0x48, 0x00, 0x38, 0x7F, 0x80, // 0x40
+        0x00, 0x94, 0x90, 0x48, 0x00, 0x38, 0x7F, 0x80, /* 0x40 */
         0x80, 0x80, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x50
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x45, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60
+        0x45, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60 */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x43,
-        0x08, 0x00, 0x00, 0x01, 0xf1, 0x03, 0xEF, 0x03, // 0x70
+        0x08, 0x00, 0x00, 0x01, 0xf1, 0x03, 0xEF, 0x03, /* 0x70 */
         0xEA, 0x03, 0xD9, 0x15, 0x15, 0xE4, 0xA3, 0x80,
-        0x00, 0x02, 0x00, 0xCC, 0x00, 0x80, 0x44, 0x50, // 0x80
+        0x00, 0x02, 0x00, 0xCC, 0x00, 0x80, 0x44, 0x50, /* 0x80 */
         0x22, 0x01, 0xD8, 0xBC, 0xB8, 0x44, 0x38, 0x00,
-        0x00, 0x78, 0x44, 0x3D, 0x14, 0xA5, 0xE0, 0x05, // 0x90
+        0x00, 0x78, 0x44, 0x3D, 0x14, 0xA5, 0xE0, 0x05, /* 0x90 */
         0x00, 0x28, 0x44, 0x44, 0xA0, 0x90, 0x52, 0x13,
-        0x08, 0x08, 0x08, 0x08, 0x1A, 0x1A, 0x1A, 0x1A, // 0xa0
+        0x08, 0x08, 0x08, 0x08, 0x1A, 0x1A, 0x1A, 0x1A, /* 0xa0 */
         0x00, 0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF0, 0x44,
-        0x44, 0x4A, 0x00, 0xFF, 0xEF, 0xEF, 0xEF, 0xEF, // 0xb0
+        0x44, 0x4A, 0x00, 0xFF, 0xEF, 0xEF, 0xEF, 0xEF, /* 0xb0 */
         0xFF, 0xE7, 0xE9, 0xE9, 0xE9, 0xFF, 0xD7, 0xD8,
-        0xD9, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xc0
+        0xD9, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0 */
         0x00, 0x00, 0x55, 0x00, 0xE4, 0x39, 0x00, 0x80,
-        0x77, 0x77, 0x03, 0x20, 0x57, 0x9b, 0xdf, 0x31, // 0xd0
+        0x77, 0x77, 0x03, 0x20, 0x57, 0x9b, 0xdf, 0x31, /* 0xd0 */
         0x64, 0xa8, 0xec, 0xd1, 0x0f, 0x11, 0x11, 0x81,
-        0x10, 0xC0, 0xAA, 0xAA, 0x00, 0x11, 0x00, 0x00, // 0xe0
+        0x10, 0xC0, 0xAA, 0xAA, 0x00, 0x11, 0x00, 0x00, /* 0xe0 */
         0x11, 0x00, 0x00, 0x11, 0x00, 0x00, 0x11, 0x00,
-        0x83, 0xB5, 0x09, 0x00, 0xA0, 0x00, 0x01, 0x20, // 0xf0
+        0x83, 0xB5, 0x09, 0x00, 0xA0, 0x00, 0x01, 0x20, /* 0xf0 */
         0x64, 0x51, 0x40, 0xaf, 0xFF, 0xF0, 0x00, 0xC0,
 };
 
@@ -181,8 +181,8 @@ static void tw_write_and_verify(struct solo6010_dev *solo_dev, u8 addr, u8 off,
                 msleep_interruptible(1);
         }
 
-//      printk("solo6010/tw28: Error writing register: %02x->%02x [%02x]\n",
-//              addr, off, val);
+/*      printk("solo6010/tw28: Error writing register: %02x->%02x [%02x]\n",
+                addr, off, val); */
 }
 
 static int tw2865_setup(struct solo6010_dev *solo_dev, u8 dev_addr)
@@ -217,7 +217,7 @@ static int tw2865_setup(struct solo6010_dev *solo_dev, u8 dev_addr)
 
         for (i = 0; i < 0xff; i++) {
                 /* Skip read only registers */
-                if (i >= 0xb8 && i <= 0xc1 )
+                if (i >= 0xb8 && i <= 0xc1)
                         continue;
                 if ((i & ~0x30) == 0x00 ||
                     (i & ~0x30) == 0x0c ||
@@ -302,7 +302,7 @@ static int tw2864_setup(struct solo6010_dev *solo_dev, u8 dev_addr)
 
         for (i = 0; i < 0xff; i++) {
                 /* Skip read only registers */
-                if (i >= 0xb8 && i <= 0xc1 )
+                if (i >= 0xb8 && i <= 0xc1)
                         continue;
                 if ((i & ~0x30) == 0x00 ||
                     (i & ~0x30) == 0x0c ||
@@ -334,13 +334,13 @@ static int tw2815_setup(struct solo6010_dev *solo_dev, u8 dev_addr)
         };
 
         u8 tbl_tw2815_sfr[] = {
-                0x00, 0x00, 0x00, 0xc0, 0x45, 0xa0, 0xd0, 0x2f, // 0x00
+                0x00, 0x00, 0x00, 0xc0, 0x45, 0xa0, 0xd0, 0x2f, /* 0x00 */
                 0x64, 0x80, 0x80, 0x82, 0x82, 0x00, 0x00, 0x00,
-                0x00, 0x0f, 0x05, 0x00, 0x00, 0x80, 0x06, 0x00, // 0x10
+                0x00, 0x0f, 0x05, 0x00, 0x00, 0x80, 0x06, 0x00, /* 0x10 */
                 0x00, 0x00, 0x00, 0xff, 0x8f, 0x00, 0x00, 0x00,
-                0x88, 0x88, 0xc0, 0x00, 0x20, 0x64, 0xa8, 0xec, // 0x20
+                0x88, 0x88, 0xc0, 0x00, 0x20, 0x64, 0xa8, 0xec, /* 0x20 */
                 0x31, 0x75, 0xb9, 0xfd, 0x00, 0x00, 0x88, 0x88,
-                0x88, 0x11, 0x00, 0x88, 0x88, 0x00,             // 0x30
+                0x88, 0x11, 0x00, 0x88, 0x88, 0x00,             /* 0x30 */
         };
         u8 *tbl_tw2815_common;
         int i;
@@ -459,7 +459,7 @@ static int tw2815_setup(struct solo6010_dev *solo_dev, u8 dev_addr)
 
                 for (i = 0; i < 0x0f; i++) {
                         if (i == 0x00)
-                                continue;       // read-only
+                                continue;       /* read-only */
                         solo_i2c_writebyte(solo_dev, SOLO_I2C_TW,
                                            dev_addr, (ch * 0x10) + i,
                                            tbl_tw2815_common[i]);
@@ -597,7 +597,7 @@ int solo_tw28_init(struct solo6010_dev *solo_dev)
         return 0;
 }
 
-/* 
+/*
  * We accessed the video status signal in the Techwell chip through
  * iic/i2c because the video status reported by register REG_VI_STATUS1
  * (address 0x012C) of the SOLO6010 chip doesn't give the correct video
@@ -751,7 +751,7 @@ int tw28_get_ctrl_val(struct solo6010_dev *solo_dev, u32 ctrl, u8 ch,
                 rval = tw_readbyte(solo_dev, chip_num,
                                    TW286x_BRIGHTNESS_ADDR(ch),
                                    TW_BRIGHTNESS_ADDR(ch));
-                if (is_tw286x(solo_dev, chip_num)) 
+                if (is_tw286x(solo_dev, chip_num))
                         *val = (s32)((char)rval) + 128;
                 else
                         *val = rval;
diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
index 097e82bc7a63..7bbb94097d29 100644
--- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
@@ -24,7 +24,7 @@
 
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
-#include <media/videobuf-dma-contig.h>
+#include <media/videobuf-dma-sg.h>
 
 #include "solo6010.h"
 #include "solo6010-tw28.h"
@@ -47,13 +47,14 @@ struct solo_enc_fh {
         struct videobuf_queue   vidq;
         struct list_head        vidq_active;
         struct task_struct      *kthread;
+        struct p2m_desc         desc[SOLO_NR_P2M_DESC];
 };
 
 static unsigned char vid_vop_header[] = {
         0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
         0x02, 0x48, 0x05, 0xc0, 0x00, 0x40, 0x00, 0x40,
         0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
-        0x1f, 0x4c, 0x58, 0x10, 0x78, 0x51, 0x18, 0x3e,
+        0x1f, 0x4c, 0x58, 0x10, 0x78, 0x51, 0x18, 0x3f,
 };
 
 /*
@@ -151,6 +152,11 @@ static void solo_motion_toggle(struct solo_enc_dev *solo_enc, int on)
         else
                 solo_dev->motion_mask &= ~(1 << ch);
 
+        /* Do this regardless of if we are turning on or off */
+        solo_reg_write(solo_enc->solo_dev, SOLO_VI_MOT_CLEAR,
+                       1 << solo_enc->ch);
+        solo_enc->motion_detected = 0;
+
         solo_reg_write(solo_dev, SOLO_VI_MOT_ADR,
                        SOLO_VI_MOTION_EN(solo_dev->motion_mask) |
                        (SOLO_MOTION_EXT_ADDR(solo_dev) >> 16));
@@ -184,7 +190,7 @@ static void solo_update_mode(struct solo_enc_dev *solo_enc)
                 solo_enc->bw_weight <<= 2;
                 break;
         default:
-                WARN(1, "mode is unknown");
+                WARN(1, "mode is unknown\n");
         }
 }
 
@@ -211,11 +217,6 @@ static int solo_enc_on(struct solo_enc_fh *fh)
                         solo_dev->enc_bw_remain -= solo_enc->bw_weight;
         }
 
-        fh->kthread = kthread_run(solo_enc_thread, fh, SOLO6010_NAME "_enc");
-
-        if (IS_ERR(fh->kthread))
-                return PTR_ERR(fh->kthread);
-
         fh->enc_on = 1;
         fh->rd_idx = solo_enc->solo_dev->enc_wr_idx;
 
@@ -279,6 +280,24 @@ static void solo_enc_off(struct solo_enc_fh *fh)
         solo_reg_write(solo_dev, SOLO_CAP_CH_COMP_ENA_E(solo_enc->ch), 0);
 }
 
+static int solo_start_fh_thread(struct solo_enc_fh *fh)
+{
+        struct solo_enc_dev *solo_enc = fh->enc;
+
+        fh->kthread = kthread_run(solo_enc_thread, fh, SOLO6010_NAME "_enc");
+
+        /* Oops, we had a problem */
+        if (IS_ERR(fh->kthread)) {
+                spin_lock(&solo_enc->lock);
+                solo_enc_off(fh);
+                spin_unlock(&solo_enc->lock);
+
+                return PTR_ERR(fh->kthread);
+        }
+
+        return 0;
+}
+
 static void enc_reset_gop(struct solo6010_dev *solo_dev, u8 ch)
 {
         BUG_ON(ch >= solo_dev->nr_chans);
@@ -299,22 +318,68 @@ static int enc_gop_reset(struct solo6010_dev *solo_dev, u8 ch, u8 vop)
         return 0;
 }
 
-static int enc_get_mpeg_dma_t(struct solo6010_dev *solo_dev, dma_addr_t buf,
-                              unsigned int off, unsigned int size)
+static void enc_write_sg(struct scatterlist *sglist, void *buf, int size)
+{
+        struct scatterlist *sg;
+        u8 *src = buf;
+
+        for (sg = sglist; sg && size > 0; sg = sg_next(sg)) {
+                u8 *p = sg_virt(sg);
+                size_t len = sg_dma_len(sg);
+                int i;
+
+                for (i = 0; i < len && size; i++)
+                        p[i] = *(src++);
+        }
+}
+
+static int enc_get_mpeg_dma_sg(struct solo6010_dev *solo_dev,
+                               struct p2m_desc *desc,
+                               struct scatterlist *sglist, int skip,
+                               unsigned int off, unsigned int size)
 {
         int ret;
 
         if (off > SOLO_MP4E_EXT_SIZE(solo_dev))
                 return -EINVAL;
 
-        if (off + size <= SOLO_MP4E_EXT_SIZE(solo_dev))
+        if (off + size <= SOLO_MP4E_EXT_SIZE(solo_dev)) {
+                return solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_MP4E,
+                                       desc, 0, sglist, skip,
+                                       SOLO_MP4E_EXT_ADDR(solo_dev) + off, size);
+        }
+
+        /* Buffer wrap */
+        ret = solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_MP4E, desc, 0,
+                              sglist, skip, SOLO_MP4E_EXT_ADDR(solo_dev) + off,
+                              SOLO_MP4E_EXT_SIZE(solo_dev) - off);
+
+        ret |= solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_MP4E, desc, 0,
+                               sglist, skip + SOLO_MP4E_EXT_SIZE(solo_dev) - off,
+                               SOLO_MP4E_EXT_ADDR(solo_dev),
+                               size + off - SOLO_MP4E_EXT_SIZE(solo_dev));
+
+        return ret;
+}
+
+static int enc_get_mpeg_dma_t(struct solo6010_dev *solo_dev,
+                              dma_addr_t buf, unsigned int off,
+                              unsigned int size)
+{
+        int ret;
+
+        if (off > SOLO_MP4E_EXT_SIZE(solo_dev))
+                return -EINVAL;
+
+        if (off + size <= SOLO_MP4E_EXT_SIZE(solo_dev)) {
                 return solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_MP4E, 0, buf,
                                       SOLO_MP4E_EXT_ADDR(solo_dev) + off, size);
+        }
 
         /* Buffer wrap */
         ret = solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_MP4E, 0, buf,
-                            SOLO_MP4E_EXT_ADDR(solo_dev) + off,
-                            SOLO_MP4E_EXT_SIZE(solo_dev) - off);
+                             SOLO_MP4E_EXT_ADDR(solo_dev) + off,
+                             SOLO_MP4E_EXT_SIZE(solo_dev) - off);
 
         ret |= solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_MP4E, 0,
                               buf + SOLO_MP4E_EXT_SIZE(solo_dev) - off,
@@ -337,70 +402,108 @@ static int enc_get_mpeg_dma(struct solo6010_dev *solo_dev, void *buf,
         return ret;
 }
 
-static int enc_get_jpeg_dma(struct solo6010_dev *solo_dev, dma_addr_t buf,
-                            unsigned int off, unsigned int size)
+static int enc_get_jpeg_dma_sg(struct solo6010_dev *solo_dev,
+                               struct p2m_desc *desc,
+                               struct scatterlist *sglist, int skip,
+                               unsigned int off, unsigned int size)
 {
         int ret;
 
         if (off > SOLO_JPEG_EXT_SIZE(solo_dev))
                 return -EINVAL;
 
-        if (off + size <= SOLO_JPEG_EXT_SIZE(solo_dev))
-                return solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_JPEG, 0, buf,
-                                      SOLO_JPEG_EXT_ADDR(solo_dev) + off, size);
+        if (off + size <= SOLO_JPEG_EXT_SIZE(solo_dev)) {
+                return solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_JPEG,
+                                       desc, 0, sglist, skip,
+                                       SOLO_JPEG_EXT_ADDR(solo_dev) + off, size);
+        }
 
         /* Buffer wrap */
-        ret = solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_JPEG, 0, buf,
-                             SOLO_JPEG_EXT_ADDR(solo_dev) + off,
-                             SOLO_JPEG_EXT_SIZE(solo_dev) - off);
+        ret = solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_JPEG, desc, 0,
+                              sglist, skip, SOLO_JPEG_EXT_ADDR(solo_dev) + off,
+                              SOLO_JPEG_EXT_SIZE(solo_dev) - off);
 
-        ret |= solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_JPEG, 0,
-                              buf + SOLO_JPEG_EXT_SIZE(solo_dev) - off,
-                              SOLO_JPEG_EXT_ADDR(solo_dev),
-                              size + off - SOLO_JPEG_EXT_SIZE(solo_dev));
+        ret |= solo_p2m_dma_sg(solo_dev, SOLO_P2M_DMA_ID_JPEG, desc, 0,
+                               sglist, skip + SOLO_JPEG_EXT_SIZE(solo_dev) - off,
+                               SOLO_JPEG_EXT_ADDR(solo_dev),
+                               size + off - SOLO_JPEG_EXT_SIZE(solo_dev));
 
         return ret;
 }
 
+/* Returns true of __chk is within the first __range bytes of __off */
+#define OFF_IN_RANGE(__off, __range, __chk) \
+        ((__off <= __chk) && ((__off + __range) >= __chk))
+
+static void solo_jpeg_header(struct solo_enc_dev *solo_enc,
+                             struct videobuf_dmabuf *vbuf)
+{
+        struct scatterlist *sg;
+        void *src = jpeg_header;
+        size_t copied = 0;
+        size_t to_copy = sizeof(jpeg_header);
+
+        for (sg = vbuf->sglist; sg && copied < to_copy; sg = sg_next(sg)) {
+                size_t this_copy = min(sg_dma_len(sg),
+                                       (unsigned int)(to_copy - copied));
+                u8 *p = sg_virt(sg);
+
+                memcpy(p, src + copied, this_copy);
+
+                if (OFF_IN_RANGE(copied, this_copy, SOF0_START + 5))
+                        p[(SOF0_START + 5) - copied] =
+                                0xff & (solo_enc->height >> 8);
+                if (OFF_IN_RANGE(copied, this_copy, SOF0_START + 6))
+                        p[(SOF0_START + 6) - copied] = 0xff & solo_enc->height;
+                if (OFF_IN_RANGE(copied, this_copy, SOF0_START + 7))
+                        p[(SOF0_START + 7) - copied] =
+                                0xff & (solo_enc->width >> 8);
+                if (OFF_IN_RANGE(copied, this_copy, SOF0_START + 8))
+                        p[(SOF0_START + 8) - copied] = 0xff & solo_enc->width;
+
+                copied += this_copy;
+        }
+}
+
 static int solo_fill_jpeg(struct solo_enc_fh *fh, struct solo_enc_buf *enc_buf,
-                          struct videobuf_buffer *vb, dma_addr_t vbuf)
+                          struct videobuf_buffer *vb,
+                          struct videobuf_dmabuf *vbuf)
 {
-        struct solo_enc_dev *solo_enc = fh->enc;
-        struct solo6010_dev *solo_dev = solo_enc->solo_dev;
-        u8 *p = videobuf_queue_to_vaddr(&fh->vidq, vb);
+        struct solo6010_dev *solo_dev = fh->enc->solo_dev;
+        int size = enc_buf->jpeg_size;
 
-        memcpy(p, jpeg_header, sizeof(jpeg_header));
-        p[SOF0_START + 5] = 0xff & (solo_enc->height >> 8);
-        p[SOF0_START + 6] = 0xff & solo_enc->height;
-        p[SOF0_START + 7] = 0xff & (solo_enc->width >> 8);
-        p[SOF0_START + 8] = 0xff & solo_enc->width;
+        /* Copy the header first (direct write) */
+        solo_jpeg_header(fh->enc, vbuf);
 
-        vbuf += sizeof(jpeg_header);
-        vb->size = enc_buf->jpeg_size + sizeof(jpeg_header);
+        vb->size = size + sizeof(jpeg_header);
 
-        return enc_get_jpeg_dma(solo_dev, vbuf, enc_buf->jpeg_off,
-                                enc_buf->jpeg_size);
+        /* Grab the jpeg frame */
+        return enc_get_jpeg_dma_sg(solo_dev, fh->desc, vbuf->sglist,
+                                   sizeof(jpeg_header),
+                                   enc_buf->jpeg_off, size);
 }
 
 static int solo_fill_mpeg(struct solo_enc_fh *fh, struct solo_enc_buf *enc_buf,
-                          struct videobuf_buffer *vb, dma_addr_t vbuf)
+                          struct videobuf_buffer *vb,
+                          struct videobuf_dmabuf *vbuf)
 {
         struct solo_enc_dev *solo_enc = fh->enc;
         struct solo6010_dev *solo_dev = solo_enc->solo_dev;
         struct vop_header vh;
         int ret;
         int frame_size, frame_off;
+        int skip = 0;
 
         if (WARN_ON_ONCE(enc_buf->size <= sizeof(vh)))
-                return -1;
+                return -EINVAL;
 
         /* First get the hardware vop header (not real mpeg) */
         ret = enc_get_mpeg_dma(solo_dev, &vh, enc_buf->off, sizeof(vh));
-        if (ret)
-                return -1;
+        if (WARN_ON_ONCE(ret))
+                return ret;
 
         if (WARN_ON_ONCE(vh.size > enc_buf->size))
-                return -1;
+                return -EINVAL;
 
         vb->width = vh.hsize << 4;
         vb->height = vh.vsize << 4;
@@ -410,9 +513,9 @@ static int solo_fill_mpeg(struct solo_enc_fh *fh, struct solo_enc_buf *enc_buf,
         if (!enc_buf->vop) {
                 u16 fps = solo_dev->fps * 1000;
                 u16 interval = solo_enc->interval * 1000;
-                u8 *p = videobuf_queue_to_vaddr(&fh->vidq, vb);
+                u8 p[sizeof(vid_vop_header)];
 
-                memcpy(p, vid_vop_header, sizeof(vid_vop_header));
+                memcpy(p, vid_vop_header, sizeof(p));
 
                 if (solo_dev->video_type == SOLO_VO_FMT_TYPE_NTSC)
                         p[10] |= ((XVID_PAR_43_NTSC << 3) & 0x78);
@@ -434,43 +537,49 @@ static int solo_fill_mpeg(struct solo_enc_fh *fh, struct solo_enc_buf *enc_buf,
                 if (vh.interlace)
                         p[29] |= 0x20;
 
+                enc_write_sg(vbuf->sglist, p, sizeof(p));
+
                 /* Adjust the dma buffer past this header */
                 vb->size += sizeof(vid_vop_header);
-                vbuf += sizeof(vid_vop_header);
+                skip = sizeof(vid_vop_header);
         }
 
         /* Now get the actual mpeg payload */
         frame_off = (enc_buf->off + sizeof(vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
         frame_size = enc_buf->size - sizeof(vh);
-        ret = enc_get_mpeg_dma_t(solo_dev, vbuf, frame_off, frame_size);
-        if (WARN_ON_ONCE(ret))
-                return -1;
 
-        return 0;
+        ret = enc_get_mpeg_dma_sg(solo_dev, fh->desc, vbuf->sglist,
+                                  skip, frame_off, frame_size);
+        WARN_ON_ONCE(ret);
+
+        return ret;
 }
 
-/* On successful return (0), leaves solo_enc->lock unlocked */
-static int solo_enc_fillbuf(struct solo_enc_fh *fh,
+static void solo_enc_fillbuf(struct solo_enc_fh *fh,
                             struct videobuf_buffer *vb)
 {
         struct solo_enc_dev *solo_enc = fh->enc;
         struct solo6010_dev *solo_dev = solo_enc->solo_dev;
         struct solo_enc_buf *enc_buf = NULL;
-        dma_addr_t vbuf;
+        struct videobuf_dmabuf *vbuf;
         int ret;
+        int error = 1;
         u16 idx = fh->rd_idx;
 
         while (idx != solo_dev->enc_wr_idx) {
                 struct solo_enc_buf *ebuf = &solo_dev->enc_buf[idx];
+
                 idx = (idx + 1) % SOLO_NR_RING_BUFS;
+
+                if (ebuf->ch != solo_enc->ch)
+                        continue;
+
                 if (fh->fmt == V4L2_PIX_FMT_MPEG) {
-                        if (fh->type != ebuf->type)
-                                continue;
-                        if (ebuf->ch == solo_enc->ch) {
+                        if (fh->type == ebuf->type) {
                                 enc_buf = ebuf;
                                 break;
                         }
-                } else if (ebuf->ch == solo_enc->ch) {
+                } else {
                         /* For mjpeg, keep reading to the newest frame */
                         enc_buf = ebuf;
                 }
@@ -478,48 +587,55 @@ static int solo_enc_fillbuf(struct solo_enc_fh *fh,
 
         fh->rd_idx = idx;
 
-        if (!enc_buf)
-                return -1;
+        if (WARN_ON_ONCE(!enc_buf))
+                goto buf_err;
 
         if ((fh->fmt == V4L2_PIX_FMT_MPEG &&
              vb->bsize < enc_buf->size) ||
             (fh->fmt == V4L2_PIX_FMT_MJPEG &&
              vb->bsize < (enc_buf->jpeg_size + sizeof(jpeg_header)))) {
-                return -1;
+                WARN_ON_ONCE(1);
+                goto buf_err;
         }
 
-        if (!(vbuf = videobuf_to_dma_contig(vb)))
-                return -1;
-
-        /* Is it ok that we mess with this buffer out of lock? */
-        spin_unlock(&solo_enc->lock);
+        vbuf = videobuf_to_dma(vb);
+        if (WARN_ON_ONCE(!vbuf))
+                goto buf_err;
 
         if (fh->fmt == V4L2_PIX_FMT_MPEG)
                 ret = solo_fill_mpeg(fh, enc_buf, vb, vbuf);
         else
                 ret = solo_fill_jpeg(fh, enc_buf, vb, vbuf);
 
-        if (ret) // Ignore failures
-                return 0;
+        if (!ret)
+                error = 0;
 
-        list_del(&vb->queue);
-        vb->field_count++;
-        vb->ts = enc_buf->ts;
-        vb->state = VIDEOBUF_DONE;
+buf_err:
+        if (error) {
+                vb->state = VIDEOBUF_ERROR;
+        } else {
+                vb->field_count++;
+                vb->ts = enc_buf->ts;
+                vb->state = VIDEOBUF_DONE;
+        }
 
         wake_up(&vb->done);
 
-        return 0;
+        return;
 }
 
 static void solo_enc_thread_try(struct solo_enc_fh *fh)
 {
         struct solo_enc_dev *solo_enc = fh->enc;
+        struct solo6010_dev *solo_dev = solo_enc->solo_dev;
         struct videobuf_buffer *vb;
 
         for (;;) {
                 spin_lock(&solo_enc->lock);
 
+                if (fh->rd_idx == solo_dev->enc_wr_idx)
+                        break;
+
                 if (list_empty(&fh->vidq_active))
                         break;
 
@@ -529,9 +645,11 @@ static void solo_enc_thread_try(struct solo_enc_fh *fh)
                 if (!waitqueue_active(&vb->done))
                         break;
 
-                /* On success, returns with solo_enc->lock unlocked */
-                if (solo_enc_fillbuf(fh, vb))
-                        break;
+                list_del(&vb->queue);
+
+                spin_unlock(&solo_enc->lock);
+
+                solo_enc_fillbuf(fh, vb);
         }
 
         assert_spin_locked(&solo_enc->lock);
@@ -557,7 +675,7 @@ static int solo_enc_thread(void *data)
 
         remove_wait_queue(&solo_enc->thread_wait, &wait);
 
-        return 0;
+        return 0;
 }
 
 void solo_motion_isr(struct solo6010_dev *solo_dev)
@@ -614,7 +732,8 @@ void solo_enc_v4l2_isr(struct solo6010_dev *solo_dev)
                 jpeg_next = solo_reg_read(solo_dev,
                                         SOLO_VE_JPEG_QUE(solo_dev->enc_idx));
 
-                if ((ch = (mpeg_current >> 24) & 0x1f) >= SOLO_MAX_CHANNELS) {
+                ch = (mpeg_current >> 24) & 0x1f;
+                if (ch >= SOLO_MAX_CHANNELS) {
                         ch -= SOLO_MAX_CHANNELS;
                         enc_type = SOLO_ENC_TYPE_EXT;
                 } else
@@ -669,12 +788,12 @@ void solo_enc_v4l2_isr(struct solo6010_dev *solo_dev)
 static int solo_enc_buf_setup(struct videobuf_queue *vq, unsigned int *count,
                               unsigned int *size)
 {
-        *size = FRAME_BUF_SIZE;
+        *size = FRAME_BUF_SIZE;
 
-        if (*count < MIN_VID_BUFFERS)
+        if (*count < MIN_VID_BUFFERS)
                 *count = MIN_VID_BUFFERS;
 
-        return 0;
+        return 0;
 }
 
 static int solo_enc_buf_prepare(struct videobuf_queue *vq,
@@ -696,7 +815,9 @@ static int solo_enc_buf_prepare(struct videobuf_queue *vq,
         if (vb->state == VIDEOBUF_NEEDS_INIT) {
                 int rc = videobuf_iolock(vq, vb, NULL);
                 if (rc < 0) {
-                        videobuf_dma_contig_free(vq, vb);
+                        struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
+                        videobuf_dma_unmap(vq->dev, dma);
+                        videobuf_dma_free(dma);
                         vb->state = VIDEOBUF_NEEDS_INIT;
                         return rc;
                 }
@@ -719,7 +840,10 @@ static void solo_enc_buf_queue(struct videobuf_queue *vq,
 static void solo_enc_buf_release(struct videobuf_queue *vq,
                                  struct videobuf_buffer *vb)
 {
-        videobuf_dma_contig_free(vq, vb);
+        struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
+
+        videobuf_dma_unmap(vq->dev, dma);
+        videobuf_dma_free(dma);
         vb->state = VIDEOBUF_NEEDS_INIT;
 }
 
@@ -750,25 +874,22 @@ static int solo_enc_open(struct file *file)
         struct solo_enc_dev *solo_enc = video_drvdata(file);
         struct solo_enc_fh *fh;
 
-        if ((fh = kzalloc(sizeof(*fh), GFP_KERNEL)) == NULL)
+        fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+        if (fh == NULL)
                 return -ENOMEM;
 
-        spin_lock(&solo_enc->lock);
-
         fh->enc = solo_enc;
         file->private_data = fh;
         INIT_LIST_HEAD(&fh->vidq_active);
         fh->fmt = V4L2_PIX_FMT_MPEG;
         fh->type = SOLO_ENC_TYPE_STD;
 
-        videobuf_queue_dma_contig_init(&fh->vidq, &solo_enc_video_qops,
-                                    &solo_enc->solo_dev->pdev->dev,
-                                    &solo_enc->lock,
-                                    V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                                    V4L2_FIELD_INTERLACED,
-                                    sizeof(struct videobuf_buffer), fh, NULL);
-
-        spin_unlock(&solo_enc->lock);
+        videobuf_queue_sg_init(&fh->vidq, &solo_enc_video_qops,
+                               &solo_enc->solo_dev->pdev->dev,
+                               &solo_enc->lock,
+                               V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                               V4L2_FIELD_INTERLACED,
+                               sizeof(struct videobuf_buffer), fh, NULL);
 
         return 0;
 }
@@ -785,7 +906,11 @@ static ssize_t solo_enc_read(struct file *file, char __user *data,
 
                 spin_lock(&solo_enc->lock);
                 ret = solo_enc_on(fh);
-                spin_unlock(&solo_enc->lock);
+                spin_unlock(&solo_enc->lock);
+                if (ret)
+                        return ret;
+
+                ret = solo_start_fh_thread(fh);
                 if (ret)
                         return ret;
         }
@@ -797,10 +922,15 @@ static ssize_t solo_enc_read(struct file *file, char __user *data,
 static int solo_enc_release(struct file *file)
 {
         struct solo_enc_fh *fh = file->private_data;
+        struct solo_enc_dev *solo_enc = fh->enc;
 
         videobuf_stop(&fh->vidq);
         videobuf_mmap_free(&fh->vidq);
+
+        spin_lock(&solo_enc->lock);
         solo_enc_off(fh);
+        spin_unlock(&solo_enc->lock);
+
         kfree(fh);
 
         return 0;
@@ -842,7 +972,7 @@ static int solo_enc_enum_input(struct file *file, void *priv,
         if (solo_dev->video_type == SOLO_VO_FMT_TYPE_NTSC)
                 input->std = V4L2_STD_NTSC_M;
         else
-                input->std = V4L2_STD_PAL_M;
+                input->std = V4L2_STD_PAL_B;
 
         if (!tw28_get_video_status(solo_dev, solo_enc->ch))
                 input->status = V4L2_IN_ST_NO_SIGNAL;
@@ -915,9 +1045,8 @@ static int solo_enc_try_fmt_cap(struct file *file, void *priv,
 
         if (pix->field == V4L2_FIELD_ANY)
                 pix->field = V4L2_FIELD_INTERLACED;
-        else if (pix->field != V4L2_FIELD_INTERLACED) {
+        else if (pix->field != V4L2_FIELD_INTERLACED)
                 pix->field = V4L2_FIELD_INTERLACED;
-        }
 
         /* Just set these */
         pix->colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -937,7 +1066,8 @@ static int solo_enc_set_fmt_cap(struct file *file, void *priv,
 
         spin_lock(&solo_enc->lock);
 
-        if ((ret = solo_enc_try_fmt_cap(file, priv, f))) {
+        ret = solo_enc_try_fmt_cap(file, priv, f);
+        if (ret) {
                 spin_unlock(&solo_enc->lock);
                 return ret;
         }
@@ -956,7 +1086,10 @@ static int solo_enc_set_fmt_cap(struct file *file, void *priv,
 
         spin_unlock(&solo_enc->lock);
 
-        return ret;
+        if (ret)
+                return ret;
+
+        return solo_start_fh_thread(fh);
 }
 
 static int solo_enc_get_fmt_cap(struct file *file, void *priv,
@@ -977,7 +1110,7 @@ static int solo_enc_get_fmt_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int solo_enc_reqbufs(struct file *file, void *priv, 
+static int solo_enc_reqbufs(struct file *file, void *priv,
                             struct v4l2_requestbuffers *req)
 {
         struct solo_enc_fh *fh = priv;
@@ -1014,6 +1147,10 @@ static int solo_enc_dqbuf(struct file *file, void *priv,
                 spin_unlock(&solo_enc->lock);
                 if (ret)
                         return ret;
+
+                ret = solo_start_fh_thread(fh);
+                if (ret)
+                        return ret;
         }
 
         ret = videobuf_dqbuf(&fh->vidq, buf, file->f_flags & O_NONBLOCK);
@@ -1033,12 +1170,16 @@ static int solo_enc_dqbuf(struct file *file, void *priv,
 
         /* Check for key frame on mpeg data */
         if (fh->fmt == V4L2_PIX_FMT_MPEG) {
-                struct videobuf_buffer *vb = fh->vidq.bufs[buf->index];
-                u8 *p = videobuf_queue_to_vaddr(&fh->vidq, vb);
-                if (p[3] == 0x00)
-                        buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
-                else
-                        buf->flags |= V4L2_BUF_FLAG_PFRAME;
+                struct videobuf_dmabuf *vbuf =
+                                videobuf_to_dma(fh->vidq.bufs[buf->index]);
+
+                if (vbuf) {
+                        u8 *p = sg_virt(vbuf->sglist);
+                        if (p[3] == 0x00)
+                                buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
+                        else
+                                buf->flags |= V4L2_BUF_FLAG_PFRAME;
+                }
         }
 
         return 0;
@@ -1136,7 +1277,7 @@ static int solo_g_parm(struct file *file, void *priv,
         /* XXX: Shouldn't we be able to get/set this from videobuf? */
         cp->readbuffers = 2;
 
-        return 0;
+        return 0;
 }
 
 static int solo_s_parm(struct file *file, void *priv,
@@ -1176,7 +1317,7 @@ static int solo_s_parm(struct file *file, void *priv,
 
         spin_unlock(&solo_enc->lock);
 
-        return 0;
+        return 0;
 }
 
 static int solo_queryctrl(struct file *file, void *priv,
@@ -1240,7 +1381,7 @@ static int solo_queryctrl(struct file *file, void *priv,
                 return 0;
         }
 
-        return -EINVAL;
+        return -EINVAL;
 }
 
 static int solo_querymenu(struct file *file, void *priv,
@@ -1250,7 +1391,8 @@ static int solo_querymenu(struct file *file, void *priv,
         int err;
 
         qctrl.id = qmenu->id;
-        if ((err = solo_queryctrl(file, priv, &qctrl)))
+        err = solo_queryctrl(file, priv, &qctrl);
+        if (err)
                 return err;
 
         return v4l2_ctrl_query_menu(qmenu, &qctrl, NULL);
@@ -1350,9 +1492,9 @@ static int solo_s_ext_ctrls(struct file *file, void *priv,
                 switch (ctrl->id) {
                 case V4L2_CID_RDS_TX_RADIO_TEXT:
                         if (ctrl->size - 1 > OSD_TEXT_MAX)
-                                err = -ERANGE;
+                                err = -ERANGE;
                         else {
-                                err = copy_from_user(solo_enc->osd_text,
+                                err = copy_from_user(solo_enc->osd_text,
                                                      ctrl->string,
                                                      OSD_TEXT_MAX);
                                 solo_enc->osd_text[OSD_TEXT_MAX] = '\0';
@@ -1459,7 +1601,7 @@ static struct video_device solo_enc_template = {
         .minor                  = -1,
         .release                = video_device_release,
 
-        .tvnorms                = V4L2_STD_NTSC_M | V4L2_STD_PAL_M,
+        .tvnorms                = V4L2_STD_NTSC_M | V4L2_STD_PAL_B,
         .current_norm           = V4L2_STD_NTSC_M,
 };
 
@@ -1505,7 +1647,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo6010_dev *solo_dev, u8 ch)
         atomic_set(&solo_enc->readers, 0);
 
         solo_enc->qp = SOLO_DEFAULT_QP;
-        solo_enc->gop = solo_dev->fps;
+        solo_enc->gop = solo_dev->fps;
         solo_enc->interval = 1;
         solo_enc->mode = SOLO_ENC_MODE_CIF;
         solo_enc->motion_thresh = SOLO_DEF_MOT_THRESH;
diff --git a/drivers/staging/solo6x10/solo6010-v4l2.c b/drivers/staging/solo6x10/solo6010-v4l2.c
index 6ffd21de837d..a8491dc0e914 100644
--- a/drivers/staging/solo6x10/solo6010-v4l2.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2.c
@@ -24,14 +24,13 @@
 
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
-#include <media/videobuf-dma-contig.h>
+#include <media/videobuf-dma-sg.h>
 
 #include "solo6010.h"
 #include "solo6010-tw28.h"
 
 #define SOLO_HW_BPL             2048
 #define SOLO_DISP_PIX_FIELD     V4L2_FIELD_INTERLACED
-#define SOLO_DISP_BUF_SIZE      (64 * 1024) // 64k
 
 /* Image size is two fields, SOLO_HW_BPL is one horizontal line */
 #define solo_vlines(__solo)     (__solo->video_vsize * 2)
@@ -49,6 +48,8 @@ struct solo_filehandle {
         spinlock_t              slock;
         int                     old_write;
         struct list_head        vidq_active;
+        struct p2m_desc         desc[SOLO_NR_P2M_DESC];
+        int                     desc_idx;
 };
 
 unsigned video_nr = -1;
@@ -96,7 +97,7 @@ static void solo_win_setup(struct solo6010_dev *solo_dev, u8 ch,
                        SOLO_VI_WIN_EX(ex) |
                        SOLO_VI_WIN_SCALE(scale));
 
-        solo_reg_write(solo_dev, SOLO_VI_WIN_CTRL1(ch),
+        solo_reg_write(solo_dev, SOLO_VI_WIN_CTRL1(ch),
                        SOLO_VI_WIN_SY(sy) |
                        SOLO_VI_WIN_EY(ey));
 }
@@ -203,50 +204,149 @@ static int solo_v4l2_set_ch(struct solo6010_dev *solo_dev, u8 ch)
         return 0;
 }
 
+static void disp_reset_desc(struct solo_filehandle *fh)
+{
+        /* We use desc mode, which ignores desc 0 */
+        memset(fh->desc, 0, sizeof(*fh->desc));
+        fh->desc_idx = 1;
+}
+
+static int disp_flush_descs(struct solo_filehandle *fh)
+{
+        int ret;
+
+        if (!fh->desc_idx)
+                return 0;
+
+        ret = solo_p2m_dma_desc(fh->solo_dev, SOLO_P2M_DMA_ID_DISP,
+                                fh->desc, fh->desc_idx);
+        disp_reset_desc(fh);
+
+        return ret;
+}
+
+static int disp_push_desc(struct solo_filehandle *fh, dma_addr_t dma_addr,
+                      u32 ext_addr, int size, int repeat, int ext_size)
+{
+        if (fh->desc_idx >= SOLO_NR_P2M_DESC) {
+                int ret = disp_flush_descs(fh);
+                if (ret)
+                        return ret;
+        }
+
+        solo_p2m_push_desc(&fh->desc[fh->desc_idx], 0, dma_addr, ext_addr,
+                           size, repeat, ext_size);
+        fh->desc_idx++;
+
+        return 0;
+}
+
 static void solo_fillbuf(struct solo_filehandle *fh,
                          struct videobuf_buffer *vb)
 {
         struct solo6010_dev *solo_dev = fh->solo_dev;
-        dma_addr_t vbuf;
+        struct videobuf_dmabuf *vbuf;
         unsigned int fdma_addr;
-        int frame_size;
         int error = 1;
         int i;
+        struct scatterlist *sg;
+        dma_addr_t sg_dma;
+        int sg_size_left;
 
-        if (!(vbuf = videobuf_to_dma_contig(vb)))
+        vbuf = videobuf_to_dma(vb);
+        if (!vbuf)
                 goto finish_buf;
 
         if (erase_off(solo_dev)) {
-                void *p = videobuf_queue_to_vaddr(&fh->vidq, vb);
-                int image_size = solo_image_size(solo_dev);
-                for (i = 0; i < image_size; i += 2) {
-                        ((u8 *)p)[i] = 0x80;
-                        ((u8 *)p)[i + 1] = 0x00;
+                int i;
+
+                /* Just blit to the entire sg list, ignoring size */
+                for_each_sg(vbuf->sglist, sg, vbuf->sglen, i) {
+                        void *p = sg_virt(sg);
+                        size_t len = sg_dma_len(sg);
+
+                        for (i = 0; i < len; i += 2) {
+                                ((u8 *)p)[i] = 0x80;
+                                ((u8 *)p)[i + 1] = 0x00;
+                        }
                 }
+
                 error = 0;
                 goto finish_buf;
         }
 
-        frame_size = SOLO_HW_BPL * solo_vlines(solo_dev);
-        fdma_addr = SOLO_DISP_EXT_ADDR(solo_dev) + (fh->old_write * frame_size);
+        disp_reset_desc(fh);
+        sg = vbuf->sglist;
+        sg_dma = sg_dma_address(sg);
+        sg_size_left = sg_dma_len(sg);
+
+        fdma_addr = SOLO_DISP_EXT_ADDR(solo_dev) + (fh->old_write *
+                        (SOLO_HW_BPL * solo_vlines(solo_dev)));
 
-        for (i = 0; i < frame_size / SOLO_DISP_BUF_SIZE; i++) {
-                int j;
-                for (j = 0; j < (SOLO_DISP_BUF_SIZE / SOLO_HW_BPL); j++) {
-                        if (solo_p2m_dma_t(solo_dev, SOLO_P2M_DMA_ID_DISP, 0,
-                                           vbuf, fdma_addr + (j * SOLO_HW_BPL),
-                                           solo_bytesperline(solo_dev)))
+        for (i = 0; i < solo_vlines(solo_dev); i++) {
+                int line_len = solo_bytesperline(solo_dev);
+                int lines;
+
+                if (!sg_size_left) {
+                        sg = sg_next(sg);
+                        if (sg == NULL)
                                 goto finish_buf;
-                        vbuf += solo_bytesperline(solo_dev);
+                        sg_dma = sg_dma_address(sg);
+                        sg_size_left = sg_dma_len(sg);
                 }
-                fdma_addr += SOLO_DISP_BUF_SIZE;
+
+                /* No room for an entire line, so chunk it up */
+                if (sg_size_left < line_len) {
+                        int this_addr = fdma_addr;
+
+                        while (line_len > 0) {
+                                int this_write;
+
+                                if (!sg_size_left) {
+                                        sg = sg_next(sg);
+                                        if (sg == NULL)
+                                                goto finish_buf;
+                                        sg_dma = sg_dma_address(sg);
+                                        sg_size_left = sg_dma_len(sg);
+                                }
+
+                                this_write = min(sg_size_left, line_len);
+
+                                if (disp_push_desc(fh, sg_dma, this_addr,
+                                                   this_write, 0, 0))
+                                        goto finish_buf;
+
+                                line_len -= this_write;
+                                sg_size_left -= this_write;
+                                sg_dma += this_write;
+                                this_addr += this_write;
+                        }
+
+                        fdma_addr += SOLO_HW_BPL;
+                        continue;
+                }
+
+                /* Shove as many lines into a repeating descriptor as possible */
+                lines = min(sg_size_left / line_len,
+                            solo_vlines(solo_dev) - i);
+
+                if (disp_push_desc(fh, sg_dma, fdma_addr, line_len,
+                                   lines - 1, SOLO_HW_BPL))
+                        goto finish_buf;
+
+                i += lines - 1;
+                fdma_addr += SOLO_HW_BPL * lines;
+                sg_dma += lines * line_len;
+                sg_size_left -= lines * line_len;
         }
-        error = 0;
+
+        error = disp_flush_descs(fh);
 
 finish_buf:
         if (error) {
                 vb->state = VIDEOBUF_ERROR;
         } else {
+                vb->size = solo_vlines(solo_dev) * solo_bytesperline(solo_dev);
                 vb->state = VIDEOBUF_DONE;
                 vb->field_count++;
                 do_gettimeofday(&vb->ts);
@@ -275,7 +375,7 @@ static void solo_thread_try(struct solo_filehandle *fh)
                         break;
 
                 cur_write = SOLO_VI_STATUS0_PAGE(solo_reg_read(fh->solo_dev,
-                                                        SOLO_VI_STATUS0));
+                                                 SOLO_VI_STATUS0));
                 if (cur_write == fh->old_write)
                         break;
 
@@ -310,7 +410,7 @@ static int solo_thread(void *data)
 
         remove_wait_queue(&solo_dev->disp_thread_wait, &wait);
 
-        return 0;
+        return 0;
 }
 
 static int solo_start_thread(struct solo_filehandle *fh)
@@ -337,12 +437,12 @@ static int solo_buf_setup(struct videobuf_queue *vq, unsigned int *count,
         struct solo_filehandle *fh = vq->priv_data;
         struct solo6010_dev *solo_dev  = fh->solo_dev;
 
-        *size = solo_image_size(solo_dev);
+        *size = solo_image_size(solo_dev);
 
-        if (*count < MIN_VID_BUFFERS)
+        if (*count < MIN_VID_BUFFERS)
                 *count = MIN_VID_BUFFERS;
 
-        return 0;
+        return 0;
 }
 
 static int solo_buf_prepare(struct videobuf_queue *vq,
@@ -364,7 +464,9 @@ static int solo_buf_prepare(struct videobuf_queue *vq,
         if (vb->state == VIDEOBUF_NEEDS_INIT) {
                 int rc = videobuf_iolock(vq, vb, NULL);
                 if (rc < 0) {
-                        videobuf_dma_contig_free(vq, vb);
+                        struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
+                        videobuf_dma_unmap(vq->dev, dma);
+                        videobuf_dma_free(dma);
                         vb->state = VIDEOBUF_NEEDS_INIT;
                         return rc;
                 }
@@ -388,7 +490,10 @@ static void solo_buf_queue(struct videobuf_queue *vq,
 static void solo_buf_release(struct videobuf_queue *vq,
                              struct videobuf_buffer *vb)
 {
-        videobuf_dma_contig_free(vq, vb);
+        struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
+
+        videobuf_dma_unmap(vq->dev, dma);
+        videobuf_dma_free(dma);
         vb->state = VIDEOBUF_NEEDS_INIT;
 }
 
@@ -404,7 +509,7 @@ static unsigned int solo_v4l2_poll(struct file *file,
 {
         struct solo_filehandle *fh = file->private_data;
 
-        return videobuf_poll_stream(file, &fh->vidq, wait);
+        return videobuf_poll_stream(file, &fh->vidq, wait);
 }
 
 static int solo_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
@@ -420,7 +525,8 @@ static int solo_v4l2_open(struct file *file)
         struct solo_filehandle *fh;
         int ret;
 
-        if ((fh = kzalloc(sizeof(*fh), GFP_KERNEL)) == NULL)
+        fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+        if (fh == NULL)
                 return -ENOMEM;
 
         spin_lock_init(&fh->slock);
@@ -428,16 +534,17 @@ static int solo_v4l2_open(struct file *file)
         fh->solo_dev = solo_dev;
         file->private_data = fh;
 
-        if ((ret = solo_start_thread(fh))) {
+        ret = solo_start_thread(fh);
+        if (ret) {
                 kfree(fh);
                 return ret;
         }
 
-        videobuf_queue_dma_contig_init(&fh->vidq, &solo_video_qops,
-                                    &solo_dev->pdev->dev, &fh->slock,
-                                    V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                                    SOLO_DISP_PIX_FIELD,
-                                    sizeof(struct videobuf_buffer), fh, NULL);
+        videobuf_queue_sg_init(&fh->vidq, &solo_video_qops,
+                               &solo_dev->pdev->dev, &fh->slock,
+                               V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                               SOLO_DISP_PIX_FIELD,
+                               sizeof(struct videobuf_buffer), fh, NULL);
 
         return 0;
 }
@@ -530,7 +637,7 @@ static int solo_enum_input(struct file *file, void *priv,
         if (solo_dev->video_type == SOLO_VO_FMT_TYPE_NTSC)
                 input->std = V4L2_STD_NTSC_M;
         else
-                input->std = V4L2_STD_PAL_M;
+                input->std = V4L2_STD_PAL_B;
 
         return 0;
 }
@@ -622,7 +729,7 @@ static int solo_get_fmt_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int solo_reqbufs(struct file *file, void *priv, 
+static int solo_reqbufs(struct file *file, void *priv,
                         struct v4l2_requestbuffers *req)
 {
         struct solo_filehandle *fh = priv;
@@ -781,11 +888,11 @@ static const struct v4l2_ioctl_ops solo_v4l2_ioctl_ops = {
         .vidioc_qbuf                    = solo_qbuf,
         .vidioc_dqbuf                   = solo_dqbuf,
         .vidioc_streamon                = solo_streamon,
-        .vidioc_streamoff               = solo_streamoff,
+        .vidioc_streamoff               = solo_streamoff,
         /* Controls */
         .vidioc_queryctrl               = solo_disp_queryctrl,
-        .vidioc_g_ctrl                  = solo_disp_g_ctrl,
-        .vidioc_s_ctrl                  = solo_disp_s_ctrl,
+        .vidioc_g_ctrl                  = solo_disp_g_ctrl,
+        .vidioc_s_ctrl                  = solo_disp_s_ctrl,
 };
 
 static struct video_device solo_v4l2_template = {
@@ -795,7 +902,7 @@ static struct video_device solo_v4l2_template = {
         .minor                  = -1,
         .release                = video_device_release,
 
-        .tvnorms                = V4L2_STD_NTSC_M | V4L2_STD_PAL_M,
+        .tvnorms                = V4L2_STD_NTSC_M | V4L2_STD_PAL_B,
         .current_norm           = V4L2_STD_NTSC_M,
 };
 
@@ -836,13 +943,13 @@ int solo_v4l2_init(struct solo6010_dev *solo_dev)
         for (i = 0; i < solo_dev->nr_chans; i++) {
                 solo_v4l2_set_ch(solo_dev, i);
                 while (erase_off(solo_dev))
-                        ;// Do nothing
+                        ;/* Do nothing */
         }
 
         /* Set the default display channel */
         solo_v4l2_set_ch(solo_dev, 0);
         while (erase_off(solo_dev))
-                ;// Do nothing
+                ;/* Do nothing */
 
         solo6010_irq_on(solo_dev, SOLO_IRQ_VIDEO_IN);
 
diff --git a/drivers/staging/solo6x10/solo6010.h b/drivers/staging/solo6x10/solo6010.h
index dca8e3e15450..9c930f3a017b 100644
--- a/drivers/staging/solo6x10/solo6010.h
+++ b/drivers/staging/solo6x10/solo6010.h
@@ -26,8 +26,8 @@
 #include <linux/semaphore.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
-#include <linux/delay.h>
 #include <linux/wait.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
 
@@ -48,10 +48,14 @@
 #define PCI_DEVICE_ID_NEUSOLO_4         0x4304
 #define PCI_DEVICE_ID_NEUSOLO_9         0x4309
 #define PCI_DEVICE_ID_NEUSOLO_16        0x4310
-/* Commell Softlogic 6010 based cards */
-#define PCI_DEVICE_ID_COMMSOLO_4        0x4E04
-#define PCI_DEVICE_ID_COMMSOLO_9        0x4E09
-#define PCI_DEVICE_ID_COMMSOLO_16       0x4E10
+/* Bluecherry Softlogic 6010 based cards */
+#define PCI_DEVICE_ID_BC_SOLO_4         0x4E04
+#define PCI_DEVICE_ID_BC_SOLO_9         0x4E09
+#define PCI_DEVICE_ID_BC_SOLO_16        0x4E10
+/* Bluecherry Softlogic 6110 based cards */
+#define PCI_DEVICE_ID_BC_6110_4         0x5304
+#define PCI_DEVICE_ID_BC_6110_8         0x5308
+#define PCI_DEVICE_ID_BC_6110_16        0x5310
 #endif /* Bluecherry */
 
 #define SOLO6010_NAME                   "solo6010"
@@ -64,7 +68,7 @@
 #define SOLO6010_VER_MINOR              0
 #define SOLO6010_VER_SUB                0
 #define SOLO6010_VER_NUM \
-    KERNEL_VERSION(SOLO6010_VER_MAJOR, SOLO6010_VER_MINOR, SOLO6010_VER_SUB)
+        KERNEL_VERSION(SOLO6010_VER_MAJOR, SOLO6010_VER_MINOR, SOLO6010_VER_SUB)
 
 /*
  * The SOLO6010 actually has 8 i2c channels, but we only use 2.
@@ -78,7 +82,6 @@
 /* DMA Engine setup */
 #define SOLO_NR_P2M                     4
 #define SOLO_NR_P2M_DESC                256
-#define SOLO_P2M_DESC_SIZE              (SOLO_NR_P2M_DESC * 16)
 /* MPEG and JPEG share the same interrupt and locks so they must be together
  * in the same dma channel. */
 #define SOLO_P2M_DMA_ID_MP4E            0
@@ -123,11 +126,17 @@ enum SOLO_I2C_STATE {
         IIC_STATE_STOP
 };
 
+struct p2m_desc {
+        u32 ctrl;
+        u32 ext;
+        u32 ta;
+        u32 fa;
+};
+
 struct solo_p2m_dev {
-        struct semaphore        sem;
+        struct mutex            mutex;
         struct completion       completion;
         int                     error;
-        u8                      desc[SOLO_P2M_DESC_SIZE];
 };
 
 #define OSD_TEXT_MAX            30
@@ -185,7 +194,7 @@ struct solo6010_dev {
         /* i2c related items */
         struct i2c_adapter      i2c_adap[SOLO_I2C_ADAPTERS];
         enum SOLO_I2C_STATE     i2c_state;
-        struct semaphore        i2c_sem;
+        struct mutex            i2c_mutex;
         int                     i2c_id;
         wait_queue_head_t       i2c_wait;
         struct i2c_msg          *i2c_msg;
@@ -212,7 +221,7 @@ struct solo6010_dev {
         struct solo_enc_buf     enc_buf[SOLO_NR_RING_BUFS];
 
         /* Current video settings */
-        u32                     video_type;
+        u32                     video_type;
         u16                     video_hsize, video_vsize;
         u16                     vout_hstart, vout_vstart;
         u16                     vin_hstart, vin_vstart;
@@ -306,6 +315,14 @@ int solo_p2m_dma_t(struct solo6010_dev *solo_dev, u8 id, int wr,
                    dma_addr_t dma_addr, u32 ext_addr, u32 size);
 int solo_p2m_dma(struct solo6010_dev *solo_dev, u8 id, int wr,
                  void *sys_addr, u32 ext_addr, u32 size);
+int solo_p2m_dma_sg(struct solo6010_dev *solo_dev, u8 id,
+                    struct p2m_desc *pdesc, int wr,
+                    struct scatterlist *sglist, u32 sg_off,
+                    u32 ext_addr, u32 size);
+void solo_p2m_push_desc(struct p2m_desc *desc, int wr, dma_addr_t dma_addr,
+                        u32 ext_addr, u32 size, int repeat, u32 ext_size);
+int solo_p2m_dma_desc(struct solo6010_dev *solo_dev, u8 id,
+                      struct p2m_desc *desc, int desc_count);
 
 /* Set the threshold for motion detection */
 void solo_set_motion_threshold(struct solo6010_dev *solo_dev, u8 ch, u16 val);
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index cc79f9edfe9e..408bb9b3303e 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -984,8 +984,10 @@ int speakup_kobj_init(void)
          * not known ahead of time.
          */
         accessibility_kobj = kobject_create_and_add("accessibility", NULL);
-        if (!accessibility_kobj)
-                return -ENOMEM;
+        if (!accessibility_kobj) {
+                retval = -ENOMEM;
+                goto out;
+        }
 
         speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj);
         if (!speakup_kobj) {
@@ -1002,7 +1004,7 @@ int speakup_kobj_init(void)
         if (retval)
                 goto err_group;
 
-        return 0;
+        goto out;
 
 err_group:
         sysfs_remove_group(speakup_kobj, &main_attr_group);
@@ -1010,6 +1012,7 @@ err_speakup:
         kobject_put(speakup_kobj);
 err_acc:
         kobject_put(accessibility_kobj);
+out:
         return retval;
 }
 
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 4b7a9c2b965f..3cd00396a462 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2253,17 +2253,17 @@ static int __init speakup_init(void)
 
         err = speakup_add_virtual_keyboard();
         if (err)
-                return err;
+                goto out;
 
         initialize_msgs();      /* Initialize arrays for i18n. */
         first_console = kzalloc(sizeof(*first_console), GFP_KERNEL);
-        if (!first_console)
-                return -ENOMEM;
-        err = speakup_kobj_init();
-        if (err) {
-                kfree(first_console);
-                return err;
+        if (!first_console) {
+                err = -ENOMEM;
+                goto err_cons;
         }
+        err = speakup_kobj_init();
+        if (err)
+                goto err_kobject;
 
         reset_default_chars();
         reset_default_chartab();
@@ -2299,11 +2299,20 @@ static int __init speakup_init(void)
 
         speakup_task = kthread_create(speakup_thread, NULL, "speakup");
         set_user_nice(speakup_task, 10);
-        if (!IS_ERR(speakup_task))
-                wake_up_process(speakup_task);
-        else
-                return -ENOMEM;
-        return 0;
+        if (IS_ERR(speakup_task)) {
+                err = -ENOMEM;
+                goto err_kobject;
+        }
+        wake_up_process(speakup_task);
+        goto out;
+
+err_kobject:
+speakup_kobj_exit();
+        kfree(first_console);
+err_cons:
+        speakup_remove_virtual_keyboard();
+out:
+        return err;
 }
 
 module_init(speakup_init);
diff --git a/drivers/staging/speakup/spk_types.h b/drivers/staging/speakup/spk_types.h
index 840bddb64101..d36c90e30d54 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -52,7 +52,7 @@ typedef int (*special_func)(struct vc_data *vc, u_char type, u_char ch,
 
 #define COLOR_BUFFER_SIZE 160
 
-struct spk_highlight_color_track{
+struct spk_highlight_color_track {
         /* Count of each background color */
         unsigned int bgcount[8];
         /* Buffer for characters drawn with each background color */
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
index 63a9d0adf32d..007b24b54e25 100644
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
@@ -28,6 +28,7 @@
 #include <linux/log2.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/async.h>
 
 /**** Helper functions used for Div, Remainder operation on u64 ****/
 
@@ -729,34 +730,16 @@ static void create_sysfs_entry(struct device *dev)
 }
 */
 
-static int GLOB_SBD_init(void)
+static void register_spectra_ftl_async(void *unused, async_cookie_t cookie)
 {
         int i;
 
-        /* Set debug output level (0~3) here. 3 is most verbose */
-        printk(KERN_ALERT "Spectra: %s\n", GLOB_version);
-
-        mutex_init(&spectra_lock);
-
-        GLOB_SBD_majornum = register_blkdev(0, GLOB_SBD_NAME);
-        if (GLOB_SBD_majornum <= 0) {
-                printk(KERN_ERR "Unable to get the major %d for Spectra",
-                       GLOB_SBD_majornum);
-                return -EBUSY;
-        }
-
-        if (PASS != GLOB_FTL_Flash_Init()) {
-                printk(KERN_ERR "Spectra: Unable to Initialize Flash Device. "
-                       "Aborting\n");
-                goto out_flash_register;
-        }
-
         /* create_sysfs_entry(&dev->dev); */
 
         if (PASS != GLOB_FTL_IdentifyDevice(&IdentifyDeviceData)) {
                 printk(KERN_ERR "Spectra: Unable to Read Flash Device. "
                        "Aborting\n");
-                goto out_flash_register;
+                return;
         } else {
                 nand_dbg_print(NAND_DBG_WARN, "In GLOB_SBD_init: "
                                "Num blocks=%d, pagesperblock=%d, "
@@ -775,24 +758,50 @@ static int GLOB_SBD_init(void)
         }
         printk(KERN_ALERT "Spectra: block table has been found.\n");
 
+        GLOB_SBD_majornum = register_blkdev(0, GLOB_SBD_NAME);
+        if (GLOB_SBD_majornum <= 0) {
+                printk(KERN_ERR "Unable to get the major %d for Spectra",
+                       GLOB_SBD_majornum);
+                goto out_ftl_flash_register;
+        }
+
         for (i = 0; i < NUM_DEVICES; i++)
                 if (SBD_setup_device(&nand_device[i], i) == -ENOMEM)
-                        goto out_ftl_flash_register;
+                        goto out_blk_register;
 
         nand_dbg_print(NAND_DBG_DEBUG,
                        "Spectra: module loaded with major number %d\n",
                        GLOB_SBD_majornum);
 
-        return 0;
+        return;
 
+out_blk_register:
+        unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
 out_ftl_flash_register:
         GLOB_FTL_Cache_Release();
-out_flash_register:
-        GLOB_FTL_Flash_Release();
-        unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
         printk(KERN_ERR "Spectra: Module load failed.\n");
+}
 
-        return -ENOMEM;
+int register_spectra_ftl()
+{
+        async_schedule(register_spectra_ftl_async, NULL);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(register_spectra_ftl);
+
+static int GLOB_SBD_init(void)
+{
+        /* Set debug output level (0~3) here. 3 is most verbose */
+        printk(KERN_ALERT "Spectra: %s\n", GLOB_version);
+
+        mutex_init(&spectra_lock);
+
+        if (PASS != GLOB_FTL_Flash_Init()) {
+                printk(KERN_ERR "Spectra: Unable to Initialize Flash Device. "
+                       "Aborting\n");
+                return -ENODEV;
+        }
+        return 0;
 }
 
 static void __exit GLOB_SBD_exit(void)
diff --git a/drivers/staging/spectra/ffsport.h b/drivers/staging/spectra/ffsport.h
index 6c5d90c53430..85c0750612f6 100644
--- a/drivers/staging/spectra/ffsport.h
+++ b/drivers/staging/spectra/ffsport.h
@@ -80,5 +80,6 @@ extern int nand_debug_level;
 extern int GLOB_Calc_Used_Bits(u32 n);
 extern u64 GLOB_u64_Div(u64 addr, u32 divisor);
 extern u64 GLOB_u64_Remainder(u64 addr, u32 divisor_type);
+extern int register_spectra_ftl(void);
 
 #endif /* _FFSPORT_ */
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c
index 4e6e451cd5c8..fb39c8ecf596 100644
--- a/drivers/staging/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
@@ -1258,9 +1258,7 @@ int GLOB_FTL_Flash_Init(void)
 
         g_SBDCmdIndex = 0;
 
-        GLOB_LLD_Flash_Init();
-
-        status = GLOB_LLD_Read_Device_ID();
+        status = GLOB_LLD_Flash_Init();
 
         return status;
 }
diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
index 6733bbf8016d..095f2f0c2e5b 100644
--- a/drivers/staging/spectra/lld_emu.c
+++ b/drivers/staging/spectra/lld_emu.c
@@ -180,10 +180,8 @@ u16 emu_Flash_Init(void)
         nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
                        __FILE__, __LINE__, __func__);
 
-        flash_memory[0] = (u8 *)vmalloc(GLOB_LLD_PAGE_SIZE *
-                                                   GLOB_LLD_BLOCKS *
-                                                   GLOB_LLD_PAGES *
-                                                   sizeof(u8));
+        flash_memory[0] = vmalloc(GLOB_LLD_PAGE_SIZE * GLOB_LLD_BLOCKS *
+                                  GLOB_LLD_PAGES * sizeof(u8));
         if (!flash_memory[0]) {
                 printk(KERN_ERR "Fail to allocate memory "
                        "for nand emulator!\n");
diff --git a/drivers/staging/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c
index 0d647a8fd2b6..2263d3ea5456 100644
--- a/drivers/staging/spectra/lld_nand.c
+++ b/drivers/staging/spectra/lld_nand.c
@@ -2395,14 +2395,94 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         unsigned long csr_base;
         unsigned long csr_len;
         struct mrst_nand_info *pndev = &info;
+        u32 int_mask;
 
         nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
                        __FILE__, __LINE__, __func__);
 
+        FlashReg = ioremap_nocache(GLOB_HWCTL_REG_BASE,
+                        GLOB_HWCTL_REG_SIZE);
+        if (!FlashReg) {
+                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
+                return -ENOMEM;
+        }
+        nand_dbg_print(NAND_DBG_WARN,
+                "Spectra: Remapped reg base address: "
+                "0x%p, len: %d\n",
+                FlashReg, GLOB_HWCTL_REG_SIZE);
+
+        FlashMem = ioremap_nocache(GLOB_HWCTL_MEM_BASE,
+                        GLOB_HWCTL_MEM_SIZE);
+        if (!FlashMem) {
+                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
+                iounmap(FlashReg);
+                return -ENOMEM;
+        }
+        nand_dbg_print(NAND_DBG_WARN,
+                "Spectra: Remapped flash base address: "
+                "0x%p, len: %d\n",
+                (void *)FlashMem, GLOB_HWCTL_MEM_SIZE);
+
+        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
+                        "acc_clks: %d, re_2_we: %d, we_2_re: %d,"
+                        "addr_2_data: %d, rdwr_en_lo_cnt: %d, "
+                        "rdwr_en_hi_cnt: %d, cs_setup_cnt: %d\n",
+                        ioread32(FlashReg + ACC_CLKS),
+                        ioread32(FlashReg + RE_2_WE),
+                        ioread32(FlashReg + WE_2_RE),
+                        ioread32(FlashReg + ADDR_2_DATA),
+                        ioread32(FlashReg + RDWR_EN_LO_CNT),
+                        ioread32(FlashReg + RDWR_EN_HI_CNT),
+                        ioread32(FlashReg + CS_SETUP_CNT));
+
+        NAND_Flash_Reset();
+
+        iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
+
+#if CMD_DMA
+        info.pcmds_num = 0;
+        info.flash_bank = 0;
+        info.cdma_num = 0;
+        int_mask = (DMA_INTR__DESC_COMP_CHANNEL0 |
+                DMA_INTR__DESC_COMP_CHANNEL1 |
+                DMA_INTR__DESC_COMP_CHANNEL2 |
+                DMA_INTR__DESC_COMP_CHANNEL3 |
+                DMA_INTR__MEMCOPY_DESC_COMP);
+        iowrite32(int_mask, FlashReg + DMA_INTR_EN);
+        iowrite32(0xFFFF, FlashReg + DMA_INTR);
+
+        int_mask = (INTR_STATUS0__ECC_ERR |
+                INTR_STATUS0__PROGRAM_FAIL |
+                INTR_STATUS0__ERASE_FAIL);
+#else
+        int_mask = INTR_STATUS0__DMA_CMD_COMP |
+                INTR_STATUS0__ECC_TRANSACTION_DONE |
+                INTR_STATUS0__ECC_ERR |
+                INTR_STATUS0__PROGRAM_FAIL |
+                INTR_STATUS0__ERASE_FAIL;
+#endif
+        iowrite32(int_mask, FlashReg + INTR_EN0);
+        iowrite32(int_mask, FlashReg + INTR_EN1);
+        iowrite32(int_mask, FlashReg + INTR_EN2);
+        iowrite32(int_mask, FlashReg + INTR_EN3);
+
+        /* Clear all status bits */
+        iowrite32(0xFFFF, FlashReg + INTR_STATUS0);
+        iowrite32(0xFFFF, FlashReg + INTR_STATUS1);
+        iowrite32(0xFFFF, FlashReg + INTR_STATUS2);
+        iowrite32(0xFFFF, FlashReg + INTR_STATUS3);
+
+        iowrite32(0x0F, FlashReg + RB_PIN_ENABLED);
+        iowrite32(CHIP_EN_DONT_CARE__FLAG, FlashReg + CHIP_ENABLE_DONT_CARE);
+
+        /* Should set value for these registers when init */
+        iowrite32(0, FlashReg + TWO_ROW_ADDR_CYCLES);
+        iowrite32(1, FlashReg + ECC_ENABLE);
+        enable_ecc = 1;
         ret = pci_enable_device(dev);
         if (ret) {
                 printk(KERN_ERR "Spectra: pci_enable_device failed.\n");
-                return ret;
+                goto failed_req_csr;
         }
 
         pci_set_master(dev);
@@ -2461,12 +2541,26 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
         pci_set_drvdata(dev, pndev);
 
+        ret = GLOB_LLD_Read_Device_ID();
+        if (ret) {
+                iounmap(pndev->ioaddr);
+                goto failed_remap_csr;
+        }
+
+        ret = register_spectra_ftl();
+        if (ret) {
+                iounmap(pndev->ioaddr);
+                goto failed_remap_csr;
+        }
+
         return 0;
 
 failed_remap_csr:
         pci_release_regions(dev);
 failed_req_csr:
         pci_disable_device(dev);
+        iounmap(FlashMem);
+        iounmap(FlashReg);
 
         return ret;
 }
@@ -2498,91 +2592,10 @@ static struct pci_driver nand_pci_driver = {
 int NAND_Flash_Init(void)
 {
         int retval;
-        u32 int_mask;
 
         nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
                        __FILE__, __LINE__, __func__);
 
-        FlashReg = ioremap_nocache(GLOB_HWCTL_REG_BASE,
-                        GLOB_HWCTL_REG_SIZE);
-        if (!FlashReg) {
-                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
-                return -ENOMEM;
-        }
-        nand_dbg_print(NAND_DBG_WARN,
-                "Spectra: Remapped reg base address: "
-                "0x%p, len: %d\n",
-                FlashReg, GLOB_HWCTL_REG_SIZE);
-
-        FlashMem = ioremap_nocache(GLOB_HWCTL_MEM_BASE,
-                        GLOB_HWCTL_MEM_SIZE);
-        if (!FlashMem) {
-                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
-                iounmap(FlashReg);
-                return -ENOMEM;
-        }
-        nand_dbg_print(NAND_DBG_WARN,
-                "Spectra: Remapped flash base address: "
-                "0x%p, len: %d\n",
-                (void *)FlashMem, GLOB_HWCTL_MEM_SIZE);
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
-                        "acc_clks: %d, re_2_we: %d, we_2_re: %d,"
-                        "addr_2_data: %d, rdwr_en_lo_cnt: %d, "
-                        "rdwr_en_hi_cnt: %d, cs_setup_cnt: %d\n",
-                        ioread32(FlashReg + ACC_CLKS),
-                        ioread32(FlashReg + RE_2_WE),
-                        ioread32(FlashReg + WE_2_RE),
-                        ioread32(FlashReg + ADDR_2_DATA),
-                        ioread32(FlashReg + RDWR_EN_LO_CNT),
-                        ioread32(FlashReg + RDWR_EN_HI_CNT),
-                        ioread32(FlashReg + CS_SETUP_CNT));
-
-        NAND_Flash_Reset();
-
-        iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-
-#if CMD_DMA
-        info.pcmds_num = 0;
-        info.flash_bank = 0;
-        info.cdma_num = 0;
-        int_mask = (DMA_INTR__DESC_COMP_CHANNEL0 |
-                DMA_INTR__DESC_COMP_CHANNEL1 |
-                DMA_INTR__DESC_COMP_CHANNEL2 |
-                DMA_INTR__DESC_COMP_CHANNEL3 |
-                DMA_INTR__MEMCOPY_DESC_COMP);
-        iowrite32(int_mask, FlashReg + DMA_INTR_EN);
-        iowrite32(0xFFFF, FlashReg + DMA_INTR);
-
-        int_mask = (INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL);
-#else
-        int_mask = INTR_STATUS0__DMA_CMD_COMP |
-                INTR_STATUS0__ECC_TRANSACTION_DONE |
-                INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL;
-#endif
-        iowrite32(int_mask, FlashReg + INTR_EN0);
-        iowrite32(int_mask, FlashReg + INTR_EN1);
-        iowrite32(int_mask, FlashReg + INTR_EN2);
-        iowrite32(int_mask, FlashReg + INTR_EN3);
-
-        /* Clear all status bits */
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS0);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS1);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS2);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS3);
-
-        iowrite32(0x0F, FlashReg + RB_PIN_ENABLED);
-        iowrite32(CHIP_EN_DONT_CARE__FLAG, FlashReg + CHIP_ENABLE_DONT_CARE);
-
-        /* Should set value for these registers when init */
-        iowrite32(0, FlashReg + TWO_ROW_ADDR_CYCLES);
-        iowrite32(1, FlashReg + ECC_ENABLE);
-        enable_ecc = 1;
-
         retval = pci_register_driver(&nand_pci_driver);
         if (retval)
                 return -ENOMEM;
diff --git a/drivers/staging/ste_rmi4/Kconfig b/drivers/staging/ste_rmi4/Kconfig
new file mode 100644
index 000000000000..e8679509e525
--- /dev/null
+++ b/drivers/staging/ste_rmi4/Kconfig
@@ -0,0 +1,9 @@
+config TOUCHSCREEN_SYNAPTICS_I2C_RMI4
+        tristate "Synaptics i2c rmi4 touchscreen"
+        depends on I2C && INPUT
+        help
+          Say Y here if you have a Synaptics RMI4 and
+          want to enable support for the built-in touchscreen.
+
+          To compile this driver as a module, choose M here: the
+          module will be called synaptics_rmi4_ts.
diff --git a/drivers/staging/ste_rmi4/Makefile b/drivers/staging/ste_rmi4/Makefile
new file mode 100644
index 000000000000..6cce2ed187ef
--- /dev/null
+++ b/drivers/staging/ste_rmi4/Makefile
@@ -0,0 +1,4 @@
+#
+# Makefile for the RMI4 touchscreen driver.
+#
+obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
diff --git a/drivers/staging/ste_rmi4/TODO b/drivers/staging/ste_rmi4/TODO
new file mode 100644
index 000000000000..9be2437da85f
--- /dev/null
+++ b/drivers/staging/ste_rmi4/TODO
@@ -0,0 +1,7 @@
+TODO
+----
+
+Wait for the official upstream synaptics rmi4 clearpad drivers as promised over the past few months
+Merge any device support needed from this driver into it
+Delete this driver
+
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
new file mode 100644
index 000000000000..e8f047e86a32
--- /dev/null
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -0,0 +1,1179 @@
+/**
+ *
+ * Synaptics Register Mapped Interface (RMI4) I2C Physical Layer Driver.
+ * Copyright (c) 2007-2010, Synaptics Incorporated
+ *
+ * Author: Js HA <js.ha@stericsson.com> for ST-Ericsson
+ * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson
+ * Copyright 2010 (c) ST-Ericsson AB
+ */
+/*
+ * This file is licensed under the GPL2 license.
+ *
+ *#############################################################################
+ * GPL
+ *
+ * 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.
+ *
+ *#############################################################################
+ */
+
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/regulator/consumer.h>
+#include "synaptics_i2c_rmi4.h"
+
+/* TODO: for multiple device support will need a per-device mutex */
+#define DRIVER_NAME "synaptics_rmi4_i2c"
+
+#define MAX_ERROR_REPORT        6
+#define MAX_TOUCH_MAJOR         15
+#define MAX_RETRY_COUNT         5
+#define STD_QUERY_LEN           21
+#define PAGE_LEN                2
+#define DATA_BUF_LEN            32
+#define BUF_LEN                 37
+#define QUERY_LEN               9
+#define DATA_LEN                12
+#define HAS_TAP                 0x01
+#define HAS_PALMDETECT          0x01
+#define HAS_ROTATE              0x02
+#define HAS_TAPANDHOLD          0x02
+#define HAS_DOUBLETAP           0x04
+#define HAS_EARLYTAP            0x08
+#define HAS_RELEASE             0x08
+#define HAS_FLICK               0x10
+#define HAS_PRESS               0x20
+#define HAS_PINCH               0x40
+
+#define MASK_16BIT              0xFFFF
+#define MASK_8BIT               0xFF
+#define MASK_7BIT               0x7F
+#define MASK_5BIT               0x1F
+#define MASK_4BIT               0x0F
+#define MASK_3BIT               0x07
+#define MASK_2BIT               0x03
+#define TOUCHPAD_CTRL_INTR      0x8
+#define PDT_START_SCAN_LOCATION (0x00E9)
+#define PDT_END_SCAN_LOCATION   (0x000A)
+#define PDT_ENTRY_SIZE          (0x0006)
+#define RMI4_NUMBER_OF_MAX_FINGERS              (8)
+#define SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM        (0x11)
+#define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM  (0x01)
+
+/**
+ * struct synaptics_rmi4_fn_desc - contains the funtion descriptor information
+ * @query_base_addr: base address for query
+ * @cmd_base_addr: base address for command
+ * @ctrl_base_addr: base address for control
+ * @data_base_addr: base address for data
+ * @intr_src_count: count for the interrupt source
+ * @fn_number: function number
+ *
+ * This structure is used to gives the function descriptor information
+ * of the particular functionality.
+ */
+struct synaptics_rmi4_fn_desc {
+        unsigned char   query_base_addr;
+        unsigned char   cmd_base_addr;
+        unsigned char   ctrl_base_addr;
+        unsigned char   data_base_addr;
+        unsigned char   intr_src_count;
+        unsigned char   fn_number;
+};
+
+/**
+ * struct synaptics_rmi4_fn - contains the funtion information
+ * @fn_number: function number
+ * @num_of_data_sources: number of data sources
+ * @num_of_data_points: number of fingers touched
+ * @size_of_data_register_block: data register block size
+ * @index_to_intr_reg: index for interrupt register
+ * @intr_mask: interrupt mask value
+ * @fn_desc: variable for function descriptor structure
+ * @link: linked list for function descriptors
+ *
+ * This structure gives information about the number of data sources and
+ * the number of data registers associated with the function.
+ */
+struct synaptics_rmi4_fn {
+        unsigned char           fn_number;
+        unsigned char           num_of_data_sources;
+        unsigned char           num_of_data_points;
+        unsigned char           size_of_data_register_block;
+        unsigned char           index_to_intr_reg;
+        unsigned char           intr_mask;
+        struct synaptics_rmi4_fn_desc   fn_desc;
+        struct list_head        link;
+};
+
+/**
+ * struct synaptics_rmi4_device_info - contains the rmi4 device information
+ * @version_major: protocol major version number
+ * @version_minor: protocol minor version number
+ * @manufacturer_id: manufacturer identification byte
+ * @product_props: product properties information
+ * @product_info: product info array
+ * @date_code: device manufacture date
+ * @tester_id: tester id array
+ * @serial_number: serial number for that device
+ * @product_id_string: product id for the device
+ * @support_fn_list: linked list for device information
+ *
+ * This structure gives information about the number of data sources and
+ * the number of data registers associated with the function.
+ */
+struct synaptics_rmi4_device_info {
+        unsigned int            version_major;
+        unsigned int            version_minor;
+        unsigned char           manufacturer_id;
+        unsigned char           product_props;
+        unsigned char           product_info[2];
+        unsigned char           date_code[3];
+        unsigned short          tester_id;
+        unsigned short          serial_number;
+        unsigned char           product_id_string[11];
+        struct list_head        support_fn_list;
+};
+
+/**
+ * struct synaptics_rmi4_data - contains the rmi4 device data
+ * @rmi4_mod_info: structure variable for rmi4 device info
+ * @input_dev: pointer for input device
+ * @i2c_client: pointer for i2c client
+ * @board: constant pointer for touch platform data
+ * @fn_list_mutex: mutex for funtion list
+ * @rmi4_page_mutex: mutex for rmi4 page
+ * @current_page: variable for integer
+ * @number_of_interrupt_register: interrupt registers count
+ * @fn01_ctrl_base_addr: control base address for fn01
+ * @fn01_query_base_addr: query base address for fn01
+ * @fn01_data_base_addr: data base address for fn01
+ * @sensor_max_x: sensor maximum x value
+ * @sensor_max_y: sensor maximum y value
+ * @regulator: pointer to the regulator structure
+ * @wait: wait queue structure variable
+ * @touch_stopped: flag to stop the thread function
+ *
+ * This structure gives the device data information.
+ */
+struct synaptics_rmi4_data {
+        struct synaptics_rmi4_device_info rmi4_mod_info;
+        struct input_dev        *input_dev;
+        struct i2c_client       *i2c_client;
+        const struct synaptics_rmi4_platform_data *board;
+        struct mutex            fn_list_mutex;
+        struct mutex            rmi4_page_mutex;
+        int                     current_page;
+        unsigned int            number_of_interrupt_register;
+        unsigned short          fn01_ctrl_base_addr;
+        unsigned short          fn01_query_base_addr;
+        unsigned short          fn01_data_base_addr;
+        int                     sensor_max_x;
+        int                     sensor_max_y;
+        struct regulator        *regulator;
+        wait_queue_head_t       wait;
+        bool                    touch_stopped;
+};
+
+/**
+ * synaptics_rmi4_set_page() - sets the page
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @address: set the address of the page
+ *
+ * This function is used to set the page and returns integer.
+ */
+static int synaptics_rmi4_set_page(struct synaptics_rmi4_data *pdata,
+                                        unsigned int address)
+{
+        unsigned char   txbuf[PAGE_LEN];
+        int             retval;
+        unsigned int    page;
+        struct i2c_client *i2c = pdata->i2c_client;
+
+        page    = ((address >> 8) & MASK_8BIT);
+        if (page != pdata->current_page) {
+                txbuf[0]        = MASK_8BIT;
+                txbuf[1]        = page;
+                retval  = i2c_master_send(i2c, txbuf, PAGE_LEN);
+                if (retval != PAGE_LEN)
+                        dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval);
+                else
+                        pdata->current_page = page;
+        } else
+                retval = PAGE_LEN;
+        return retval;
+}
+/**
+ * synaptics_rmi4_i2c_block_read() - read the block of data
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @address: read the block of data from this offset
+ * @valp: pointer to a buffer containing the data to be read
+ * @size: number of bytes to read
+ *
+ * This function is to read the block of data and returns integer.
+ */
+static int synaptics_rmi4_i2c_block_read(struct synaptics_rmi4_data *pdata,
+                                                unsigned short address,
+                                                unsigned char *valp, int size)
+{
+        int retval = 0;
+        int retry_count = 0;
+        int index;
+        struct i2c_client *i2c = pdata->i2c_client;
+
+        mutex_lock(&(pdata->rmi4_page_mutex));
+        retval = synaptics_rmi4_set_page(pdata, address);
+        if (retval != PAGE_LEN)
+                goto exit;
+        index = address & MASK_8BIT;
+retry:
+        retval = i2c_smbus_read_i2c_block_data(i2c, index, size, valp);
+        if (retval != size) {
+                if (++retry_count == MAX_RETRY_COUNT)
+                        dev_err(&i2c->dev,
+                                "%s:address 0x%04x size %d failed:%d\n",
+                                        __func__, address, size, retval);
+                else {
+                        synaptics_rmi4_set_page(pdata, address);
+                        goto retry;
+                }
+        }
+exit:
+        mutex_unlock(&(pdata->rmi4_page_mutex));
+        return retval;
+}
+
+/**
+ * synaptics_rmi4_i2c_byte_write() - write the single byte data
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @address: write the block of data from this offset
+ * @data: data to be write
+ *
+ * This function is to write the single byte data and returns integer.
+ */
+static int synaptics_rmi4_i2c_byte_write(struct synaptics_rmi4_data *pdata,
+                                                unsigned short address,
+                                                unsigned char data)
+{
+        unsigned char txbuf[2];
+        int retval = 0;
+        struct i2c_client *i2c = pdata->i2c_client;
+
+        /* Can't have anyone else changing the page behind our backs */
+        mutex_lock(&(pdata->rmi4_page_mutex));
+
+        retval = synaptics_rmi4_set_page(pdata, address);
+        if (retval != PAGE_LEN)
+                goto exit;
+        txbuf[0]        = address & MASK_8BIT;
+        txbuf[1]        = data;
+        retval          = i2c_master_send(pdata->i2c_client, txbuf, 2);
+        /* Add in retry on writes only in certian error return values */
+        if (retval != 2) {
+                dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval);
+                retval = -EIO;
+        } else
+                retval = 1;
+exit:
+        mutex_unlock(&(pdata->rmi4_page_mutex));
+        return retval;
+}
+
+/**
+ * synpatics_rmi4_touchpad_report() - reports for the rmi4 touchpad device
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @rfi: pointer to synaptics_rmi4_fn structure
+ *
+ * This function calls to reports for the rmi4 touchpad device
+ */
+static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
+                                                struct synaptics_rmi4_fn *rfi)
+{
+        /* number of touch points - fingers down in this case */
+        int     touch_count = 0;
+        int     finger;
+        int     fingers_supported;
+        int     finger_registers;
+        int     reg;
+        int     finger_shift;
+        int     finger_status;
+        int     retval;
+        unsigned short  data_base_addr;
+        unsigned short  data_offset;
+        unsigned char   data_reg_blk_size;
+        unsigned char   values[2];
+        unsigned char   data[DATA_LEN];
+        int     x[RMI4_NUMBER_OF_MAX_FINGERS];
+        int     y[RMI4_NUMBER_OF_MAX_FINGERS];
+        int     wx[RMI4_NUMBER_OF_MAX_FINGERS];
+        int     wy[RMI4_NUMBER_OF_MAX_FINGERS];
+        struct  i2c_client *client = pdata->i2c_client;
+
+        /* get 2D sensor finger data */
+        /*
+         * First get the finger status field - the size of the finger status
+         * field is determined by the number of finger supporte - 2 bits per
+         * finger, so the number of registers to read is:
+         * registerCount = ceil(numberOfFingers/4).
+         * Read the required number of registers and check each 2 bit field to
+         * determine if a finger is down:
+         *      00 = finger not present,
+         *      01 = finger present and data accurate,
+         *      10 = finger present but data may not be accurate,
+         *      11 = reserved for product use.
+         */
+        fingers_supported       = rfi->num_of_data_points;
+        finger_registers        = (fingers_supported + 3)/4;
+        data_base_addr          = rfi->fn_desc.data_base_addr;
+        retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values,
+                                                        finger_registers);
+        if (retval != finger_registers) {
+                dev_err(&client->dev, "%s:read status registers failed\n",
+                                                                __func__);
+                return 0;
+        }
+        /*
+         * For each finger present, read the proper number of registers
+         * to get absolute data.
+         */
+        data_reg_blk_size = rfi->size_of_data_register_block;
+        for (finger = 0; finger < fingers_supported; finger++) {
+                /* determine which data byte the finger status is in */
+                reg = finger/4;
+                /* bit shift to get finger's status */
+                finger_shift    = (finger % 4) * 2;
+                finger_status   = (values[reg] >> finger_shift) & 3;
+                /*
+                 * if finger status indicates a finger is present then
+                 * read the finger data and report it
+                 */
+                if (finger_status == 1 || finger_status == 2) {
+                        /* Read the finger data */
+                        data_offset = data_base_addr +
+                                        ((finger * data_reg_blk_size) +
+                                        finger_registers);
+                        retval = synaptics_rmi4_i2c_block_read(pdata,
+                                                data_offset, data,
+                                                data_reg_blk_size);
+                        if (retval != data_reg_blk_size) {
+                                printk(KERN_ERR "%s:read data failed\n",
+                                                                __func__);
+                                return 0;
+                        } else {
+                                x[touch_count]  =
+                                        (data[0] << 4) | (data[2] & MASK_4BIT);
+                                y[touch_count]  =
+                                        (data[1] << 4) |
+                                        ((data[2] >> 4) & MASK_4BIT);
+                                wy[touch_count] =
+                                                (data[3] >> 4) & MASK_4BIT;
+                                wx[touch_count] =
+                                                (data[3] & MASK_4BIT);
+
+                                if (pdata->board->x_flip)
+                                        x[touch_count] =
+                                                pdata->sensor_max_x -
+                                                                x[touch_count];
+                                if (pdata->board->y_flip)
+                                        y[touch_count] =
+                                                pdata->sensor_max_y -
+                                                                y[touch_count];
+                        }
+                        /* number of active touch points */
+                        touch_count++;
+                }
+        }
+
+        /* report to input subsystem */
+        if (touch_count) {
+                for (finger = 0; finger < touch_count; finger++) {
+                        input_report_abs(pdata->input_dev, ABS_MT_TOUCH_MAJOR,
+                                                max(wx[finger] , wy[finger]));
+                        input_report_abs(pdata->input_dev, ABS_MT_POSITION_X,
+                                                                x[finger]);
+                        input_report_abs(pdata->input_dev, ABS_MT_POSITION_Y,
+                                                                y[finger]);
+                        input_mt_sync(pdata->input_dev);
+                }
+        } else
+                input_mt_sync(pdata->input_dev);
+
+        /* sync after groups of events */
+        input_sync(pdata->input_dev);
+        /* return the number of touch points */
+        return touch_count;
+}
+
+/**
+ * synaptics_rmi4_report_device() - reports the rmi4 device
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @rfi: pointer to synaptics_rmi4_fn
+ *
+ * This function is used to call the report function of the rmi4 device.
+ */
+static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata,
+                                        struct synaptics_rmi4_fn *rfi)
+{
+        int touch = 0;
+        struct  i2c_client *client = pdata->i2c_client;
+        static int num_error_reports;
+        if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
+                num_error_reports++;
+                if (num_error_reports < MAX_ERROR_REPORT)
+                        dev_err(&client->dev, "%s:report not supported\n",
+                                                                __func__);
+        } else
+                touch = synpatics_rmi4_touchpad_report(pdata, rfi);
+        return touch;
+}
+/**
+ * synaptics_rmi4_sensor_report() - reports to input subsystem
+ * @pdata: pointer to synaptics_rmi4_data structure
+ *
+ * This function is used to reads in all data sources and reports
+ * them to the input subsystem.
+ */
+static int synaptics_rmi4_sensor_report(struct synaptics_rmi4_data *pdata)
+{
+        unsigned char   intr_status[4];
+        /* number of touch points - fingers or buttons */
+        int touch = 0;
+        unsigned int retval;
+        struct synaptics_rmi4_fn                *rfi;
+        struct synaptics_rmi4_device_info       *rmi;
+        struct  i2c_client *client = pdata->i2c_client;
+
+        /*
+         * Get the interrupt status from the function $01
+         * control register+1 to find which source(s) were interrupting
+         * so we can read the data from the source(s) (2D sensor, buttons..)
+         */
+        retval = synaptics_rmi4_i2c_block_read(pdata,
+                                        pdata->fn01_data_base_addr + 1,
+                                        intr_status,
+                                        pdata->number_of_interrupt_register);
+        if (retval != pdata->number_of_interrupt_register) {
+                dev_err(&client->dev,
+                                "could not read interrupt status registers\n");
+                return 0;
+        }
+        /*
+         * check each function that has data sources and if the interrupt for
+         * that triggered then call that RMI4 functions report() function to
+         * gather data and report it to the input subsystem
+         */
+        rmi = &(pdata->rmi4_mod_info);
+        list_for_each_entry(rfi, &rmi->support_fn_list, link) {
+                if (rfi->num_of_data_sources) {
+                        if (intr_status[rfi->index_to_intr_reg] &
+                                                        rfi->intr_mask)
+                                touch = synaptics_rmi4_report_device(pdata,
+                                                                        rfi);
+                }
+        }
+        /* return the number of touch points */
+        return touch;
+}
+
+/**
+ * synaptics_rmi4_irq() - thread function for rmi4 attention line
+ * @irq: irq value
+ * @data: void pointer
+ *
+ * This function is interrupt thread function. It just notifies the
+ * application layer that attention is required.
+ */
+static irqreturn_t synaptics_rmi4_irq(int irq, void *data)
+{
+        struct synaptics_rmi4_data *pdata = data;
+        int touch_count;
+        do {
+                touch_count = synaptics_rmi4_sensor_report(pdata);
+                if (touch_count)
+                        wait_event_timeout(pdata->wait, pdata->touch_stopped,
+                                                        msecs_to_jiffies(1));
+                else
+                        break;
+        } while (!pdata->touch_stopped);
+        return IRQ_HANDLED;
+}
+
+/**
+ * synpatics_rmi4_touchpad_detect() - detects the rmi4 touchpad device
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @rfi: pointer to synaptics_rmi4_fn structure
+ * @fd: pointer to synaptics_rmi4_fn_desc structure
+ * @interruptcount: count the number of interrupts
+ *
+ * This function calls to detects the rmi4 touchpad device
+ */
+static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
+                                        struct synaptics_rmi4_fn *rfi,
+                                        struct synaptics_rmi4_fn_desc *fd,
+                                        unsigned int interruptcount)
+{
+        unsigned char   queries[QUERY_LEN];
+        unsigned short  intr_offset;
+        unsigned char   abs_data_size;
+        unsigned char   abs_data_blk_size;
+        unsigned char   egr_0, egr_1;
+        unsigned int    all_data_blk_size;
+        int     has_pinch, has_flick, has_tap;
+        int     has_tapandhold, has_doubletap;
+        int     has_earlytap, has_press;
+        int     has_palmdetect, has_rotate;
+        int     has_rel;
+        int     i;
+        int     retval;
+        struct  i2c_client *client = pdata->i2c_client;
+
+        rfi->fn_desc.query_base_addr    = fd->query_base_addr;
+        rfi->fn_desc.data_base_addr     = fd->data_base_addr;
+        rfi->fn_desc.intr_src_count     = fd->intr_src_count;
+        rfi->fn_desc.fn_number          = fd->fn_number;
+        rfi->fn_number                  = fd->fn_number;
+        rfi->num_of_data_sources        = fd->intr_src_count;
+        rfi->fn_desc.ctrl_base_addr     = fd->ctrl_base_addr;
+        rfi->fn_desc.cmd_base_addr      = fd->cmd_base_addr;
+
+        /*
+         * need to get number of fingers supported, data size, etc.
+         * to be used when getting data since the number of registers to
+         * read depends on the number of fingers supported and data size.
+         */
+        retval = synaptics_rmi4_i2c_block_read(pdata, fd->query_base_addr,
+                                                        queries,
+                                                        sizeof(queries));
+        if (retval != sizeof(queries)) {
+                dev_err(&client->dev, "%s:read function query registers\n",
+                                                        __func__);
+                return retval;
+        }
+        /*
+         * 2D data sources have only 3 bits for the number of fingers
+         * supported - so the encoding is a bit wierd.
+         */
+        if ((queries[1] & MASK_3BIT) <= 4)
+                /* add 1 since zero based */
+                rfi->num_of_data_points = (queries[1] & MASK_3BIT) + 1;
+        else {
+                /*
+                 * a value of 5 is up to 10 fingers - 6 and 7 are reserved
+                 * (shouldn't get these i int retval;n a normal 2D source).
+                 */
+                if ((queries[1] & MASK_3BIT) == 5)
+                        rfi->num_of_data_points = 10;
+        }
+        /* Need to get interrupt info for handling interrupts */
+        rfi->index_to_intr_reg = (interruptcount + 7)/8;
+        if (rfi->index_to_intr_reg != 0)
+                rfi->index_to_intr_reg -= 1;
+        /*
+         * loop through interrupts for each source in fn $11
+         * and or in a bit to the interrupt mask for each.
+         */
+        intr_offset = interruptcount % 8;
+        rfi->intr_mask = 0;
+        for (i = intr_offset;
+                i < ((fd->intr_src_count & MASK_3BIT) + intr_offset); i++)
+                rfi->intr_mask |= 1 << i;
+
+        /* Size of just the absolute data for one finger */
+        abs_data_size   = queries[5] & MASK_2BIT;
+        /* One each for X and Y, one for LSB for X & Y, one for W, one for Z */
+        abs_data_blk_size = 3 + (2 * (abs_data_size == 0 ? 1 : 0));
+        rfi->size_of_data_register_block = abs_data_blk_size;
+
+        /*
+         * need to determine the size of data to read - this depends on
+         * conditions such as whether Relative data is reported and if Gesture
+         * data is reported.
+         */
+        egr_0 = queries[7];
+        egr_1 = queries[8];
+
+        /*
+         * Get info about what EGR data is supported, whether it has
+         * Relative data supported, etc.
+         */
+        has_pinch       = egr_0 & HAS_PINCH;
+        has_flick       = egr_0 & HAS_FLICK;
+        has_tap         = egr_0 & HAS_TAP;
+        has_earlytap    = egr_0 & HAS_EARLYTAP;
+        has_press       = egr_0 & HAS_PRESS;
+        has_rotate      = egr_1 & HAS_ROTATE;
+        has_rel         = queries[1] & HAS_RELEASE;
+        has_tapandhold  = egr_0 & HAS_TAPANDHOLD;
+        has_doubletap   = egr_0 & HAS_DOUBLETAP;
+        has_palmdetect  = egr_1 & HAS_PALMDETECT;
+
+        /*
+         * Size of all data including finger status, absolute data for each
+         * finger, relative data and EGR data
+         */
+        all_data_blk_size =
+                /* finger status, four fingers per register */
+                ((rfi->num_of_data_points + 3) / 4) +
+                /* absolute data, per finger times number of fingers */
+                (abs_data_blk_size * rfi->num_of_data_points) +
+                /*
+                 * two relative registers (if relative is being reported)
+                 */
+                2 * has_rel +
+                /*
+                 * F11_2D_data8 is only present if the egr_0
+                 * register is non-zero.
+                 */
+                !!(egr_0) +
+                /*
+                 * F11_2D_data9 is only present if either egr_0 or
+                 * egr_1 registers are non-zero.
+                 */
+                (egr_0 || egr_1) +
+                /*
+                 * F11_2D_data10 is only present if EGR_PINCH or EGR_FLICK of
+                 * egr_0 reports as 1.
+                 */
+                !!(has_pinch | has_flick) +
+                /*
+                 * F11_2D_data11 and F11_2D_data12 are only present if
+                 * EGR_FLICK of egr_0 reports as 1.
+                 */
+                2 * !!(has_flick);
+        return retval;
+}
+
+/**
+ * synpatics_rmi4_touchpad_config() - confiures the rmi4 touchpad device
+ * @pdata: pointer to synaptics_rmi4_data structure
+ * @rfi: pointer to synaptics_rmi4_fn structure
+ *
+ * This function calls to confiures the rmi4 touchpad device
+ */
+int synpatics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
+                                                struct synaptics_rmi4_fn *rfi)
+{
+        /*
+         * For the data source - print info and do any
+         * source specific configuration.
+         */
+        unsigned char data[BUF_LEN];
+        int retval = 0;
+        struct  i2c_client *client = pdata->i2c_client;
+
+        /* Get and print some info about the data source... */
+        /* To Query 2D devices we need to read from the address obtained
+         * from the function descriptor stored in the RMI function info.
+         */
+        retval = synaptics_rmi4_i2c_block_read(pdata,
+                                                rfi->fn_desc.query_base_addr,
+                                                data, QUERY_LEN);
+        if (retval != QUERY_LEN)
+                dev_err(&client->dev, "%s:read query registers failed\n",
+                                                                __func__);
+        else {
+                retval = synaptics_rmi4_i2c_block_read(pdata,
+                                                rfi->fn_desc.ctrl_base_addr,
+                                                data, DATA_BUF_LEN);
+                if (retval != DATA_BUF_LEN) {
+                        dev_err(&client->dev,
+                                "%s:read control registers failed\n",
+                                                                __func__);
+                        return retval;
+                }
+                /* Store these for use later*/
+                pdata->sensor_max_x = ((data[6] & MASK_8BIT) << 0) |
+                                                ((data[7] & MASK_4BIT) << 8);
+                pdata->sensor_max_y = ((data[8] & MASK_5BIT) << 0) |
+                                                ((data[9] & MASK_4BIT) << 8);
+        }
+        return retval;
+}
+
+/**
+ * synaptics_rmi4_i2c_query_device() - query the rmi4 device
+ * @pdata: pointer to synaptics_rmi4_data structure
+ *
+ * This function is used to query the rmi4 device.
+ */
+static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
+{
+        int i;
+        int retval;
+        unsigned char std_queries[STD_QUERY_LEN];
+        unsigned char intr_count = 0;
+        int data_sources = 0;
+        unsigned int ctrl_offset;
+        struct synaptics_rmi4_fn *rfi;
+        struct synaptics_rmi4_fn_desc   rmi_fd;
+        struct synaptics_rmi4_device_info *rmi;
+        struct  i2c_client *client = pdata->i2c_client;
+
+        /*
+         * init the physical drivers RMI module
+         * info list of functions
+         */
+        INIT_LIST_HEAD(&pdata->rmi4_mod_info.support_fn_list);
+
+        /*
+         * Read the Page Descriptor Table to determine what functions
+         * are present
+         */
+        for (i = PDT_START_SCAN_LOCATION; i > PDT_END_SCAN_LOCATION;
+                                                i -= PDT_ENTRY_SIZE) {
+                retval = synaptics_rmi4_i2c_block_read(pdata, i,
+                                                (unsigned char *)&rmi_fd,
+                                                sizeof(rmi_fd));
+                if (retval != sizeof(rmi_fd)) {
+                        /* failed to read next PDT entry */
+                        dev_err(&client->dev, "%s: read error\n", __func__);
+                        return -EIO;
+                }
+                rfi = NULL;
+                if (rmi_fd.fn_number) {
+                        switch (rmi_fd.fn_number & MASK_8BIT) {
+                        case SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM:
+                                pdata->fn01_query_base_addr =
+                                                rmi_fd.query_base_addr;
+                                pdata->fn01_ctrl_base_addr =
+                                                rmi_fd.ctrl_base_addr;
+                                pdata->fn01_data_base_addr =
+                                                rmi_fd.data_base_addr;
+                                break;
+                        case SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM:
+                                if (rmi_fd.intr_src_count) {
+                                        rfi = kmalloc(sizeof(*rfi),
+                                                                GFP_KERNEL);
+                                        if (!rfi) {
+                                                dev_err(&client->dev,
+                                                        "%s:kmalloc failed\n",
+                                                                __func__);
+                                                        return -ENOMEM;
+                                        }
+                                        retval = synpatics_rmi4_touchpad_detect
+                                                                (pdata, rfi,
+                                                                &rmi_fd,
+                                                                intr_count);
+                                        if (retval < 0)
+                                                return retval;
+                                }
+                                break;
+                        }
+                        /* interrupt count for next iteration */
+                        intr_count += (rmi_fd.intr_src_count & MASK_3BIT);
+                        /*
+                         * We only want to add functions to the list
+                         * that have data associated with them.
+                         */
+                        if (rfi && rmi_fd.intr_src_count) {
+                                /* link this function info to the RMI module */
+                                mutex_lock(&(pdata->fn_list_mutex));
+                                list_add_tail(&rfi->link,
+                                        &pdata->rmi4_mod_info.support_fn_list);
+                                mutex_unlock(&(pdata->fn_list_mutex));
+                        }
+                } else {
+                        /*
+                         * A zero in the function number
+                         * signals the end of the PDT
+                         */
+                        dev_dbg(&client->dev,
+                                "%s:end of PDT\n", __func__);
+                        break;
+                }
+        }
+        /*
+         * calculate the interrupt register count - used in the
+         * ISR to read the correct number of interrupt registers
+         */
+        pdata->number_of_interrupt_register = (intr_count + 7) / 8;
+        /*
+         * Function $01 will be used to query the product properties,
+         * and product ID  so we had to read the PDT above first to get
+         * the Fn $01 query address and prior to filling in the product
+         * info. NOTE: Even an unflashed device will still have FN $01.
+         */
+
+        /* Load up the standard queries and get the RMI4 module info */
+        retval = synaptics_rmi4_i2c_block_read(pdata,
+                                        pdata->fn01_query_base_addr,
+                                        std_queries,
+                                        sizeof(std_queries));
+        if (retval != sizeof(std_queries)) {
+                dev_err(&client->dev, "%s:Failed reading queries\n",
+                                                        __func__);
+                 return -EIO;
+        }
+
+        /* Currently supported RMI version is 4.0 */
+        pdata->rmi4_mod_info.version_major      = 4;
+        pdata->rmi4_mod_info.version_minor      = 0;
+        /*
+         * get manufacturer id, product_props, product info,
+         * date code, tester id, serial num and product id (name)
+         */
+        pdata->rmi4_mod_info.manufacturer_id    = std_queries[0];
+        pdata->rmi4_mod_info.product_props      = std_queries[1];
+        pdata->rmi4_mod_info.product_info[0]    = std_queries[2];
+        pdata->rmi4_mod_info.product_info[1]    = std_queries[3];
+        /* year - 2001-2032 */
+        pdata->rmi4_mod_info.date_code[0]       = std_queries[4] & MASK_5BIT;
+        /* month - 1-12 */
+        pdata->rmi4_mod_info.date_code[1]       = std_queries[5] & MASK_4BIT;
+        /* day - 1-31 */
+        pdata->rmi4_mod_info.date_code[2]       = std_queries[6] & MASK_5BIT;
+        pdata->rmi4_mod_info.tester_id = ((std_queries[7] & MASK_7BIT) << 8) |
+                                                (std_queries[8] & MASK_7BIT);
+        pdata->rmi4_mod_info.serial_number =
+                ((std_queries[9] & MASK_7BIT) << 8) |
+                                (std_queries[10] & MASK_7BIT);
+        memcpy(pdata->rmi4_mod_info.product_id_string, &std_queries[11], 10);
+
+        /* Check if this is a Synaptics device - report if not. */
+        if (pdata->rmi4_mod_info.manufacturer_id != 1)
+                dev_err(&client->dev, "%s: non-Synaptics mfg id:%d\n",
+                        __func__, pdata->rmi4_mod_info.manufacturer_id);
+
+        list_for_each_entry(rfi, &pdata->rmi4_mod_info.support_fn_list, link)
+                data_sources += rfi->num_of_data_sources;
+        if (data_sources) {
+                rmi = &(pdata->rmi4_mod_info);
+                list_for_each_entry(rfi, &rmi->support_fn_list, link) {
+                        if (rfi->num_of_data_sources) {
+                                if (rfi->fn_number ==
+                                        SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
+                                        retval = synpatics_rmi4_touchpad_config
+                                                                (pdata, rfi);
+                                        if (retval < 0)
+                                                return retval;
+                                } else
+                                        dev_err(&client->dev,
+                                                "%s:fn_number not supported\n",
+                                                                __func__);
+                                /*
+                                 * Turn on interrupts for this
+                                 * function's data sources.
+                                 */
+                                ctrl_offset = pdata->fn01_ctrl_base_addr + 1 +
+                                                        rfi->index_to_intr_reg;
+                                retval = synaptics_rmi4_i2c_byte_write(pdata,
+                                                        ctrl_offset,
+                                                        rfi->intr_mask);
+                                if (retval < 0)
+                                        return retval;
+                        }
+                }
+        }
+        return 0;
+}
+
+/**
+ * synaptics_rmi4_probe() - Initialze the i2c-client touchscreen driver
+ * @i2c: i2c client structure pointer
+ * @id:i2c device id pointer
+ *
+ * This function will allocate and initialize the instance
+ * data and request the irq and set the instance data as the clients
+ * platform data then register the physical driver which will do a scan of
+ * the rmi4 Physical Device Table and enumerate any rmi4 functions that
+ * have data sources associated with them.
+ */
+static int __devinit synaptics_rmi4_probe
+        (struct i2c_client *client, const struct i2c_device_id *dev_id)
+{
+        int retval;
+        unsigned char intr_status[4];
+        struct synaptics_rmi4_data *rmi4_data;
+        const struct synaptics_rmi4_platform_data *platformdata =
+                                                client->dev.platform_data;
+
+        if (!i2c_check_functionality(client->adapter,
+                                        I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&client->dev, "i2c smbus byte data not supported\n");
+                return -EIO;
+        }
+
+        if (!platformdata) {
+                dev_err(&client->dev, "%s: no platform data\n", __func__);
+                return -EINVAL;
+        }
+
+        /* Allocate and initialize the instance data for this client */
+        rmi4_data = kzalloc(sizeof(struct synaptics_rmi4_data) * 2,
+                                                        GFP_KERNEL);
+        if (!rmi4_data) {
+                dev_err(&client->dev, "%s: no memory allocated\n", __func__);
+                return -ENOMEM;
+        }
+
+        rmi4_data->input_dev = input_allocate_device();
+        if (rmi4_data->input_dev == NULL) {
+                dev_err(&client->dev, "%s:input device alloc failed\n",
+                                                __func__);
+                retval = -ENOMEM;
+                goto err_input;
+        }
+
+        dev_set_name(&client->dev, platformdata->name);
+
+        if (platformdata->regulator_en) {
+                rmi4_data->regulator = regulator_get(&client->dev, "v-touch");
+                if (IS_ERR(rmi4_data->regulator)) {
+                        dev_err(&client->dev, "%s:get regulator failed\n",
+                                                                __func__);
+                        retval = PTR_ERR(rmi4_data->regulator);
+                        goto err_regulator;
+                }
+                regulator_enable(rmi4_data->regulator);
+        }
+
+        init_waitqueue_head(&rmi4_data->wait);
+        /*
+         * Copy i2c_client pointer into RTID's i2c_client pointer for
+         * later use in rmi4_read, rmi4_write, etc.
+         */
+        rmi4_data->i2c_client           = client;
+        /* So we set the page correctly the first time */
+        rmi4_data->current_page         = MASK_16BIT;
+        rmi4_data->board                = platformdata;
+        rmi4_data->touch_stopped        = false;
+
+        /* init the mutexes for maintain the lists */
+        mutex_init(&(rmi4_data->fn_list_mutex));
+        mutex_init(&(rmi4_data->rmi4_page_mutex));
+
+        /*
+         * Register physical driver - this will call the detect function that
+         * will then scan the device and determine the supported
+         * rmi4 functions.
+         */
+        retval = synaptics_rmi4_i2c_query_device(rmi4_data);
+        if (retval) {
+                dev_err(&client->dev, "%s: rmi4 query device failed\n",
+                                                        __func__);
+                goto err_query_dev;
+        }
+
+        /* Store the instance data in the i2c_client */
+        i2c_set_clientdata(client, rmi4_data);
+
+        /*initialize the input device parameters */
+        rmi4_data->input_dev->name      = DRIVER_NAME;
+        rmi4_data->input_dev->phys      = "Synaptics_Clearpad";
+        rmi4_data->input_dev->id.bustype = BUS_I2C;
+        rmi4_data->input_dev->dev.parent = &client->dev;
+        input_set_drvdata(rmi4_data->input_dev, rmi4_data);
+
+        /* Initialize the function handlers for rmi4 */
+        set_bit(EV_SYN, rmi4_data->input_dev->evbit);
+        set_bit(EV_KEY, rmi4_data->input_dev->evbit);
+        set_bit(EV_ABS, rmi4_data->input_dev->evbit);
+
+        input_set_abs_params(rmi4_data->input_dev, ABS_MT_POSITION_X, 0,
+                                        rmi4_data->sensor_max_x, 0, 0);
+        input_set_abs_params(rmi4_data->input_dev, ABS_MT_POSITION_Y, 0,
+                                        rmi4_data->sensor_max_y, 0, 0);
+        input_set_abs_params(rmi4_data->input_dev, ABS_MT_TOUCH_MAJOR, 0,
+                                                MAX_TOUCH_MAJOR, 0, 0);
+
+        retval = input_register_device(rmi4_data->input_dev);
+        if (retval) {
+                dev_err(&client->dev, "%s:input register failed\n", __func__);
+                goto err_input_register;
+        }
+
+        /* Clear interrupts */
+        synaptics_rmi4_i2c_block_read(rmi4_data,
+                        rmi4_data->fn01_data_base_addr + 1, intr_status,
+                                rmi4_data->number_of_interrupt_register);
+        retval = request_threaded_irq(platformdata->irq_number, NULL,
+                                        synaptics_rmi4_irq,
+                                        platformdata->irq_type,
+                                        platformdata->name, rmi4_data);
+        if (retval) {
+                dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
+                                __func__, platformdata->irq_number);
+                goto err_request_irq;
+        }
+
+        return retval;
+
+err_request_irq:
+        free_irq(platformdata->irq_number, rmi4_data);
+        input_unregister_device(rmi4_data->input_dev);
+err_input_register:
+        i2c_set_clientdata(client, NULL);
+err_query_dev:
+        if (platformdata->regulator_en) {
+                regulator_disable(rmi4_data->regulator);
+                regulator_put(rmi4_data->regulator);
+        }
+err_regulator:
+        input_free_device(rmi4_data->input_dev);
+        rmi4_data->input_dev = NULL;
+err_input:
+        kfree(rmi4_data);
+
+        return retval;
+}
+/**
+ * synaptics_rmi4_remove() - Removes the i2c-client touchscreen driver
+ * @client: i2c client structure pointer
+ *
+ * This funtion uses to remove the i2c-client
+ * touchscreen driver and returns integer.
+ */
+static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
+{
+        struct synaptics_rmi4_data *rmi4_data = i2c_get_clientdata(client);
+        const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
+
+        rmi4_data->touch_stopped = true;
+        wake_up(&rmi4_data->wait);
+        free_irq(pdata->irq_number, rmi4_data);
+        input_unregister_device(rmi4_data->input_dev);
+        if (pdata->regulator_en) {
+                regulator_disable(rmi4_data->regulator);
+                regulator_put(rmi4_data->regulator);
+        }
+        kfree(rmi4_data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+/**
+ * synaptics_rmi4_suspend() - suspend the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This funtion is used to suspend the
+ * touch panel controller and returns integer
+ */
+static int synaptics_rmi4_suspend(struct device *dev)
+{
+        /* Touch sleep mode */
+        int retval;
+        unsigned char intr_status;
+        struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);
+        const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
+
+        rmi4_data->touch_stopped = true;
+        disable_irq(pdata->irq_number);
+
+        retval = synaptics_rmi4_i2c_block_read(rmi4_data,
+                                rmi4_data->fn01_data_base_addr + 1,
+                                &intr_status,
+                                rmi4_data->number_of_interrupt_register);
+        if (retval < 0)
+                return retval;
+
+        retval = synaptics_rmi4_i2c_byte_write(rmi4_data,
+                                        rmi4_data->fn01_ctrl_base_addr + 1,
+                                        (intr_status & ~TOUCHPAD_CTRL_INTR));
+        if (retval < 0)
+                return retval;
+
+        if (pdata->regulator_en)
+                regulator_disable(rmi4_data->regulator);
+
+        return 0;
+}
+/**
+ * synaptics_rmi4_resume() - resume the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This funtion is used to resume the touch panel
+ * controller and returns integer.
+ */
+static int synaptics_rmi4_resume(struct device *dev)
+{
+        int retval;
+        unsigned char intr_status;
+        struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);
+        const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
+
+        if (pdata->regulator_en)
+                regulator_enable(rmi4_data->regulator);
+
+        enable_irq(pdata->irq_number);
+        rmi4_data->touch_stopped = false;
+
+        retval = synaptics_rmi4_i2c_block_read(rmi4_data,
+                                rmi4_data->fn01_data_base_addr + 1,
+                                &intr_status,
+                                rmi4_data->number_of_interrupt_register);
+        if (retval < 0)
+                return retval;
+
+        retval = synaptics_rmi4_i2c_byte_write(rmi4_data,
+                                        rmi4_data->fn01_ctrl_base_addr + 1,
+                                        (intr_status | TOUCHPAD_CTRL_INTR));
+        if (retval < 0)
+                return retval;
+
+        return 0;
+}
+
+static const struct dev_pm_ops synaptics_rmi4_dev_pm_ops = {
+        .suspend = synaptics_rmi4_suspend,
+        .resume  = synaptics_rmi4_resume,
+};
+#endif
+
+static const struct i2c_device_id synaptics_rmi4_id_table[] = {
+        { DRIVER_NAME, 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(i2c, synaptics_rmi4_id_table);
+
+static struct i2c_driver synaptics_rmi4_driver = {
+        .driver = {
+                .name   =       DRIVER_NAME,
+                .owner  =       THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     =       &synaptics_rmi4_dev_pm_ops,
+#endif
+        },
+        .probe          =       synaptics_rmi4_probe,
+        .remove         =       __devexit_p(synaptics_rmi4_remove),
+        .id_table       =       synaptics_rmi4_id_table,
+};
+/**
+ * synaptics_rmi4_init() - Initialize the touchscreen driver
+ *
+ * This funtion uses to initializes the synaptics
+ * touchscreen driver and returns integer.
+ */
+static int __init synaptics_rmi4_init(void)
+{
+        return i2c_add_driver(&synaptics_rmi4_driver);
+}
+/**
+ * synaptics_rmi4_exit() - De-initialize the touchscreen driver
+ *
+ * This funtion uses to de-initialize the synaptics
+ * touchscreen driver and returns none.
+ */
+static void __exit synaptics_rmi4_exit(void)
+{
+        i2c_del_driver(&synaptics_rmi4_driver);
+}
+
+
+module_init(synaptics_rmi4_init);
+module_exit(synaptics_rmi4_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("naveen.gaddipati@stericsson.com, js.ha@stericsson.com");
+MODULE_DESCRIPTION("synaptics rmi4 i2c touch Driver");
+MODULE_ALIAS("i2c:synaptics_rmi4_ts");
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
new file mode 100644
index 000000000000..820ae275fa2b
--- /dev/null
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
@@ -0,0 +1,50 @@
+/**
+ *
+ * Synaptics Register Mapped Interface (RMI4) I2C Physical Layer Driver.
+ * Copyright (c) 2007-2010, Synaptics Incorporated
+ *
+ * Author: Js HA <js.ha@stericsson.com> for ST-Ericsson
+ * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson
+ * Copyright 2010 (c) ST-Ericsson AB
+ */
+/*
+ * This file is licensed under the GPL2 license.
+ *
+ *#############################################################################
+ * GPL
+ *
+ * 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.
+ *
+ *#############################################################################
+ */
+
+#ifndef _SYNAPTICS_RMI4_H_INCLUDED_
+#define _SYNAPTICS_RMI4_H_INCLUDED_
+
+/**
+ * struct synaptics_rmi4_platform_data - contains the rmi4 platform data
+ * @irq_number: irq number
+ * @irq_type: irq type
+ * @x flip: x flip flag
+ * @y flip: y flip flag
+ * @regulator_en: regulator enable flag
+ *
+ * This structure gives platform data for rmi4.
+ */
+struct synaptics_rmi4_platform_data {
+        const char *name;
+        int irq_number;
+        int irq_type;
+        bool x_flip;
+        bool y_flip;
+        bool regulator_en;
+};
+
+#endif
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 1be081f917a7..a3b0a183d570 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -596,7 +596,7 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
                 dev_dbg(bridge, "DSP c_int00 Address =  0x%x\n", dsp_addr);
                 if (dsp_debug)
                         while (__raw_readw(dw_sync_addr))
-                                ;;
+                                ;
 
                 /* Wait for DSP to clear word in shared memory */
                 /* Read the Location */
@@ -1671,7 +1671,7 @@ static int pte_set(struct pg_table_attrs *pt, u32 pa, u32 va,
                         /* Find a free L2 PT. */
                         for (i = 0; (i < pt->l2_num_pages) &&
                              (pt->pg_info[i].num_entries != 0); i++)
-                                ;;
+                                ;
                         if (i < pt->l2_num_pages) {
                                 l2_page_num = i;
                                 l2_base_pa = pt->l2_base_pa + (l2_page_num *
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index a6ae007015d0..28354bbf1aeb 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -943,7 +943,7 @@ static int add_ovly_info(void *handle, struct dbll_sect_info *sect_info,
 
         /* Determine which phase this section belongs to */
         for (pch = sect_name + 1; *pch && *pch != seps; pch++)
-                ;;
+                ;
 
         if (*pch) {
                 pch++;          /* Skip over the ':' */
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 832608d3e579..08bd26a245d5 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -799,20 +799,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 spin_unlock_irqrestore(&vdev->priv_lock, flags2);
         }
 
-
-        if (!vdev->ud.tcp_socket) {
-                /* tcp connection is closed */
-                usbip_uinfo("vhci_hcd: vhci_urb_dequeue() gives back urb %p\n",
-                                                                        urb);
-
-                usb_hcd_unlink_urb_from_ep(hcd, urb);
-
-                spin_unlock_irqrestore(&the_controller->lock, flags);
-                usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb,
-                                                                urb->status);
-                spin_lock_irqsave(&the_controller->lock, flags);
-        }
-
         spin_unlock_irqrestore(&the_controller->lock, flags);
 
         usbip_dbg_vhci_hc("leave\n");
diff --git a/drivers/staging/vme/bridges/Module.symvers b/drivers/staging/vme/bridges/Module.symvers
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/drivers/staging/vme/bridges/Module.symvers
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 4d745623211b..42de83e6f1d9 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -44,7 +44,7 @@ static int geoid;
 
 static char driver_name[] = "vme_ca91cx42";
 
-static const struct pci_device_id ca91cx42_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(ca91cx42_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_CA91C142) },
         { },
 };
@@ -58,7 +58,7 @@ static struct pci_driver ca91cx42_driver = {
 
 static u32 ca91cx42_DMA_irqhandler(struct ca91cx42_driver *bridge)
 {
-        wake_up(&(bridge->dma_queue));
+        wake_up(&bridge->dma_queue);
 
         return CA91CX42_LINT_DMA;
 }
@@ -82,14 +82,14 @@ static u32 ca91cx42_LM_irqhandler(struct ca91cx42_driver *bridge, u32 stat)
 /* XXX This needs to be split into 4 queues */
 static u32 ca91cx42_MB_irqhandler(struct ca91cx42_driver *bridge, int mbox_mask)
 {
-        wake_up(&(bridge->mbox_queue));
+        wake_up(&bridge->mbox_queue);
 
         return CA91CX42_LINT_MBOX;
 }
 
 static u32 ca91cx42_IACK_irqhandler(struct ca91cx42_driver *bridge)
 {
-        wake_up(&(bridge->iack_queue));
+        wake_up(&bridge->iack_queue);
 
         return CA91CX42_LINT_SW_IACK;
 }
@@ -207,9 +207,9 @@ static int ca91cx42_irq_init(struct vme_bridge *ca91cx42_bridge)
         pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev);
 
         /* Initialise list for VME bus errors */
-        INIT_LIST_HEAD(&(ca91cx42_bridge->vme_errors));
+        INIT_LIST_HEAD(&ca91cx42_bridge->vme_errors);
 
-        mutex_init(&(ca91cx42_bridge->irq_mtx));
+        mutex_init(&ca91cx42_bridge->irq_mtx);
 
         /* Disable interrupts from PCI to VME */
         iowrite32(0, bridge->base + VINT_EN);
@@ -259,8 +259,8 @@ static void ca91cx42_irq_exit(struct ca91cx42_driver *bridge,
 /*
  * Set up an VME interrupt
  */
-void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, int state,
-        int sync)
+static void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level,
+        int state, int sync)
 
 {
         struct pci_dev *pdev;
@@ -287,7 +287,7 @@ void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, int state,
         }
 }
 
-int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
+static int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
         int statid)
 {
         u32 tmp;
@@ -299,7 +299,7 @@ int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
         if (statid & 1)
                 return -EINVAL;
 
-        mutex_lock(&(bridge->vme_int));
+        mutex_lock(&bridge->vme_int);
 
         tmp = ioread32(bridge->base + VINT_EN);
 
@@ -318,12 +318,12 @@ int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
         tmp = tmp & ~(1 << (level + 24));
         iowrite32(tmp, bridge->base + VINT_EN);
 
-        mutex_unlock(&(bridge->vme_int));
+        mutex_unlock(&bridge->vme_int);
 
         return 0;
 }
 
-int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
+static int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
         dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle)
 {
@@ -429,7 +429,7 @@ int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
         return 0;
 }
 
-int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled,
+static int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
         dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle)
 {
@@ -518,8 +518,8 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
                 image->kern_base = NULL;
                 if (image->bus_resource.name != NULL)
                         kfree(image->bus_resource.name);
-                release_resource(&(image->bus_resource));
-                memset(&(image->bus_resource), 0, sizeof(struct resource));
+                release_resource(&image->bus_resource);
+                memset(&image->bus_resource, 0, sizeof(struct resource));
         }
 
         if (image->bus_resource.name == NULL) {
@@ -540,7 +540,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
         image->bus_resource.flags = IORESOURCE_MEM;
 
         retval = pci_bus_alloc_resource(pdev->bus,
-                &(image->bus_resource), size, size, PCIBIOS_MIN_MEM,
+                &image->bus_resource, size, size, PCIBIOS_MIN_MEM,
                 0, NULL, NULL);
         if (retval) {
                 dev_err(ca91cx42_bridge->parent, "Failed to allocate mem "
@@ -563,10 +563,10 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
         iounmap(image->kern_base);
         image->kern_base = NULL;
 err_remap:
-        release_resource(&(image->bus_resource));
+        release_resource(&image->bus_resource);
 err_resource:
         kfree(image->bus_resource.name);
-        memset(&(image->bus_resource), 0, sizeof(struct resource));
+        memset(&image->bus_resource, 0, sizeof(struct resource));
 err_name:
         return retval;
 }
@@ -578,13 +578,13 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
 {
         iounmap(image->kern_base);
         image->kern_base = NULL;
-        release_resource(&(image->bus_resource));
+        release_resource(&image->bus_resource);
         kfree(image->bus_resource.name);
-        memset(&(image->bus_resource), 0, sizeof(struct resource));
+        memset(&image->bus_resource, 0, sizeof(struct resource));
 }
 
 
-int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
+static int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
         vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
 {
@@ -620,7 +620,7 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
                 goto err_window;
         }
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         /*
          * Let's allocate the resource here rather than further up the stack as
@@ -628,7 +628,7 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
          */
         retval = ca91cx42_alloc_resource(image, size);
         if (retval) {
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(ca91cx42_bridge->parent, "Unable to allocate memory "
                         "for resource name\n");
                 retval = -ENOMEM;
@@ -672,7 +672,7 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
                 temp_ctl |= CA91CX42_LSI_CTL_VDW_D64;
                 break;
         default:
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(ca91cx42_bridge->parent, "Invalid data width\n");
                 retval = -EINVAL;
                 goto err_dwidth;
@@ -704,7 +704,7 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
         case VME_USER3:
         case VME_USER4:
         default:
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(ca91cx42_bridge->parent, "Invalid address space\n");
                 retval = -EINVAL;
                 goto err_aspace;
@@ -730,7 +730,7 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
 
         iowrite32(temp_ctl, bridge->base + CA91CX42_LSI_CTL[i]);
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
         return 0;
 
 err_aspace:
@@ -741,8 +741,8 @@ err_window:
         return retval;
 }
 
-int __ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
-        unsigned long long *vme_base, unsigned long long *size,
+static int __ca91cx42_master_get(struct vme_master_resource *image,
+        int *enabled, unsigned long long *vme_base, unsigned long long *size,
         vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
 {
         unsigned int i, ctl;
@@ -828,24 +828,24 @@ int __ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
         return 0;
 }
 
-int ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
+static int ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
         vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
 {
         int retval;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         retval = __ca91cx42_master_get(image, enabled, vme_base, size, aspace,
                 cycle, dwidth);
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
         return retval;
 }
 
-ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf,
-        size_t count, loff_t offset)
+static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
+        void *buf, size_t count, loff_t offset)
 {
         ssize_t retval;
         void *addr = image->kern_base + offset;
@@ -855,7 +855,7 @@ ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf,
         if (count == 0)
                 return 0;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         /* The following code handles VME address alignment problem
          * in order to assure the maximal data width cycle.
@@ -899,13 +899,13 @@ ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf,
         }
 out:
         retval = count;
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
         return retval;
 }
 
-ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf,
-        size_t count, loff_t offset)
+static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
+        void *buf, size_t count, loff_t offset)
 {
         ssize_t retval;
         void *addr = image->kern_base + offset;
@@ -915,7 +915,7 @@ ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf,
         if (count == 0)
                 return 0;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         /* Here we apply for the same strategy we do in master_read
          * function in order to assure D16 cycle when required.
@@ -954,11 +954,12 @@ ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf,
 out:
         retval = count;
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
+
         return retval;
 }
 
-unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
+static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
         unsigned int mask, unsigned int compare, unsigned int swap,
         loff_t offset)
 {
@@ -974,10 +975,10 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
         i = image->number;
 
         /* Locking as we can only do one of these at a time */
-        mutex_lock(&(bridge->vme_rmw));
+        mutex_lock(&bridge->vme_rmw);
 
         /* Lock image */
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         pci_addr = (u32)image->kern_base + offset;
 
@@ -1007,15 +1008,15 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
         iowrite32(0, bridge->base + SCYC_CTL);
 
 out:
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
-        mutex_unlock(&(bridge->vme_rmw));
+        mutex_unlock(&bridge->vme_rmw);
 
         return result;
 }
 
-int ca91cx42_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
-        struct vme_dma_attr *dest, size_t count)
+static int ca91cx42_dma_list_add(struct vme_dma_list *list,
+        struct vme_dma_attr *src, struct vme_dma_attr *dest, size_t count)
 {
         struct ca91cx42_dma_entry *entry, *prev;
         struct vme_dma_pci *pci_attr;
@@ -1036,14 +1037,14 @@ int ca91cx42_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
         }
 
         /* Test descriptor alignment */
-        if ((unsigned long)&(entry->descriptor) & CA91CX42_DCPP_M) {
+        if ((unsigned long)&entry->descriptor & CA91CX42_DCPP_M) {
                 dev_err(dev, "Descriptor not aligned to 16 byte boundary as "
-                        "required: %p\n", &(entry->descriptor));
+                        "required: %p\n", &entry->descriptor);
                 retval = -EINVAL;
                 goto err_align;
         }
 
-        memset(&(entry->descriptor), 0, sizeof(struct ca91cx42_dma_descriptor));
+        memset(&entry->descriptor, 0, sizeof(struct ca91cx42_dma_descriptor));
 
         if (dest->type == VME_DMA_VME) {
                 entry->descriptor.dctl |= CA91CX42_DCTL_L2V;
@@ -1138,14 +1139,14 @@ int ca91cx42_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
         entry->descriptor.dcpp = CA91CX42_DCPP_NULL;
 
         /* Add to list */
-        list_add_tail(&(entry->list), &(list->entries));
+        list_add_tail(&entry->list, &list->entries);
 
         /* Fill out previous descriptors "Next Address" */
-        if (entry->list.prev != &(list->entries)) {
+        if (entry->list.prev != &list->entries) {
                 prev = list_entry(entry->list.prev, struct ca91cx42_dma_entry,
                         list);
                 /* We need the bus address for the pointer */
-                desc_ptr = virt_to_bus(&(entry->descriptor));
+                desc_ptr = virt_to_bus(&entry->descriptor);
                 prev->descriptor.dcpp = desc_ptr & ~CA91CX42_DCPP_M;
         }
 
@@ -1175,7 +1176,7 @@ static int ca91cx42_dma_busy(struct vme_bridge *ca91cx42_bridge)
                 return 1;
 }
 
-int ca91cx42_dma_list_exec(struct vme_dma_list *list)
+static int ca91cx42_dma_list_exec(struct vme_dma_list *list)
 {
         struct vme_dma_resource *ctrlr;
         struct ca91cx42_dma_entry *entry;
@@ -1190,28 +1191,28 @@ int ca91cx42_dma_list_exec(struct vme_dma_list *list)
         bridge = ctrlr->parent->driver_priv;
         dev = ctrlr->parent->parent;
 
-        mutex_lock(&(ctrlr->mtx));
+        mutex_lock(&ctrlr->mtx);
 
-        if (!(list_empty(&(ctrlr->running)))) {
+        if (!(list_empty(&ctrlr->running))) {
                 /*
                  * XXX We have an active DMA transfer and currently haven't
                  *     sorted out the mechanism for "pending" DMA transfers.
                  *     Return busy.
                  */
                 /* Need to add to pending here */
-                mutex_unlock(&(ctrlr->mtx));
+                mutex_unlock(&ctrlr->mtx);
                 return -EBUSY;
         } else {
-                list_add(&(list->list), &(ctrlr->running));
+                list_add(&list->list, &ctrlr->running);
         }
 
         /* Get first bus address and write into registers */
-        entry = list_first_entry(&(list->entries), struct ca91cx42_dma_entry,
+        entry = list_first_entry(&list->entries, struct ca91cx42_dma_entry,
                 list);
 
-        bus_addr = virt_to_bus(&(entry->descriptor));
+        bus_addr = virt_to_bus(&entry->descriptor);
 
-        mutex_unlock(&(ctrlr->mtx));
+        mutex_unlock(&ctrlr->mtx);
 
         iowrite32(0, bridge->base + DTBC);
         iowrite32(bus_addr & ~CA91CX42_DCPP_M, bridge->base + DCPP);
@@ -1249,21 +1250,21 @@ int ca91cx42_dma_list_exec(struct vme_dma_list *list)
         }
 
         /* Remove list from running list */
-        mutex_lock(&(ctrlr->mtx));
-        list_del(&(list->list));
-        mutex_unlock(&(ctrlr->mtx));
+        mutex_lock(&ctrlr->mtx);
+        list_del(&list->list);
+        mutex_unlock(&ctrlr->mtx);
 
         return retval;
 
 }
 
-int ca91cx42_dma_list_empty(struct vme_dma_list *list)
+static int ca91cx42_dma_list_empty(struct vme_dma_list *list)
 {
         struct list_head *pos, *temp;
         struct ca91cx42_dma_entry *entry;
 
         /* detach and free each entry */
-        list_for_each_safe(pos, temp, &(list->entries)) {
+        list_for_each_safe(pos, temp, &list->entries) {
                 list_del(pos);
                 entry = list_entry(pos, struct ca91cx42_dma_entry, list);
                 kfree(entry);
@@ -1279,8 +1280,8 @@ int ca91cx42_dma_list_empty(struct vme_dma_list *list)
  * This does not enable the LM monitor - that should be done when the first
  * callback is attached and disabled when the last callback is removed.
  */
-int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
-        vme_address_t aspace, vme_cycle_t cycle)
+static int ca91cx42_lm_set(struct vme_lm_resource *lm,
+        unsigned long long lm_base, vme_address_t aspace, vme_cycle_t cycle)
 {
         u32 temp_base, lm_ctl = 0;
         int i;
@@ -1298,12 +1299,12 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
                 return -EINVAL;
         }
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* If we already have a callback attached, we can't move it! */
         for (i = 0; i < lm->monitors; i++) {
                 if (bridge->lm_callback[i] != NULL) {
-                        mutex_unlock(&(lm->mtx));
+                        mutex_unlock(&lm->mtx);
                         dev_err(dev, "Location monitor callback attached, "
                                 "can't reset\n");
                         return -EBUSY;
@@ -1321,7 +1322,7 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
                 lm_ctl |= CA91CX42_LM_CTL_AS_A32;
                 break;
         default:
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(dev, "Invalid address space\n");
                 return -EINVAL;
                 break;
@@ -1339,7 +1340,7 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
         iowrite32(lm_base, bridge->base + LM_BS);
         iowrite32(lm_ctl, bridge->base + LM_CTL);
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
@@ -1347,15 +1348,15 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
 /* Get configuration of the callback monitor and return whether it is enabled
  * or disabled.
  */
-int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
-        vme_address_t *aspace, vme_cycle_t *cycle)
+static int ca91cx42_lm_get(struct vme_lm_resource *lm,
+        unsigned long long *lm_base, vme_address_t *aspace, vme_cycle_t *cycle)
 {
         u32 lm_ctl, enabled = 0;
         struct ca91cx42_driver *bridge;
 
         bridge = lm->parent->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         *lm_base = (unsigned long long)ioread32(bridge->base + LM_BS);
         lm_ctl = ioread32(bridge->base + LM_CTL);
@@ -1380,7 +1381,7 @@ int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
         if (lm_ctl & CA91CX42_LM_CTL_DATA)
                 *cycle |= VME_DATA;
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return enabled;
 }
@@ -1390,7 +1391,7 @@ int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
  *
  * Callback will be passed the monitor triggered.
  */
-int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
+static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
         void (*callback)(int))
 {
         u32 lm_ctl, tmp;
@@ -1400,19 +1401,19 @@ int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
         bridge = lm->parent->driver_priv;
         dev = lm->parent->parent;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* Ensure that the location monitor is configured - need PGM or DATA */
         lm_ctl = ioread32(bridge->base + LM_CTL);
         if ((lm_ctl & (CA91CX42_LM_CTL_PGM | CA91CX42_LM_CTL_DATA)) == 0) {
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(dev, "Location monitor not properly configured\n");
                 return -EINVAL;
         }
 
         /* Check that a callback isn't already attached */
         if (bridge->lm_callback[monitor] != NULL) {
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(dev, "Existing callback attached\n");
                 return -EBUSY;
         }
@@ -1431,7 +1432,7 @@ int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
                 iowrite32(lm_ctl, bridge->base + LM_CTL);
         }
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
@@ -1439,14 +1440,14 @@ int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
 /*
  * Detach a callback function forn a specific location monitor.
  */
-int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor)
+static int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor)
 {
         u32 tmp;
         struct ca91cx42_driver *bridge;
 
         bridge = lm->parent->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* Disable Location Monitor and ensure previous interrupts are clear */
         tmp = ioread32(bridge->base + LINT_EN);
@@ -1467,12 +1468,12 @@ int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor)
                 iowrite32(tmp, bridge->base + LM_CTL);
         }
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
 
-int ca91cx42_slot_get(struct vme_bridge *ca91cx42_bridge)
+static int ca91cx42_slot_get(struct vme_bridge *ca91cx42_bridge)
 {
         u32 slot = 0;
         struct ca91cx42_driver *bridge;
@@ -1526,7 +1527,7 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
 
         /* Allocate mem for CR/CSR image */
         bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
-                &(bridge->crcsr_bus));
+                &bridge->crcsr_bus);
         if (bridge->crcsr_kernel == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
                         "image\n");
@@ -1632,12 +1633,12 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* Initialize wait queues & mutual exclusion flags */
-        init_waitqueue_head(&(ca91cx42_device->dma_queue));
-        init_waitqueue_head(&(ca91cx42_device->iack_queue));
-        mutex_init(&(ca91cx42_device->vme_int));
-        mutex_init(&(ca91cx42_device->vme_rmw));
+        init_waitqueue_head(&ca91cx42_device->dma_queue);
+        init_waitqueue_head(&ca91cx42_device->iack_queue);
+        mutex_init(&ca91cx42_device->vme_int);
+        mutex_init(&ca91cx42_device->vme_rmw);
 
-        ca91cx42_bridge->parent = &(pdev->dev);
+        ca91cx42_bridge->parent = &pdev->dev;
         strcpy(ca91cx42_bridge->name, driver_name);
 
         /* Setup IRQ */
@@ -1648,7 +1649,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* Add master windows to list */
-        INIT_LIST_HEAD(&(ca91cx42_bridge->master_resources));
+        INIT_LIST_HEAD(&ca91cx42_bridge->master_resources);
         for (i = 0; i < CA91C142_MAX_MASTER; i++) {
                 master_image = kmalloc(sizeof(struct vme_master_resource),
                         GFP_KERNEL);
@@ -1659,7 +1660,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_master;
                 }
                 master_image->parent = ca91cx42_bridge;
-                spin_lock_init(&(master_image->lock));
+                spin_lock_init(&master_image->lock);
                 master_image->locked = 0;
                 master_image->number = i;
                 master_image->address_attr = VME_A16 | VME_A24 | VME_A32 |
@@ -1667,15 +1668,15 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 master_image->cycle_attr = VME_SCT | VME_BLT | VME_MBLT |
                         VME_SUPER | VME_USER | VME_PROG | VME_DATA;
                 master_image->width_attr = VME_D8 | VME_D16 | VME_D32 | VME_D64;
-                memset(&(master_image->bus_resource), 0,
+                memset(&master_image->bus_resource, 0,
                         sizeof(struct resource));
                 master_image->kern_base  = NULL;
-                list_add_tail(&(master_image->list),
-                        &(ca91cx42_bridge->master_resources));
+                list_add_tail(&master_image->list,
+                        &ca91cx42_bridge->master_resources);
         }
 
         /* Add slave windows to list */
-        INIT_LIST_HEAD(&(ca91cx42_bridge->slave_resources));
+        INIT_LIST_HEAD(&ca91cx42_bridge->slave_resources);
         for (i = 0; i < CA91C142_MAX_SLAVE; i++) {
                 slave_image = kmalloc(sizeof(struct vme_slave_resource),
                         GFP_KERNEL);
@@ -1686,7 +1687,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_slave;
                 }
                 slave_image->parent = ca91cx42_bridge;
-                mutex_init(&(slave_image->mtx));
+                mutex_init(&slave_image->mtx);
                 slave_image->locked = 0;
                 slave_image->number = i;
                 slave_image->address_attr = VME_A24 | VME_A32 | VME_USER1 |
@@ -1698,12 +1699,12 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
                 slave_image->cycle_attr = VME_SCT | VME_BLT | VME_MBLT |
                         VME_SUPER | VME_USER | VME_PROG | VME_DATA;
-                list_add_tail(&(slave_image->list),
-                        &(ca91cx42_bridge->slave_resources));
+                list_add_tail(&slave_image->list,
+                        &ca91cx42_bridge->slave_resources);
         }
 
         /* Add dma engines to list */
-        INIT_LIST_HEAD(&(ca91cx42_bridge->dma_resources));
+        INIT_LIST_HEAD(&ca91cx42_bridge->dma_resources);
         for (i = 0; i < CA91C142_MAX_DMA; i++) {
                 dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource),
                         GFP_KERNEL);
@@ -1714,19 +1715,19 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_dma;
                 }
                 dma_ctrlr->parent = ca91cx42_bridge;
-                mutex_init(&(dma_ctrlr->mtx));
+                mutex_init(&dma_ctrlr->mtx);
                 dma_ctrlr->locked = 0;
                 dma_ctrlr->number = i;
                 dma_ctrlr->route_attr = VME_DMA_VME_TO_MEM |
                         VME_DMA_MEM_TO_VME;
-                INIT_LIST_HEAD(&(dma_ctrlr->pending));
-                INIT_LIST_HEAD(&(dma_ctrlr->running));
-                list_add_tail(&(dma_ctrlr->list),
-                        &(ca91cx42_bridge->dma_resources));
+                INIT_LIST_HEAD(&dma_ctrlr->pending);
+                INIT_LIST_HEAD(&dma_ctrlr->running);
+                list_add_tail(&dma_ctrlr->list,
+                        &ca91cx42_bridge->dma_resources);
         }
 
         /* Add location monitor to list */
-        INIT_LIST_HEAD(&(ca91cx42_bridge->lm_resources));
+        INIT_LIST_HEAD(&ca91cx42_bridge->lm_resources);
         lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL);
         if (lm == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate memory for "
@@ -1735,11 +1736,11 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto err_lm;
         }
         lm->parent = ca91cx42_bridge;
-        mutex_init(&(lm->mtx));
+        mutex_init(&lm->mtx);
         lm->locked = 0;
         lm->number = 1;
         lm->monitors = 4;
-        list_add_tail(&(lm->list), &(ca91cx42_bridge->lm_resources));
+        list_add_tail(&lm->list, &ca91cx42_bridge->lm_resources);
 
         ca91cx42_bridge->slave_get = ca91cx42_slave_get;
         ca91cx42_bridge->slave_set = ca91cx42_slave_set;
@@ -1786,28 +1787,28 @@ err_reg:
         ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
 err_lm:
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->lm_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->lm_resources) {
                 lm = list_entry(pos, struct vme_lm_resource, list);
                 list_del(pos);
                 kfree(lm);
         }
 err_dma:
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->dma_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->dma_resources) {
                 dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
                 list_del(pos);
                 kfree(dma_ctrlr);
         }
 err_slave:
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->slave_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->slave_resources) {
                 slave_image = list_entry(pos, struct vme_slave_resource, list);
                 list_del(pos);
                 kfree(slave_image);
         }
 err_master:
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->master_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->master_resources) {
                 master_image = list_entry(pos, struct vme_master_resource,
                         list);
                 list_del(pos);
@@ -1831,7 +1832,7 @@ err_struct:
 
 }
 
-void ca91cx42_remove(struct pci_dev *pdev)
+static void ca91cx42_remove(struct pci_dev *pdev)
 {
         struct list_head *pos = NULL;
         struct vme_master_resource *master_image;
@@ -1870,28 +1871,28 @@ void ca91cx42_remove(struct pci_dev *pdev)
         ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
 
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->lm_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->lm_resources) {
                 lm = list_entry(pos, struct vme_lm_resource, list);
                 list_del(pos);
                 kfree(lm);
         }
 
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->dma_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->dma_resources) {
                 dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
                 list_del(pos);
                 kfree(dma_ctrlr);
         }
 
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->slave_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->slave_resources) {
                 slave_image = list_entry(pos, struct vme_slave_resource, list);
                 list_del(pos);
                 kfree(slave_image);
         }
 
         /* resources are stored in link list */
-        list_for_each(pos, &(ca91cx42_bridge->master_resources)) {
+        list_for_each(pos, &ca91cx42_bridge->master_resources) {
                 master_image = list_entry(pos, struct vme_master_resource,
                         list);
                 list_del(pos);
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.h b/drivers/staging/vme/bridges/vme_ca91cx42.h
index e72c65b193ec..02a7c794db05 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.h
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.h
@@ -39,7 +39,7 @@
 
 /* Structure used to hold driver specific information */
 struct ca91cx42_driver {
-        void *base;     /* Base Address of device registers */
+        void __iomem *base;     /* Base Address of device registers */
         wait_queue_head_t dma_queue;
         wait_queue_head_t iack_queue;
         wait_queue_head_t mbox_queue;
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 492ddb2d5108..26ea42fa784d 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -46,7 +46,7 @@ static int geoid;
 
 static char driver_name[] = "vme_tsi148";
 
-static const struct pci_device_id tsi148_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(tsi148_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_TSI148) },
         { },
 };
@@ -81,11 +81,11 @@ static u32 tsi148_DMA_irqhandler(struct tsi148_driver *bridge,
         u32 serviced = 0;
 
         if (channel_mask & TSI148_LCSR_INTS_DMA0S) {
-                wake_up(&(bridge->dma_queue[0]));
+                wake_up(&bridge->dma_queue[0]);
                 serviced |= TSI148_LCSR_INTC_DMA0C;
         }
         if (channel_mask & TSI148_LCSR_INTS_DMA1S) {
-                wake_up(&(bridge->dma_queue[1]));
+                wake_up(&bridge->dma_queue[1]);
                 serviced |= TSI148_LCSR_INTC_DMA1C;
         }
 
@@ -191,7 +191,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)
         if (error) {
                 error->address = error_addr;
                 error->attributes = error_attrib;
-                list_add_tail(&(error->list), &(tsi148_bridge->vme_errors));
+                list_add_tail(&error->list, &tsi148_bridge->vme_errors);
         } else {
                 dev_err(tsi148_bridge->parent, "Unable to alloc memory for "
                         "VMEbus Error reporting\n");
@@ -210,7 +210,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)
  */
 static u32 tsi148_IACK_irqhandler(struct tsi148_driver *bridge)
 {
-        wake_up(&(bridge->iack_queue));
+        wake_up(&bridge->iack_queue);
 
         return TSI148_LCSR_INTC_IACKC;
 }
@@ -320,9 +320,9 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)
         bridge = tsi148_bridge->driver_priv;
 
         /* Initialise list for VME bus errors */
-        INIT_LIST_HEAD(&(tsi148_bridge->vme_errors));
+        INIT_LIST_HEAD(&tsi148_bridge->vme_errors);
 
-        mutex_init(&(tsi148_bridge->irq_mtx));
+        mutex_init(&tsi148_bridge->irq_mtx);
 
         result = request_irq(pdev->irq,
                              tsi148_irqhandler,
@@ -374,8 +374,11 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)
         return 0;
 }
 
-static void tsi148_irq_exit(struct tsi148_driver *bridge, struct pci_dev *pdev)
+static void tsi148_irq_exit(struct vme_bridge *tsi148_bridge,
+        struct pci_dev *pdev)
 {
+        struct tsi148_driver *bridge = tsi148_bridge->driver_priv;
+
         /* Turn off interrupts */
         iowrite32be(0x0, bridge->base + TSI148_LCSR_INTEO);
         iowrite32be(0x0, bridge->base + TSI148_LCSR_INTEN);
@@ -384,13 +387,13 @@ static void tsi148_irq_exit(struct tsi148_driver *bridge, struct pci_dev *pdev)
         iowrite32be(0xFFFFFFFF, bridge->base + TSI148_LCSR_INTC);
 
         /* Detach interrupt handler */
-        free_irq(pdev->irq, pdev);
+        free_irq(pdev->irq, tsi148_bridge);
 }
 
 /*
  * Check to see if an IACk has been received, return true (1) or false (0).
  */
-int tsi148_iack_received(struct tsi148_driver *bridge)
+static int tsi148_iack_received(struct tsi148_driver *bridge)
 {
         u32 tmp;
 
@@ -405,7 +408,7 @@ int tsi148_iack_received(struct tsi148_driver *bridge)
 /*
  * Configure VME interrupt
  */
-void tsi148_irq_set(struct vme_bridge *tsi148_bridge, int level,
+static void tsi148_irq_set(struct vme_bridge *tsi148_bridge, int level,
         int state, int sync)
 {
         struct pci_dev *pdev;
@@ -445,14 +448,15 @@ void tsi148_irq_set(struct vme_bridge *tsi148_bridge, int level,
  * Generate a VME bus interrupt at the requested level & vector. Wait for
  * interrupt to be acked.
  */
-int tsi148_irq_generate(struct vme_bridge *tsi148_bridge, int level, int statid)
+static int tsi148_irq_generate(struct vme_bridge *tsi148_bridge, int level,
+        int statid)
 {
         u32 tmp;
         struct tsi148_driver *bridge;
 
         bridge = tsi148_bridge->driver_priv;
 
-        mutex_lock(&(bridge->vme_int));
+        mutex_lock(&bridge->vme_int);
 
         /* Read VICR register */
         tmp = ioread32be(bridge->base + TSI148_LCSR_VICR);
@@ -470,7 +474,7 @@ int tsi148_irq_generate(struct vme_bridge *tsi148_bridge, int level, int statid)
         wait_event_interruptible(bridge->iack_queue,
                 tsi148_iack_received(bridge));
 
-        mutex_unlock(&(bridge->vme_int));
+        mutex_unlock(&bridge->vme_int);
 
         return 0;
 }
@@ -496,7 +500,7 @@ static struct vme_bus_error *tsi148_find_error(struct vme_bridge *tsi148_bridge,
          */
         err_pos = NULL;
         /* Iterate through errors */
-        list_for_each(err_pos, &(tsi148_bridge->vme_errors)) {
+        list_for_each(err_pos, &tsi148_bridge->vme_errors) {
                 vme_err = list_entry(err_pos, struct vme_bus_error, list);
                 if ((vme_err->address >= address) &&
                         (vme_err->address < bound)) {
@@ -530,7 +534,7 @@ static void tsi148_clear_errors(struct vme_bridge *tsi148_bridge,
          */
         err_pos = NULL;
         /* Iterate through errors */
-        list_for_each_safe(err_pos, temp, &(tsi148_bridge->vme_errors)) {
+        list_for_each_safe(err_pos, temp, &tsi148_bridge->vme_errors) {
                 vme_err = list_entry(err_pos, struct vme_bus_error, list);
 
                 if ((vme_err->address >= address) &&
@@ -545,7 +549,7 @@ static void tsi148_clear_errors(struct vme_bridge *tsi148_bridge,
 /*
  * Initialize a slave window with the requested attributes.
  */
-int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
+static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
         dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle)
 {
@@ -695,7 +699,7 @@ int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
 /*
  * Get slave window configuration.
  */
-int tsi148_slave_get(struct vme_slave_resource *image, int *enabled,
+static int tsi148_slave_get(struct vme_slave_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
         dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle)
 {
@@ -819,8 +823,8 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
                 image->kern_base = NULL;
                 if (image->bus_resource.name != NULL)
                         kfree(image->bus_resource.name);
-                release_resource(&(image->bus_resource));
-                memset(&(image->bus_resource), 0, sizeof(struct resource));
+                release_resource(&image->bus_resource);
+                memset(&image->bus_resource, 0, sizeof(struct resource));
         }
 
         /* Exit here if size is zero */
@@ -845,7 +849,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
         image->bus_resource.flags = IORESOURCE_MEM;
 
         retval = pci_bus_alloc_resource(pdev->bus,
-                &(image->bus_resource), size, size, PCIBIOS_MIN_MEM,
+                &image->bus_resource, size, size, PCIBIOS_MIN_MEM,
                 0, NULL, NULL);
         if (retval) {
                 dev_err(tsi148_bridge->parent, "Failed to allocate mem "
@@ -868,10 +872,10 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
         iounmap(image->kern_base);
         image->kern_base = NULL;
 err_remap:
-        release_resource(&(image->bus_resource));
+        release_resource(&image->bus_resource);
 err_resource:
         kfree(image->bus_resource.name);
-        memset(&(image->bus_resource), 0, sizeof(struct resource));
+        memset(&image->bus_resource, 0, sizeof(struct resource));
 err_name:
         return retval;
 }
@@ -883,15 +887,15 @@ static void tsi148_free_resource(struct vme_master_resource *image)
 {
         iounmap(image->kern_base);
         image->kern_base = NULL;
-        release_resource(&(image->bus_resource));
+        release_resource(&image->bus_resource);
         kfree(image->bus_resource.name);
-        memset(&(image->bus_resource), 0, sizeof(struct resource));
+        memset(&image->bus_resource, 0, sizeof(struct resource));
 }
 
 /*
  * Set the attributes of an outbound window.
  */
-int tsi148_master_set(struct vme_master_resource *image, int enabled,
+static int tsi148_master_set(struct vme_master_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
         vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
 {
@@ -924,7 +928,7 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
                 goto err_window;
         }
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         /* Let's allocate the resource here rather than further up the stack as
          * it avoids pushing loads of bus dependant stuff up the stack. If size
@@ -932,7 +936,7 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
          */
         retval = tsi148_alloc_resource(image, size);
         if (retval) {
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Unable to allocate memory for "
                         "resource\n");
                 goto err_res;
@@ -959,19 +963,19 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
         reg_split(vme_offset, &vme_offset_high, &vme_offset_low);
 
         if (pci_base_low & 0xFFFF) {
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Invalid PCI base alignment\n");
                 retval = -EINVAL;
                 goto err_gran;
         }
         if (pci_bound_low & 0xFFFF) {
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Invalid PCI bound alignment\n");
                 retval = -EINVAL;
                 goto err_gran;
         }
         if (vme_offset_low & 0xFFFF) {
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Invalid VME Offset "
                         "alignment\n");
                 retval = -EINVAL;
@@ -1035,7 +1039,7 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
                 temp_ctl |= TSI148_LCSR_OTAT_DBW_32;
                 break;
         default:
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Invalid data width\n");
                 retval = -EINVAL;
                 goto err_dwidth;
@@ -1072,7 +1076,7 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
                 temp_ctl |= TSI148_LCSR_OTAT_AMODE_USER4;
                 break;
         default:
-                spin_unlock(&(image->lock));
+                spin_unlock(&image->lock);
                 dev_err(tsi148_bridge->parent, "Invalid address space\n");
                 retval = -EINVAL;
                 goto err_aspace;
@@ -1109,7 +1113,7 @@ int tsi148_master_set(struct vme_master_resource *image, int enabled,
         iowrite32be(temp_ctl, bridge->base + TSI148_LCSR_OT[i] +
                 TSI148_LCSR_OFFSET_OTAT);
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
         return 0;
 
 err_aspace:
@@ -1127,7 +1131,7 @@ err_window:
  *
  * XXX Not parsing prefetch information.
  */
-int __tsi148_master_get(struct vme_master_resource *image, int *enabled,
+static int __tsi148_master_get(struct vme_master_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
         vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
 {
@@ -1237,23 +1241,23 @@ int __tsi148_master_get(struct vme_master_resource *image, int *enabled,
 }
 
 
-int tsi148_master_get(struct vme_master_resource *image, int *enabled,
+static int tsi148_master_get(struct vme_master_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
         vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
 {
         int retval;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         retval = __tsi148_master_get(image, enabled, vme_base, size, aspace,
                 cycle, dwidth);
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
         return retval;
 }
 
-ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
+static ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
         size_t count, loff_t offset)
 {
         int retval, enabled;
@@ -1266,7 +1270,7 @@ ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
 
         tsi148_bridge = image->parent;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         memcpy_fromio(buf, image->kern_base + offset, (unsigned int)count);
         retval = count;
@@ -1289,13 +1293,13 @@ ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
         }
 
 skip_chk:
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
         return retval;
 }
 
 
-ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
+static ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
         size_t count, loff_t offset)
 {
         int retval = 0, enabled;
@@ -1312,7 +1316,7 @@ ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
 
         bridge = tsi148_bridge->driver_priv;
 
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         memcpy_toio(image->kern_base + offset, buf, (unsigned int)count);
         retval = count;
@@ -1352,7 +1356,7 @@ ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
         }
 
 skip_chk:
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
         return retval;
 }
@@ -1362,7 +1366,7 @@ skip_chk:
  *
  * Requires a previously configured master window, returns final value.
  */
-unsigned int tsi148_master_rmw(struct vme_master_resource *image,
+static unsigned int tsi148_master_rmw(struct vme_master_resource *image,
         unsigned int mask, unsigned int compare, unsigned int swap,
         loff_t offset)
 {
@@ -1378,10 +1382,10 @@ unsigned int tsi148_master_rmw(struct vme_master_resource *image,
         i = image->number;
 
         /* Locking as we can only do one of these at a time */
-        mutex_lock(&(bridge->vme_rmw));
+        mutex_lock(&bridge->vme_rmw);
 
         /* Lock image */
-        spin_lock(&(image->lock));
+        spin_lock(&image->lock);
 
         pci_addr_high = ioread32be(bridge->base + TSI148_LCSR_OT[i] +
                 TSI148_LCSR_OFFSET_OTSAU);
@@ -1411,9 +1415,9 @@ unsigned int tsi148_master_rmw(struct vme_master_resource *image,
         tmp &= ~TSI148_LCSR_VMCTRL_RMWEN;
         iowrite32be(tmp, bridge->base + TSI148_LCSR_VMCTRL);
 
-        spin_unlock(&(image->lock));
+        spin_unlock(&image->lock);
 
-        mutex_unlock(&(bridge->vme_rmw));
+        mutex_unlock(&bridge->vme_rmw);
 
         return result;
 }
@@ -1609,8 +1613,8 @@ static int tsi148_dma_set_vme_dest_attributes(struct device *dev, u32 *attr,
 /*
  * Add a link list descriptor to the list
  */
-int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
-        struct vme_dma_attr *dest, size_t count)
+static int tsi148_dma_list_add(struct vme_dma_list *list,
+        struct vme_dma_attr *src, struct vme_dma_attr *dest, size_t count)
 {
         struct tsi148_dma_entry *entry, *prev;
         u32 address_high, address_low;
@@ -1633,10 +1637,10 @@ int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
         }
 
         /* Test descriptor alignment */
-        if ((unsigned long)&(entry->descriptor) & 0x7) {
+        if ((unsigned long)&entry->descriptor & 0x7) {
                 dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 "
                         "byte boundary as required: %p\n",
-                        &(entry->descriptor));
+                        &entry->descriptor);
                 retval = -EINVAL;
                 goto err_align;
         }
@@ -1644,7 +1648,7 @@ int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
         /* Given we are going to fill out the structure, we probably don't
          * need to zero it, but better safe than sorry for now.
          */
-        memset(&(entry->descriptor), 0, sizeof(struct tsi148_dma_descriptor));
+        memset(&entry->descriptor, 0, sizeof(struct tsi148_dma_descriptor));
 
         /* Fill out source part */
         switch (src->type) {
@@ -1681,7 +1685,7 @@ int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
                 entry->descriptor.dsat = TSI148_LCSR_DSAT_TYP_VME;
 
                 retval = tsi148_dma_set_vme_src_attributes(
-                        tsi148_bridge->parent, &(entry->descriptor.dsat),
+                        tsi148_bridge->parent, &entry->descriptor.dsat,
                         vme_attr->aspace, vme_attr->cycle, vme_attr->dwidth);
                 if (retval < 0)
                         goto err_source;
@@ -1719,7 +1723,7 @@ int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
                 entry->descriptor.ddat = TSI148_LCSR_DDAT_TYP_VME;
 
                 retval = tsi148_dma_set_vme_dest_attributes(
-                        tsi148_bridge->parent, &(entry->descriptor.ddat),
+                        tsi148_bridge->parent, &entry->descriptor.ddat,
                         vme_attr->aspace, vme_attr->cycle, vme_attr->dwidth);
                 if (retval < 0)
                         goto err_dest;
@@ -1735,16 +1739,16 @@ int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
         entry->descriptor.dcnt = (u32)count;
 
         /* Add to list */
-        list_add_tail(&(entry->list), &(list->entries));
+        list_add_tail(&entry->list, &list->entries);
 
         /* Fill out previous descriptors "Next Address" */
-        if (entry->list.prev != &(list->entries)) {
+        if (entry->list.prev != &list->entries) {
                 prev = list_entry(entry->list.prev, struct tsi148_dma_entry,
                         list);
                 /* We need the bus address for the pointer */
-                desc_ptr = virt_to_bus(&(entry->descriptor));
-                reg_split(desc_ptr, &(prev->descriptor.dnlau),
-                        &(prev->descriptor.dnlal));
+                desc_ptr = virt_to_bus(&entry->descriptor);
+                reg_split(desc_ptr, &prev->descriptor.dnlau,
+                        &prev->descriptor.dnlal);
         }
 
         return 0;
@@ -1782,7 +1786,7 @@ static int tsi148_dma_busy(struct vme_bridge *tsi148_bridge, int channel)
  *
  * XXX Need to provide control register configuration.
  */
-int tsi148_dma_list_exec(struct vme_dma_list *list)
+static int tsi148_dma_list_exec(struct vme_dma_list *list)
 {
         struct vme_dma_resource *ctrlr;
         int channel, retval = 0;
@@ -1799,30 +1803,30 @@ int tsi148_dma_list_exec(struct vme_dma_list *list)
 
         bridge = tsi148_bridge->driver_priv;
 
-        mutex_lock(&(ctrlr->mtx));
+        mutex_lock(&ctrlr->mtx);
 
         channel = ctrlr->number;
 
-        if (!list_empty(&(ctrlr->running))) {
+        if (!list_empty(&ctrlr->running)) {
                 /*
                  * XXX We have an active DMA transfer and currently haven't
                  *     sorted out the mechanism for "pending" DMA transfers.
                  *     Return busy.
                  */
                 /* Need to add to pending here */
-                mutex_unlock(&(ctrlr->mtx));
+                mutex_unlock(&ctrlr->mtx);
                 return -EBUSY;
         } else {
-                list_add(&(list->list), &(ctrlr->running));
+                list_add(&list->list, &ctrlr->running);
         }
 
         /* Get first bus address and write into registers */
-        entry = list_first_entry(&(list->entries), struct tsi148_dma_entry,
+        entry = list_first_entry(&list->entries, struct tsi148_dma_entry,
                 list);
 
-        bus_addr = virt_to_bus(&(entry->descriptor));
+        bus_addr = virt_to_bus(&entry->descriptor);
 
-        mutex_unlock(&(ctrlr->mtx));
+        mutex_unlock(&ctrlr->mtx);
 
         reg_split(bus_addr, &bus_addr_high, &bus_addr_low);
 
@@ -1850,9 +1854,9 @@ int tsi148_dma_list_exec(struct vme_dma_list *list)
         }
 
         /* Remove list from running list */
-        mutex_lock(&(ctrlr->mtx));
-        list_del(&(list->list));
-        mutex_unlock(&(ctrlr->mtx));
+        mutex_lock(&ctrlr->mtx);
+        list_del(&list->list);
+        mutex_unlock(&ctrlr->mtx);
 
         return retval;
 }
@@ -1862,13 +1866,13 @@ int tsi148_dma_list_exec(struct vme_dma_list *list)
  *
  * We have a separate function, don't assume that the chain can't be reused.
  */
-int tsi148_dma_list_empty(struct vme_dma_list *list)
+static int tsi148_dma_list_empty(struct vme_dma_list *list)
 {
         struct list_head *pos, *temp;
         struct tsi148_dma_entry *entry;
 
         /* detach and free each entry */
-        list_for_each_safe(pos, temp, &(list->entries)) {
+        list_for_each_safe(pos, temp, &list->entries) {
                 list_del(pos);
                 entry = list_entry(pos, struct tsi148_dma_entry, list);
                 kfree(entry);
@@ -1884,7 +1888,7 @@ int tsi148_dma_list_empty(struct vme_dma_list *list)
  * This does not enable the LM monitor - that should be done when the first
  * callback is attached and disabled when the last callback is removed.
  */
-int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
+static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
         vme_address_t aspace, vme_cycle_t cycle)
 {
         u32 lm_base_high, lm_base_low, lm_ctl = 0;
@@ -1896,12 +1900,12 @@ int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
 
         bridge = tsi148_bridge->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* If we already have a callback attached, we can't move it! */
         for (i = 0; i < lm->monitors; i++) {
                 if (bridge->lm_callback[i] != NULL) {
-                        mutex_unlock(&(lm->mtx));
+                        mutex_unlock(&lm->mtx);
                         dev_err(tsi148_bridge->parent, "Location monitor "
                                 "callback attached, can't reset\n");
                         return -EBUSY;
@@ -1922,7 +1926,7 @@ int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
                 lm_ctl |= TSI148_LCSR_LMAT_AS_A64;
                 break;
         default:
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(tsi148_bridge->parent, "Invalid address space\n");
                 return -EINVAL;
                 break;
@@ -1943,7 +1947,7 @@ int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
         iowrite32be(lm_base_low, bridge->base + TSI148_LCSR_LMBAL);
         iowrite32be(lm_ctl, bridge->base + TSI148_LCSR_LMAT);
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
@@ -1951,15 +1955,15 @@ int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
 /* Get configuration of the callback monitor and return whether it is enabled
  * or disabled.
  */
-int tsi148_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
-        vme_address_t *aspace, vme_cycle_t *cycle)
+static int tsi148_lm_get(struct vme_lm_resource *lm,
+        unsigned long long *lm_base, vme_address_t *aspace, vme_cycle_t *cycle)
 {
         u32 lm_base_high, lm_base_low, lm_ctl, enabled = 0;
         struct tsi148_driver *bridge;
 
         bridge = lm->parent->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         lm_base_high = ioread32be(bridge->base + TSI148_LCSR_LMBAU);
         lm_base_low = ioread32be(bridge->base + TSI148_LCSR_LMBAL);
@@ -1992,7 +1996,7 @@ int tsi148_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
         if (lm_ctl & TSI148_LCSR_LMAT_DATA)
                 *cycle |= VME_DATA;
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return enabled;
 }
@@ -2002,7 +2006,7 @@ int tsi148_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
  *
  * Callback will be passed the monitor triggered.
  */
-int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
+static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
         void (*callback)(int))
 {
         u32 lm_ctl, tmp;
@@ -2013,12 +2017,12 @@ int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
 
         bridge = tsi148_bridge->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* Ensure that the location monitor is configured - need PGM or DATA */
         lm_ctl = ioread32be(bridge->base + TSI148_LCSR_LMAT);
         if ((lm_ctl & (TSI148_LCSR_LMAT_PGM | TSI148_LCSR_LMAT_DATA)) == 0) {
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(tsi148_bridge->parent, "Location monitor not properly "
                         "configured\n");
                 return -EINVAL;
@@ -2026,7 +2030,7 @@ int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
 
         /* Check that a callback isn't already attached */
         if (bridge->lm_callback[monitor] != NULL) {
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
                 dev_err(tsi148_bridge->parent, "Existing callback attached\n");
                 return -EBUSY;
         }
@@ -2049,7 +2053,7 @@ int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
                 iowrite32be(lm_ctl, bridge->base + TSI148_LCSR_LMAT);
         }
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
@@ -2057,14 +2061,14 @@ int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
 /*
  * Detach a callback function forn a specific location monitor.
  */
-int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
+static int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
 {
         u32 lm_en, tmp;
         struct tsi148_driver *bridge;
 
         bridge = lm->parent->driver_priv;
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* Disable Location Monitor and ensure previous interrupts are clear */
         lm_en = ioread32be(bridge->base + TSI148_LCSR_INTEN);
@@ -2089,7 +2093,7 @@ int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
                 iowrite32be(tmp, bridge->base + TSI148_LCSR_LMAT);
         }
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         return 0;
 }
@@ -2097,7 +2101,7 @@ int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
 /*
  * Determine Geographical Addressing
  */
-int tsi148_slot_get(struct vme_bridge *tsi148_bridge)
+static int tsi148_slot_get(struct vme_bridge *tsi148_bridge)
 {
         u32 slot = 0;
         struct tsi148_driver *bridge;
@@ -2142,7 +2146,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
 
         /* Allocate mem for CR/CSR image */
         bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
-                &(bridge->crcsr_bus));
+                &bridge->crcsr_bus);
         if (bridge->crcsr_kernel == NULL) {
                 dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
                         "CR/CSR image\n");
@@ -2280,13 +2284,13 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* Initialize wait queues & mutual exclusion flags */
-        init_waitqueue_head(&(tsi148_device->dma_queue[0]));
-        init_waitqueue_head(&(tsi148_device->dma_queue[1]));
-        init_waitqueue_head(&(tsi148_device->iack_queue));
-        mutex_init(&(tsi148_device->vme_int));
-        mutex_init(&(tsi148_device->vme_rmw));
+        init_waitqueue_head(&tsi148_device->dma_queue[0]);
+        init_waitqueue_head(&tsi148_device->dma_queue[1]);
+        init_waitqueue_head(&tsi148_device->iack_queue);
+        mutex_init(&tsi148_device->vme_int);
+        mutex_init(&tsi148_device->vme_rmw);
 
-        tsi148_bridge->parent = &(pdev->dev);
+        tsi148_bridge->parent = &pdev->dev;
         strcpy(tsi148_bridge->name, driver_name);
 
         /* Setup IRQ */
@@ -2314,7 +2318,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_master;
                 }
                 tsi148_device->flush_image->parent = tsi148_bridge;
-                spin_lock_init(&(tsi148_device->flush_image->lock));
+                spin_lock_init(&tsi148_device->flush_image->lock);
                 tsi148_device->flush_image->locked = 1;
                 tsi148_device->flush_image->number = master_num;
                 tsi148_device->flush_image->address_attr = VME_A16 | VME_A24 |
@@ -2324,13 +2328,13 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         VME_2eSST160 | VME_2eSST267 | VME_2eSST320 | VME_SUPER |
                         VME_USER | VME_PROG | VME_DATA;
                 tsi148_device->flush_image->width_attr = VME_D16 | VME_D32;
-                memset(&(tsi148_device->flush_image->bus_resource), 0,
+                memset(&tsi148_device->flush_image->bus_resource, 0,
                         sizeof(struct resource));
                 tsi148_device->flush_image->kern_base  = NULL;
         }
 
         /* Add master windows to list */
-        INIT_LIST_HEAD(&(tsi148_bridge->master_resources));
+        INIT_LIST_HEAD(&tsi148_bridge->master_resources);
         for (i = 0; i < master_num; i++) {
                 master_image = kmalloc(sizeof(struct vme_master_resource),
                         GFP_KERNEL);
@@ -2341,7 +2345,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_master;
                 }
                 master_image->parent = tsi148_bridge;
-                spin_lock_init(&(master_image->lock));
+                spin_lock_init(&master_image->lock);
                 master_image->locked = 0;
                 master_image->number = i;
                 master_image->address_attr = VME_A16 | VME_A24 | VME_A32 |
@@ -2351,15 +2355,15 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         VME_2eSST267 | VME_2eSST320 | VME_SUPER | VME_USER |
                         VME_PROG | VME_DATA;
                 master_image->width_attr = VME_D16 | VME_D32;
-                memset(&(master_image->bus_resource), 0,
+                memset(&master_image->bus_resource, 0,
                         sizeof(struct resource));
                 master_image->kern_base  = NULL;
-                list_add_tail(&(master_image->list),
-                        &(tsi148_bridge->master_resources));
+                list_add_tail(&master_image->list,
+                        &tsi148_bridge->master_resources);
         }
 
         /* Add slave windows to list */
-        INIT_LIST_HEAD(&(tsi148_bridge->slave_resources));
+        INIT_LIST_HEAD(&tsi148_bridge->slave_resources);
         for (i = 0; i < TSI148_MAX_SLAVE; i++) {
                 slave_image = kmalloc(sizeof(struct vme_slave_resource),
                         GFP_KERNEL);
@@ -2370,7 +2374,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_slave;
                 }
                 slave_image->parent = tsi148_bridge;
-                mutex_init(&(slave_image->mtx));
+                mutex_init(&slave_image->mtx);
                 slave_image->locked = 0;
                 slave_image->number = i;
                 slave_image->address_attr = VME_A16 | VME_A24 | VME_A32 |
@@ -2380,12 +2384,12 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         VME_2eVME | VME_2eSST | VME_2eSSTB | VME_2eSST160 |
                         VME_2eSST267 | VME_2eSST320 | VME_SUPER | VME_USER |
                         VME_PROG | VME_DATA;
-                list_add_tail(&(slave_image->list),
-                        &(tsi148_bridge->slave_resources));
+                list_add_tail(&slave_image->list,
+                        &tsi148_bridge->slave_resources);
         }
 
         /* Add dma engines to list */
-        INIT_LIST_HEAD(&(tsi148_bridge->dma_resources));
+        INIT_LIST_HEAD(&tsi148_bridge->dma_resources);
         for (i = 0; i < TSI148_MAX_DMA; i++) {
                 dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource),
                         GFP_KERNEL);
@@ -2396,21 +2400,21 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_dma;
                 }
                 dma_ctrlr->parent = tsi148_bridge;
-                mutex_init(&(dma_ctrlr->mtx));
+                mutex_init(&dma_ctrlr->mtx);
                 dma_ctrlr->locked = 0;
                 dma_ctrlr->number = i;
                 dma_ctrlr->route_attr = VME_DMA_VME_TO_MEM |
                         VME_DMA_MEM_TO_VME | VME_DMA_VME_TO_VME |
                         VME_DMA_MEM_TO_MEM | VME_DMA_PATTERN_TO_VME |
                         VME_DMA_PATTERN_TO_MEM;
-                INIT_LIST_HEAD(&(dma_ctrlr->pending));
-                INIT_LIST_HEAD(&(dma_ctrlr->running));
-                list_add_tail(&(dma_ctrlr->list),
-                        &(tsi148_bridge->dma_resources));
+                INIT_LIST_HEAD(&dma_ctrlr->pending);
+                INIT_LIST_HEAD(&dma_ctrlr->running);
+                list_add_tail(&dma_ctrlr->list,
+                        &tsi148_bridge->dma_resources);
         }
 
         /* Add location monitor to list */
-        INIT_LIST_HEAD(&(tsi148_bridge->lm_resources));
+        INIT_LIST_HEAD(&tsi148_bridge->lm_resources);
         lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL);
         if (lm == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate memory for "
@@ -2419,11 +2423,11 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto err_lm;
         }
         lm->parent = tsi148_bridge;
-        mutex_init(&(lm->mtx));
+        mutex_init(&lm->mtx);
         lm->locked = 0;
         lm->number = 1;
         lm->monitors = 4;
-        list_add_tail(&(lm->list), &(tsi148_bridge->lm_resources));
+        list_add_tail(&lm->list, &tsi148_bridge->lm_resources);
 
         tsi148_bridge->slave_get = tsi148_slave_get;
         tsi148_bridge->slave_set = tsi148_slave_set;
@@ -2477,41 +2481,40 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         return 0;
 
-        vme_unregister_bridge(tsi148_bridge);
 err_reg:
         tsi148_crcsr_exit(tsi148_bridge, pdev);
 err_crcsr:
 err_lm:
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->lm_resources)) {
+        list_for_each(pos, &tsi148_bridge->lm_resources) {
                 lm = list_entry(pos, struct vme_lm_resource, list);
                 list_del(pos);
                 kfree(lm);
         }
 err_dma:
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->dma_resources)) {
+        list_for_each(pos, &tsi148_bridge->dma_resources) {
                 dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
                 list_del(pos);
                 kfree(dma_ctrlr);
         }
 err_slave:
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->slave_resources)) {
+        list_for_each(pos, &tsi148_bridge->slave_resources) {
                 slave_image = list_entry(pos, struct vme_slave_resource, list);
                 list_del(pos);
                 kfree(slave_image);
         }
 err_master:
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->master_resources)) {
+        list_for_each(pos, &tsi148_bridge->master_resources) {
                 master_image = list_entry(pos, struct vme_master_resource,
                         list);
                 list_del(pos);
                 kfree(master_image);
         }
 
-        tsi148_irq_exit(tsi148_device, pdev);
+        tsi148_irq_exit(tsi148_bridge, pdev);
 err_irq:
 err_test:
         iounmap(tsi148_device->base);
@@ -2531,6 +2534,7 @@ err_struct:
 static void tsi148_remove(struct pci_dev *pdev)
 {
         struct list_head *pos = NULL;
+        struct list_head *tmplist;
         struct vme_master_resource *master_image;
         struct vme_slave_resource *slave_image;
         struct vme_dma_resource *dma_ctrlr;
@@ -2582,36 +2586,34 @@ static void tsi148_remove(struct pci_dev *pdev)
         iowrite32be(0x0, bridge->base + TSI148_LCSR_INTM1);
         iowrite32be(0x0, bridge->base + TSI148_LCSR_INTM2);
 
-        tsi148_irq_exit(bridge, pdev);
+        tsi148_irq_exit(tsi148_bridge, pdev);
 
         vme_unregister_bridge(tsi148_bridge);
 
         tsi148_crcsr_exit(tsi148_bridge, pdev);
 
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->dma_resources)) {
+        list_for_each_safe(pos, tmplist, &tsi148_bridge->dma_resources) {
                 dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
                 list_del(pos);
                 kfree(dma_ctrlr);
         }
 
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->slave_resources)) {
+        list_for_each_safe(pos, tmplist, &tsi148_bridge->slave_resources) {
                 slave_image = list_entry(pos, struct vme_slave_resource, list);
                 list_del(pos);
                 kfree(slave_image);
         }
 
         /* resources are stored in link list */
-        list_for_each(pos, &(tsi148_bridge->master_resources)) {
+        list_for_each_safe(pos, tmplist, &tsi148_bridge->master_resources) {
                 master_image = list_entry(pos, struct vme_master_resource,
                         list);
                 list_del(pos);
                 kfree(master_image);
         }
 
-        tsi148_irq_exit(bridge, pdev);
-
         iounmap(bridge->base);
 
         pci_release_regions(pdev);
diff --git a/drivers/staging/vme/bridges/vme_tsi148.h b/drivers/staging/vme/bridges/vme_tsi148.h
index bda64ef85754..9f97fa8084e8 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.h
+++ b/drivers/staging/vme/bridges/vme_tsi148.h
@@ -35,7 +35,7 @@
 
 /* Structure used to hold driver specific information */
 struct tsi148_driver {
-        void *base;     /* Base Address of device registers */
+        void __iomem *base;     /* Base Address of device registers */
         wait_queue_head_t dma_queue[2];
         wait_queue_head_t iack_queue;
         void (*lm_callback[4])(int);    /* Called in interrupt handler */
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 71bbc526626c..a571173249cf 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -44,7 +44,7 @@ static DEFINE_MUTEX(vme_user_mutex);
 static char driver_name[] = "vme_user";
 
 static int bus[USER_BUS_MAX];
-static int bus_num;
+static unsigned int bus_num;
 
 /* Currently Documentation/devices.txt defines the following for VME:
  *
@@ -92,7 +92,7 @@ static int bus_num;
  * Structure to handle image related parameters.
  */
 typedef struct {
-        void __iomem *kern_buf; /* Buffer address in kernel space */
+        void *kern_buf; /* Buffer address in kernel space */
         dma_addr_t pci_buf;     /* Buffer address in PCI address space */
         unsigned long long size_buf;    /* Buffer size */
         struct semaphore sem;   /* Semaphore for locking image */
@@ -114,9 +114,9 @@ typedef struct {
 } driver_stats_t;
 static driver_stats_t statistics;
 
-struct cdev *vme_user_cdev;             /* Character device */
-struct class *vme_user_sysfs_class;     /* Sysfs class */
-struct device *vme_user_bridge;         /* Pointer to the bridge device */
+static struct cdev *vme_user_cdev;              /* Character device */
+static struct class *vme_user_sysfs_class;      /* Sysfs class */
+static struct device *vme_user_bridge;          /* Pointer to bridge device */
 
 
 static const int type[VME_DEVS] = {     MASTER_MINOR,   MASTER_MINOR,
@@ -129,13 +129,14 @@ static const int type[VME_DEVS] = {	MASTER_MINOR,	MASTER_MINOR,
 
 static int vme_user_open(struct inode *, struct file *);
 static int vme_user_release(struct inode *, struct file *);
-static ssize_t vme_user_read(struct file *, char *, size_t, loff_t *);
-static ssize_t vme_user_write(struct file *, const char *, size_t, loff_t *);
+static ssize_t vme_user_read(struct file *, char __user *, size_t, loff_t *);
+static ssize_t vme_user_write(struct file *, const char __user *, size_t,
+        loff_t *);
 static loff_t vme_user_llseek(struct file *, loff_t, int);
 static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
 
-static int __init vme_user_probe(struct device *, int, int);
-static int __exit vme_user_remove(struct device *, int, int);
+static int __devinit vme_user_probe(struct device *, int, int);
+static int __devexit vme_user_remove(struct device *, int, int);
 
 static struct file_operations vme_user_fops = {
         .open = vme_user_open,
@@ -246,7 +247,7 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count,
  * page) transfers will lock the user space buffer into memory and then
  * transfer the data directly from the user space buffers out to VME.
  */
-static ssize_t resource_from_user(unsigned int minor, const char *buf,
+static ssize_t resource_from_user(unsigned int minor, const char __user *buf,
         size_t count, loff_t *ppos)
 {
         ssize_t retval;
@@ -277,7 +278,7 @@ static ssize_t resource_from_user(unsigned int minor, const char *buf,
 static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
         size_t count, loff_t *ppos)
 {
-        void __iomem *image_ptr;
+        void *image_ptr;
         ssize_t retval;
 
         image_ptr = image[minor].kern_buf + *ppos;
@@ -293,10 +294,10 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
         return retval;
 }
 
-static ssize_t buffer_from_user(unsigned int minor, const char *buf,
+static ssize_t buffer_from_user(unsigned int minor, const char __user *buf,
         size_t count, loff_t *ppos)
 {
-        void __iomem *image_ptr;
+        void *image_ptr;
         size_t retval;
 
         image_ptr = image[minor].kern_buf + *ppos;
@@ -312,7 +313,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char *buf,
         return retval;
 }
 
-static ssize_t vme_user_read(struct file *file, char *buf, size_t count,
+static ssize_t vme_user_read(struct file *file, char __user *buf, size_t count,
                         loff_t *ppos)
 {
         unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
@@ -356,8 +357,8 @@ static ssize_t vme_user_read(struct file *file, char *buf, size_t count,
         return retval;
 }
 
-static ssize_t vme_user_write(struct file *file, const char *buf, size_t count,
-                         loff_t *ppos)
+static ssize_t vme_user_write(struct file *file, const char __user *buf,
+                        size_t count, loff_t *ppos)
 {
         unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
         ssize_t retval;
@@ -455,6 +456,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
         unsigned int minor = MINOR(inode->i_rdev);
         int retval;
         dma_addr_t pci_addr;
+        void __user *argp = (void __user *)arg;
 
         statistics.ioctls++;
 
@@ -470,11 +472,11 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                          *      to userspace as they are
                          */
                         retval = vme_master_get(image[minor].resource,
-                                &(master.enable), &(master.vme_addr),
-                                &(master.size), &(master.aspace),
-                                &(master.cycle), &(master.dwidth));
+                                &master.enable, &master.vme_addr,
+                                &master.size, &master.aspace,
+                                &master.cycle, &master.dwidth);
 
-                        copied = copy_to_user((char *)arg, &master,
+                        copied = copy_to_user(argp, &master,
                                 sizeof(struct vme_master));
                         if (copied != 0) {
                                 printk(KERN_WARNING "Partial copy to "
@@ -487,8 +489,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
 
                 case VME_SET_MASTER:
 
-                        copied = copy_from_user(&master, (char *)arg,
-                                sizeof(master));
+                        copied = copy_from_user(&master, argp, sizeof(master));
                         if (copied != 0) {
                                 printk(KERN_WARNING "Partial copy from "
                                         "userspace\n");
@@ -514,11 +515,11 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                          *      to userspace as they are
                          */
                         retval = vme_slave_get(image[minor].resource,
-                                &(slave.enable), &(slave.vme_addr),
-                                &(slave.size), &pci_addr, &(slave.aspace),
-                                &(slave.cycle));
+                                &slave.enable, &slave.vme_addr,
+                                &slave.size, &pci_addr, &slave.aspace,
+                                &slave.cycle);
 
-                        copied = copy_to_user((char *)arg, &slave,
+                        copied = copy_to_user(argp, &slave,
                                 sizeof(struct vme_slave));
                         if (copied != 0) {
                                 printk(KERN_WARNING "Partial copy to "
@@ -531,8 +532,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
 
                 case VME_SET_SLAVE:
 
-                        copied = copy_from_user(&slave, (char *)arg,
-                                sizeof(slave));
+                        copied = copy_from_user(&slave, argp, sizeof(slave));
                         if (copied != 0) {
                                 printk(KERN_WARNING "Partial copy from "
                                         "userspace\n");
@@ -596,7 +596,7 @@ static void buf_unalloc(int num)
 static struct vme_driver vme_user_driver = {
         .name = driver_name,
         .probe = vme_user_probe,
-        .remove = vme_user_remove,
+        .remove = __devexit_p(vme_user_remove),
 };
 
 
@@ -611,6 +611,7 @@ static int __init vme_user_init(void)
         if (bus_num == 0) {
                 printk(KERN_ERR "%s: No cards, skipping registration\n",
                         driver_name);
+                retval = -ENODEV;
                 goto err_nocard;
         }
 
@@ -629,6 +630,7 @@ static int __init vme_user_init(void)
         if (ids == NULL) {
                 printk(KERN_ERR "%s: Unable to allocate ID table\n",
                         driver_name);
+                retval = -ENOMEM;
                 goto err_id;
         }
 
@@ -652,7 +654,6 @@ static int __init vme_user_init(void)
 
         return retval;
 
-        vme_unregister_driver(&vme_user_driver);
 err_reg:
         kfree(ids);
 err_id:
@@ -665,7 +666,8 @@ err_nocard:
  * as practical. We will therefore reserve the buffers and request the images
  * here so that we don't have to do it later.
  */
-static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
+static int __devinit vme_user_probe(struct device *dev, int cur_bus,
+        int cur_slot)
 {
         int i, err;
         char name[12];
@@ -683,7 +685,7 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
         for (i = 0; i < VME_DEVS; i++) {
                 image[i].kern_buf = NULL;
                 image[i].pci_buf = 0;
-                sema_init(&(image[i].sem), 1);
+                sema_init(&image[i].sem, 1);
                 image[i].device = NULL;
                 image[i].resource = NULL;
                 image[i].users = 0;
@@ -727,7 +729,7 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
                 }
                 image[i].size_buf = PCI_BUF_SIZE;
                 image[i].kern_buf = vme_alloc_consistent(image[i].resource,
-                        image[i].size_buf, &(image[i].pci_buf));
+                        image[i].size_buf, &image[i].pci_buf);
                 if (image[i].kern_buf == NULL) {
                         printk(KERN_WARNING "Unable to allocate memory for "
                                 "buffer\n");
@@ -828,8 +830,8 @@ err_master:
 err_slave:
         while (i > SLAVE_MINOR) {
                 i--;
-                vme_slave_free(image[i].resource);
                 buf_unalloc(i);
+                vme_slave_free(image[i].resource);
         }
 err_class:
         cdev_del(vme_user_cdev);
@@ -840,7 +842,8 @@ err_dev:
         return err;
 }
 
-static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot)
+static int __devexit vme_user_remove(struct device *dev, int cur_bus,
+        int cur_slot)
 {
         int i;
 
@@ -849,13 +852,15 @@ static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot)
                 device_destroy(vme_user_sysfs_class, MKDEV(VME_MAJOR, i));
         class_destroy(vme_user_sysfs_class);
 
-        for (i = MASTER_MINOR; i < (MASTER_MAX + 1); i++)
+        for (i = MASTER_MINOR; i < (MASTER_MAX + 1); i++) {
                 kfree(image[i].kern_buf);
+                vme_master_free(image[i].resource);
+        }
 
         for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) {
                 vme_slave_set(image[i].resource, 0, 0, 0, 0, VME_A32, 0);
-                vme_slave_free(image[i].resource);
                 buf_unalloc(i);
+                vme_slave_free(image[i].resource);
         }
 
         /* Unregister device driver */
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c
index 093fbffbf557..d9fc8644376e 100644
--- a/drivers/staging/vme/vme.c
+++ b/drivers/staging/vme/vme.c
@@ -245,7 +245,7 @@ struct vme_resource *vme_slave_request(struct device *dev,
         }
 
         /* Loop through slave resources */
-        list_for_each(slave_pos, &(bridge->slave_resources)) {
+        list_for_each(slave_pos, &bridge->slave_resources) {
                 slave_image = list_entry(slave_pos,
                         struct vme_slave_resource, list);
 
@@ -255,17 +255,17 @@ struct vme_resource *vme_slave_request(struct device *dev,
                 }
 
                 /* Find an unlocked and compatible image */
-                mutex_lock(&(slave_image->mtx));
+                mutex_lock(&slave_image->mtx);
                 if (((slave_image->address_attr & address) == address) &&
                         ((slave_image->cycle_attr & cycle) == cycle) &&
                         (slave_image->locked == 0)) {
 
                         slave_image->locked = 1;
-                        mutex_unlock(&(slave_image->mtx));
+                        mutex_unlock(&slave_image->mtx);
                         allocated_image = slave_image;
                         break;
                 }
-                mutex_unlock(&(slave_image->mtx));
+                mutex_unlock(&slave_image->mtx);
         }
 
         /* No free image */
@@ -278,15 +278,15 @@ struct vme_resource *vme_slave_request(struct device *dev,
                 goto err_alloc;
         }
         resource->type = VME_SLAVE;
-        resource->entry = &(allocated_image->list);
+        resource->entry = &allocated_image->list;
 
         return resource;
 
 err_alloc:
         /* Unlock image */
-        mutex_lock(&(slave_image->mtx));
+        mutex_lock(&slave_image->mtx);
         slave_image->locked = 0;
-        mutex_unlock(&(slave_image->mtx));
+        mutex_unlock(&slave_image->mtx);
 err_image:
 err_bus:
         return NULL;
@@ -369,12 +369,12 @@ void vme_slave_free(struct vme_resource *resource)
         }
 
         /* Unlock image */
-        mutex_lock(&(slave_image->mtx));
+        mutex_lock(&slave_image->mtx);
         if (slave_image->locked == 0)
                 printk(KERN_ERR "Image is already free\n");
 
         slave_image->locked = 0;
-        mutex_unlock(&(slave_image->mtx));
+        mutex_unlock(&slave_image->mtx);
 
         /* Free up resource memory */
         kfree(resource);
@@ -401,7 +401,7 @@ struct vme_resource *vme_master_request(struct device *dev,
         }
 
         /* Loop through master resources */
-        list_for_each(master_pos, &(bridge->master_resources)) {
+        list_for_each(master_pos, &bridge->master_resources) {
                 master_image = list_entry(master_pos,
                         struct vme_master_resource, list);
 
@@ -411,18 +411,18 @@ struct vme_resource *vme_master_request(struct device *dev,
                 }
 
                 /* Find an unlocked and compatible image */
-                spin_lock(&(master_image->lock));
+                spin_lock(&master_image->lock);
                 if (((master_image->address_attr & address) == address) &&
                         ((master_image->cycle_attr & cycle) == cycle) &&
                         ((master_image->width_attr & dwidth) == dwidth) &&
                         (master_image->locked == 0)) {
 
                         master_image->locked = 1;
-                        spin_unlock(&(master_image->lock));
+                        spin_unlock(&master_image->lock);
                         allocated_image = master_image;
                         break;
                 }
-                spin_unlock(&(master_image->lock));
+                spin_unlock(&master_image->lock);
         }
 
         /* Check to see if we found a resource */
@@ -437,16 +437,16 @@ struct vme_resource *vme_master_request(struct device *dev,
                 goto err_alloc;
         }
         resource->type = VME_MASTER;
-        resource->entry = &(allocated_image->list);
+        resource->entry = &allocated_image->list;
 
         return resource;
 
         kfree(resource);
 err_alloc:
         /* Unlock image */
-        spin_lock(&(master_image->lock));
+        spin_lock(&master_image->lock);
         master_image->locked = 0;
-        spin_unlock(&(master_image->lock));
+        spin_unlock(&master_image->lock);
 err_image:
 err_bus:
         return NULL;
@@ -628,12 +628,12 @@ void vme_master_free(struct vme_resource *resource)
         }
 
         /* Unlock image */
-        spin_lock(&(master_image->lock));
+        spin_lock(&master_image->lock);
         if (master_image->locked == 0)
                 printk(KERN_ERR "Image is already free\n");
 
         master_image->locked = 0;
-        spin_unlock(&(master_image->lock));
+        spin_unlock(&master_image->lock);
 
         /* Free up resource memory */
         kfree(resource);
@@ -662,7 +662,7 @@ struct vme_resource *vme_dma_request(struct device *dev, vme_dma_route_t route)
         }
 
         /* Loop through DMA resources */
-        list_for_each(dma_pos, &(bridge->dma_resources)) {
+        list_for_each(dma_pos, &bridge->dma_resources) {
                 dma_ctrlr = list_entry(dma_pos,
                         struct vme_dma_resource, list);
 
@@ -672,16 +672,16 @@ struct vme_resource *vme_dma_request(struct device *dev, vme_dma_route_t route)
                 }
 
                 /* Find an unlocked and compatible controller */
-                mutex_lock(&(dma_ctrlr->mtx));
+                mutex_lock(&dma_ctrlr->mtx);
                 if (((dma_ctrlr->route_attr & route) == route) &&
                         (dma_ctrlr->locked == 0)) {
 
                         dma_ctrlr->locked = 1;
-                        mutex_unlock(&(dma_ctrlr->mtx));
+                        mutex_unlock(&dma_ctrlr->mtx);
                         allocated_ctrlr = dma_ctrlr;
                         break;
                 }
-                mutex_unlock(&(dma_ctrlr->mtx));
+                mutex_unlock(&dma_ctrlr->mtx);
         }
 
         /* Check to see if we found a resource */
@@ -694,15 +694,15 @@ struct vme_resource *vme_dma_request(struct device *dev, vme_dma_route_t route)
                 goto err_alloc;
         }
         resource->type = VME_DMA;
-        resource->entry = &(allocated_ctrlr->list);
+        resource->entry = &allocated_ctrlr->list;
 
         return resource;
 
 err_alloc:
         /* Unlock image */
-        mutex_lock(&(dma_ctrlr->mtx));
+        mutex_lock(&dma_ctrlr->mtx);
         dma_ctrlr->locked = 0;
-        mutex_unlock(&(dma_ctrlr->mtx));
+        mutex_unlock(&dma_ctrlr->mtx);
 err_ctrlr:
 err_bus:
         return NULL;
@@ -729,9 +729,9 @@ struct vme_dma_list *vme_new_dma_list(struct vme_resource *resource)
                 printk(KERN_ERR "Unable to allocate memory for new dma list\n");
                 return NULL;
         }
-        INIT_LIST_HEAD(&(dma_list->entries));
+        INIT_LIST_HEAD(&dma_list->entries);
         dma_list->parent = ctrlr;
-        mutex_init(&(dma_list->mtx));
+        mutex_init(&dma_list->mtx);
 
         return dma_list;
 }
@@ -880,14 +880,14 @@ int vme_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src,
                 return -EINVAL;
         }
 
-        if (!mutex_trylock(&(list->mtx))) {
+        if (!mutex_trylock(&list->mtx)) {
                 printk(KERN_ERR "Link List already submitted\n");
                 return -EINVAL;
         }
 
         retval = bridge->dma_list_add(list, src, dest, count);
 
-        mutex_unlock(&(list->mtx));
+        mutex_unlock(&list->mtx);
 
         return retval;
 }
@@ -903,11 +903,11 @@ int vme_dma_list_exec(struct vme_dma_list *list)
                 return -EINVAL;
         }
 
-        mutex_lock(&(list->mtx));
+        mutex_lock(&list->mtx);
 
         retval = bridge->dma_list_exec(list);
 
-        mutex_unlock(&(list->mtx));
+        mutex_unlock(&list->mtx);
 
         return retval;
 }
@@ -923,7 +923,7 @@ int vme_dma_list_free(struct vme_dma_list *list)
                 return -EINVAL;
         }
 
-        if (!mutex_trylock(&(list->mtx))) {
+        if (!mutex_trylock(&list->mtx)) {
                 printk(KERN_ERR "Link List in use\n");
                 return -EINVAL;
         }
@@ -935,10 +935,10 @@ int vme_dma_list_free(struct vme_dma_list *list)
         retval = bridge->dma_list_empty(list);
         if (retval) {
                 printk(KERN_ERR "Unable to empty link-list entries\n");
-                mutex_unlock(&(list->mtx));
+                mutex_unlock(&list->mtx);
                 return retval;
         }
-        mutex_unlock(&(list->mtx));
+        mutex_unlock(&list->mtx);
         kfree(list);
 
         return retval;
@@ -956,20 +956,20 @@ int vme_dma_free(struct vme_resource *resource)
 
         ctrlr = list_entry(resource->entry, struct vme_dma_resource, list);
 
-        if (!mutex_trylock(&(ctrlr->mtx))) {
+        if (!mutex_trylock(&ctrlr->mtx)) {
                 printk(KERN_ERR "Resource busy, can't free\n");
                 return -EBUSY;
         }
 
-        if (!(list_empty(&(ctrlr->pending)) && list_empty(&(ctrlr->running)))) {
+        if (!(list_empty(&ctrlr->pending) && list_empty(&ctrlr->running))) {
                 printk(KERN_WARNING "Resource still processing transfers\n");
-                mutex_unlock(&(ctrlr->mtx));
+                mutex_unlock(&ctrlr->mtx);
                 return -EBUSY;
         }
 
         ctrlr->locked = 0;
 
-        mutex_unlock(&(ctrlr->mtx));
+        mutex_unlock(&ctrlr->mtx);
 
         return 0;
 }
@@ -1013,10 +1013,10 @@ int vme_irq_request(struct device *dev, int level, int statid,
                 return -EINVAL;
         }
 
-        mutex_lock(&(bridge->irq_mtx));
+        mutex_lock(&bridge->irq_mtx);
 
         if (bridge->irq[level - 1].callback[statid].func) {
-                mutex_unlock(&(bridge->irq_mtx));
+                mutex_unlock(&bridge->irq_mtx);
                 printk(KERN_WARNING "VME Interrupt already taken\n");
                 return -EBUSY;
         }
@@ -1028,7 +1028,7 @@ int vme_irq_request(struct device *dev, int level, int statid,
         /* Enable IRQ level */
         bridge->irq_set(bridge, level, 1, 1);
 
-        mutex_unlock(&(bridge->irq_mtx));
+        mutex_unlock(&bridge->irq_mtx);
 
         return 0;
 }
@@ -1054,7 +1054,7 @@ void vme_irq_free(struct device *dev, int level, int statid)
                 return;
         }
 
-        mutex_lock(&(bridge->irq_mtx));
+        mutex_lock(&bridge->irq_mtx);
 
         bridge->irq[level - 1].count--;
 
@@ -1065,7 +1065,7 @@ void vme_irq_free(struct device *dev, int level, int statid)
         bridge->irq[level - 1].callback[statid].func = NULL;
         bridge->irq[level - 1].callback[statid].priv_data = NULL;
 
-        mutex_unlock(&(bridge->irq_mtx));
+        mutex_unlock(&bridge->irq_mtx);
 }
 EXPORT_SYMBOL(vme_irq_free);
 
@@ -1111,7 +1111,7 @@ struct vme_resource *vme_lm_request(struct device *dev)
         }
 
         /* Loop through DMA resources */
-        list_for_each(lm_pos, &(bridge->lm_resources)) {
+        list_for_each(lm_pos, &bridge->lm_resources) {
                 lm = list_entry(lm_pos,
                         struct vme_lm_resource, list);
 
@@ -1122,14 +1122,14 @@ struct vme_resource *vme_lm_request(struct device *dev)
                 }
 
                 /* Find an unlocked controller */
-                mutex_lock(&(lm->mtx));
+                mutex_lock(&lm->mtx);
                 if (lm->locked == 0) {
                         lm->locked = 1;
-                        mutex_unlock(&(lm->mtx));
+                        mutex_unlock(&lm->mtx);
                         allocated_lm = lm;
                         break;
                 }
-                mutex_unlock(&(lm->mtx));
+                mutex_unlock(&lm->mtx);
         }
 
         /* Check to see if we found a resource */
@@ -1142,15 +1142,15 @@ struct vme_resource *vme_lm_request(struct device *dev)
                 goto err_alloc;
         }
         resource->type = VME_LM;
-        resource->entry = &(allocated_lm->list);
+        resource->entry = &allocated_lm->list;
 
         return resource;
 
 err_alloc:
         /* Unlock image */
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
         lm->locked = 0;
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 err_lm:
 err_bus:
         return NULL;
@@ -1270,7 +1270,7 @@ void vme_lm_free(struct vme_resource *resource)
 
         lm = list_entry(resource->entry, struct vme_lm_resource, list);
 
-        mutex_lock(&(lm->mtx));
+        mutex_lock(&lm->mtx);
 
         /* XXX
          * Check to see that there aren't any callbacks still attached, if
@@ -1279,7 +1279,7 @@ void vme_lm_free(struct vme_resource *resource)
 
         lm->locked = 0;
 
-        mutex_unlock(&(lm->mtx));
+        mutex_unlock(&lm->mtx);
 
         kfree(resource);
 }
@@ -1326,7 +1326,7 @@ static int vme_alloc_bus_num(void)
 static void vme_free_bus_num(int bus)
 {
         mutex_lock(&vme_bus_num_mtx);
-        vme_bus_numbers |= ~(0x1 << bus);
+        vme_bus_numbers &= ~(0x1 << bus);
         mutex_unlock(&vme_bus_num_mtx);
 }
 
@@ -1343,11 +1343,11 @@ int vme_register_bridge(struct vme_bridge *bridge)
          * specification.
          */
         for (i = 0; i < VME_SLOTS_MAX; i++) {
-                dev = &(bridge->dev[i]);
+                dev = &bridge->dev[i];
                 memset(dev, 0, sizeof(struct device));
 
                 dev->parent = bridge->parent;
-                dev->bus = &(vme_bus_type);
+                dev->bus = &vme_bus_type;
                 /*
                  * We save a pointer to the bridge in platform_data so that we
                  * can get to it later. We keep driver_data for use by the
@@ -1366,7 +1366,7 @@ int vme_register_bridge(struct vme_bridge *bridge)
         i = VME_SLOTS_MAX;
 err_reg:
         while (i > -1) {
-                dev = &(bridge->dev[i]);
+                dev = &bridge->dev[i];
                 device_unregister(dev);
         }
         vme_free_bus_num(bridge->num);
@@ -1381,7 +1381,7 @@ void vme_unregister_bridge(struct vme_bridge *bridge)
 
 
         for (i = 0; i < VME_SLOTS_MAX; i++) {
-                dev = &(bridge->dev[i]);
+                dev = &bridge->dev[i];
                 device_unregister(dev);
         }
         vme_free_bus_num(bridge->num);
@@ -1418,7 +1418,7 @@ static int vme_calc_slot(struct device *dev)
         /* Determine slot number */
         num = 0;
         while (num < VME_SLOTS_MAX) {
-                if (&(bridge->dev[num]) == dev)
+                if (&bridge->dev[num] == dev)
                         break;
 
                 num++;
diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/staging/vme/vme_bridge.h
index b653ec02e1fc..4c6ec31b01db 100644
--- a/drivers/staging/vme/vme_bridge.h
+++ b/drivers/staging/vme/vme_bridge.h
@@ -20,7 +20,7 @@ struct vme_master_resource {
         vme_cycle_t cycle_attr;
         vme_width_t width_attr;
         struct resource bus_resource;
-        void *kern_base;
+        void __iomem *kern_base;
 };
 
 struct vme_slave_resource {
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 32d095c4d51c..951a3a8ddcb2 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -2058,7 +2058,7 @@ bool CARDbSoftwareReset (void *pDeviceHandler)
 QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2)
 {
     QWORD   qwTSFOffset;
-    unsigned short wRxBcnTSFOffst= 0;;
+    unsigned short wRxBcnTSFOffst= 0;
 
     HIDWORD(qwTSFOffset) = 0;
     LODWORD(qwTSFOffset) = 0;
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 92e33999054b..5e425d1476b8 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -2073,7 +2073,7 @@ int iwctl_giwencodeext(struct net_device *dev,
              struct iw_point *wrq,
              char *extra)
 {
-                return -EOPNOTSUPP;;
+                return -EOPNOTSUPP;
 }
 
 int iwctl_siwmlme(struct net_device *dev,
diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index 805164bed7e4..744799cfe832 100644
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -216,7 +216,7 @@ WPA2vParseRSN (
         m = *((unsigned short *) &(pRSN->abyRSN[4]));
 
         if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2)
-            pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
+            pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));
             j = 0;
             pbyOUI = &(pRSN->abyRSN[8+4*m]);
             for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(unsigned char)); i++) {
@@ -235,7 +235,7 @@ WPA2vParseRSN (
             pBSSNode->wAKMSSAuthCount = (unsigned short)j;
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);
 
-            n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
+            n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));
             if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2)
                 pBSSNode->sRSNCapObj.bRSNCapExist = true;
                 pBSSNode->sRSNCapObj.wRSNCap = *((unsigned short *) &(pRSN->abyRSN[8+4*m+4*n]));
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index e5add2046375..0d11147f91c1 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -963,7 +963,7 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
             break;
         case ANT_RXB:
             pDevice->byBBRxConf &= 0xFE;
-            pDevice->byBBRxConf |= 0x02;;
+            pDevice->byBBRxConf |= 0x02;
             break;
     }
 
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 8de21aac1bff..a49053bd7c65 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -1092,7 +1092,7 @@ CARDbChannelSwitch (
         pDevice->sMgmtObj.uCurrChannel = byNewChannel;
         bResult = CARDbSetMediaChannel(pDevice, byNewChannel);
 
-        return(bResult);
+        return bResult;
     }
     pDevice->byChannelSwitchCount = byCount;
     pDevice->byNewChannel = byNewChannel;
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 1f9d29636803..f4fb0c6e4eac 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -1608,8 +1608,8 @@ void RXvMngWorkItem(void *Context)
         }
     }
 
-    pDevice->bIsRxMngWorkItemQueued = FALSE;
-    spin_unlock_irq(&pDevice->lock);
+        pDevice->bIsRxMngWorkItemQueued = FALSE;
+        spin_unlock_irq(&pDevice->lock);
 
 }
 
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 0004be8e3957..2121205a912b 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1883,7 +1883,7 @@ int iwctl_giwencodeext(struct net_device *dev,
              struct iw_point *wrq,
              char *extra)
 {
-                return -EOPNOTSUPP;;
+                return -EOPNOTSUPP;
 }
 
 int iwctl_siwmlme(struct net_device *dev,
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 0c12fd36d0f9..e8c1b35e8128 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -192,7 +192,7 @@ BOOL PSbConsiderPowerDown(void *hDeviceContext,
     // check if already in Doze mode
     ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);
     if ( (byData & PSCTL_PS) != 0 )
-        return TRUE;;
+        return TRUE;
 
     if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
         // check if in TIM wake period
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index bbdc127a987d..8f18578a5903 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -68,8 +68,7 @@
 /*---------------------  Static Classes  ----------------------------*/
 
 /*---------------------  Static Variables  --------------------------*/
-//static int          msglevel                =MSG_LEVEL_DEBUG;
-static int          msglevel                =MSG_LEVEL_INFO;
+static int          msglevel                = MSG_LEVEL_INFO;
 
 /*---------------------  Static Functions  --------------------------*/
 
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c
index a6bd533f9577..0715636cb9cb 100644
--- a/drivers/staging/vt6656/tkip.c
+++ b/drivers/staging/vt6656/tkip.c
@@ -214,13 +214,14 @@ void TKIPvMixKey(
     /* Phase 1, step 2 */
     for (i=0; i<8; i++) {
         j = 2*(i & 1);
-        p1k[0] = (p1k[0] + tkip_sbox( (p1k[4] ^ ((256*pbyTKey[1+j]) + pbyTKey[j])) % 65536 )) % 65536;
-        p1k[1] = (p1k[1] + tkip_sbox( (p1k[0] ^ ((256*pbyTKey[5+j]) + pbyTKey[4+j])) % 65536 )) % 65536;
-        p1k[2] = (p1k[2] + tkip_sbox( (p1k[1] ^ ((256*pbyTKey[9+j]) + pbyTKey[8+j])) % 65536 )) % 65536;
-        p1k[3] = (p1k[3] + tkip_sbox( (p1k[2] ^ ((256*pbyTKey[13+j]) + pbyTKey[12+j])) % 65536 )) % 65536;
-        p1k[4] = (p1k[4] + tkip_sbox( (p1k[3] ^ (((256*pbyTKey[1+j]) + pbyTKey[j]))) % 65536 )) % 65536;
+        p1k[0] = (p1k[0] + tkip_sbox((p1k[4] ^ ((256*pbyTKey[1+j]) + pbyTKey[j])) % 65536)) % 65536;
+        p1k[1] = (p1k[1] + tkip_sbox((p1k[0] ^ ((256*pbyTKey[5+j]) + pbyTKey[4+j])) % 65536)) % 65536;
+        p1k[2] = (p1k[2] + tkip_sbox((p1k[1] ^ ((256*pbyTKey[9+j]) + pbyTKey[8+j])) % 65536)) % 65536;
+        p1k[3] = (p1k[3] + tkip_sbox((p1k[2] ^ ((256*pbyTKey[13+j]) + pbyTKey[12+j])) % 65536)) % 65536;
+        p1k[4] = (p1k[4] + tkip_sbox((p1k[3] ^ (((256*pbyTKey[1+j]) + pbyTKey[j]))) % 65536)) % 65536;
         p1k[4] = (p1k[4] + i) % 65536;
     }
+ 
     /* Phase 2, Step 1 */
     ppk0 = p1k[0];
     ppk1 = p1k[1];
@@ -230,19 +231,19 @@ void TKIPvMixKey(
     ppk5 = (p1k[4] + tsc2) % 65536;
 
     /* Phase2, Step 2 */
-    ppk0 = ppk0 + tkip_sbox( (ppk5 ^ ((256*pbyTKey[1]) + pbyTKey[0])) % 65536);
-    ppk1 = ppk1 + tkip_sbox( (ppk0 ^ ((256*pbyTKey[3]) + pbyTKey[2])) % 65536);
-    ppk2 = ppk2 + tkip_sbox( (ppk1 ^ ((256*pbyTKey[5]) + pbyTKey[4])) % 65536);
-    ppk3 = ppk3 + tkip_sbox( (ppk2 ^ ((256*pbyTKey[7]) + pbyTKey[6])) % 65536);
-    ppk4 = ppk4 + tkip_sbox( (ppk3 ^ ((256*pbyTKey[9]) + pbyTKey[8])) % 65536);
-    ppk5 = ppk5 + tkip_sbox( (ppk4 ^ ((256*pbyTKey[11]) + pbyTKey[10])) % 65536);
-
-    ppk0 = ppk0 + rotr1(ppk5 ^ ((256*pbyTKey[13]) + pbyTKey[12]));
-    ppk1 = ppk1 + rotr1(ppk0 ^ ((256*pbyTKey[15]) + pbyTKey[14]));
-    ppk2 = ppk2 + rotr1(ppk1);
-    ppk3 = ppk3 + rotr1(ppk2);
-    ppk4 = ppk4 + rotr1(ppk3);
-    ppk5 = ppk5 + rotr1(ppk4);
+        ppk0 = ppk0 + tkip_sbox((ppk5 ^ ((256*pbyTKey[1]) + pbyTKey[0])) % 65536);
+        ppk1 = ppk1 + tkip_sbox((ppk0 ^ ((256*pbyTKey[3]) + pbyTKey[2])) % 65536);
+        ppk2 = ppk2 + tkip_sbox((ppk1 ^ ((256*pbyTKey[5]) + pbyTKey[4])) % 65536);
+        ppk3 = ppk3 + tkip_sbox((ppk2 ^ ((256*pbyTKey[7]) + pbyTKey[6])) % 65536);
+        ppk4 = ppk4 + tkip_sbox((ppk3 ^ ((256*pbyTKey[9]) + pbyTKey[8])) % 65536);
+        ppk5 = ppk5 + tkip_sbox((ppk4 ^ ((256*pbyTKey[11]) + pbyTKey[10])) % 65536);
+
+        ppk0 = ppk0 + rotr1(ppk5 ^ ((256*pbyTKey[13]) + pbyTKey[12]));
+        ppk1 = ppk1 + rotr1(ppk0 ^ ((256*pbyTKey[15]) + pbyTKey[14]));
+        ppk2 = ppk2 + rotr1(ppk1);
+        ppk3 = ppk3 + rotr1(ppk2);
+        ppk4 = ppk4 + rotr1(ppk3);
+        ppk5 = ppk5 + rotr1(ppk4);
 
     /* Phase 2, Step 3 */
     pbyRC4Key[0] = (tsc2 >> 8) % 256;
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 6d13190885d1..d4f3f7530ee4 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -215,7 +215,7 @@ WPA2vParseRSN (
         m = *((PWORD) &(pRSN->abyRSN[4]));
 
         if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2)
-            pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m]));;
+            pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m]));
             j = 0;
             pbyOUI = &(pRSN->abyRSN[8+4*m]);
             for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(BYTE)); i++) {
@@ -234,7 +234,7 @@ WPA2vParseRSN (
             pBSSNode->wAKMSSAuthCount = (WORD)j;
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);
 
-            n = *((PWORD) &(pRSN->abyRSN[6+4*m]));;
+            n = *((PWORD) &(pRSN->abyRSN[6+4*m]));
             if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2)
                 pBSSNode->sRSNCapObj.bRSNCapExist = TRUE;
                 pBSSNode->sRSNCapObj.wRSNCap = *((PWORD) &(pRSN->abyRSN[8+4*m+4*n]));
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
index a6780296888f..ad0c61db9937 100644
--- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
+++ b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
@@ -2127,10 +2127,7 @@ void cy_as_hal_pll_lock_loss_handler(cy_as_hal_device_tag tag)
  */
 void *cy_as_hal_alloc(uint32_t cnt)
 {
-        void *ret_p;
-
-        ret_p = kmalloc(cnt, GFP_ATOMIC);
-        return ret_p;
+        return kmalloc(cnt, GFP_ATOMIC);
 }
 
 /*
@@ -2150,10 +2147,7 @@ void cy_as_hal_free(void *mem_p)
  */
 void *cy_as_hal_c_b_alloc(uint32_t cnt)
 {
-        void *ret_p;
-
-        ret_p = kmalloc(cnt, GFP_ATOMIC);
-        return ret_p;
+        return kmalloc(cnt, GFP_ATOMIC);
 }
 
 /*
diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index 79fa2271a0c1..081d48db04cb 100644
--- a/drivers/staging/winbond/Makefile
+++ b/drivers/staging/winbond/Makefile
@@ -1,6 +1,5 @@
 w35und-y :=                     \
         mds.o                   \
-        mlmetxrx.o              \
         mto.o                   \
         phy_calibration.o       \
         reg.o                   \
diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 2b87a0007319..d7b3aca5ddeb 100644
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -4,7 +4,7 @@
 #include <linux/wireless.h>
 #include <linux/types.h>
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "mto.h"
 
 #include "mac_structures.h"
diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index ed3df2964065..76c63c74d50c 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -21,23 +21,11 @@
 #ifndef _MAC_Structures_H_
 #define _MAC_Structures_H_
 
-#include <linux/skbuff.h>
-
-/*=========================================================
-// Some miscellaneous definitions
-//-----*/
-#define MAX_CHANNELS                        30
 #define MAC_ADDR_LENGTH                     6
-#define MAX_WEP_KEY_SIZE                    16  /* 128 bits */
-#define MAX_802_11_FRAGMENT_NUMBER              10 /* By spec */
 
 /* ========================================================
 // 802.11 Frame define
 //----- */
-#define MASK_PROTOCOL_VERSION_TYPE      0x0F
-#define MASK_FRAGMENT_NUMBER            0x000F
-#define SEQUENCE_NUMBER_SHIFT           4
-#define DIFFER_11_TO_3                          18
 #define DOT_11_MAC_HEADER_SIZE          24
 #define DOT_11_SNAP_SIZE                        6
 #define DOT_11_DURATION_OFFSET          2
@@ -47,15 +35,9 @@
 #define DOT_11_TYPE_OFFSET                      30
 #define DOT_11_DATA_OFFSET          24
 #define DOT_11_DA_OFFSET                        4
-#define DOT_3_TYPE_ARP                          0x80F3
-#define DOT_3_TYPE_IPX                          0x8137
-#define DOT_3_TYPE_OFFSET                       12
-
 
-#define ETHERNET_HEADER_SIZE                    14
 #define MAX_ETHERNET_PACKET_SIZE                1514
 
-
 /* -----  management : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */
 #define MAC_SUBTYPE_MNGMNT_ASSOC_REQUEST    0x00
 #define MAC_SUBTYPE_MNGMNT_ASSOC_RESPONSE   0x10
@@ -69,129 +51,6 @@
 #define MAC_SUBTYPE_MNGMNT_AUTHENTICATION   0xB0
 #define MAC_SUBTYPE_MNGMNT_DEAUTHENTICATION 0xC0
 
-/* -----  control : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */
-#define MAC_SUBTYPE_CONTROL_PSPOLL          0xA4
-#define MAC_SUBTYPE_CONTROL_RTS             0xB4
-#define MAC_SUBTYPE_CONTROL_CTS             0xC4
-#define MAC_SUBTYPE_CONTROL_ACK             0xD4
-#define MAC_SUBTYPE_CONTROL_CFEND           0xE4
-#define MAC_SUBTYPE_CONTROL_CFEND_CFACK     0xF4
-
-/* -----  data : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */
-#define MAC_SUBTYPE_DATA                    0x08
-#define MAC_SUBTYPE_DATA_CFACK              0x18
-#define MAC_SUBTYPE_DATA_CFPOLL             0x28
-#define MAC_SUBTYPE_DATA_CFACK_CFPOLL       0x38
-#define MAC_SUBTYPE_DATA_NULL               0x48
-#define MAC_SUBTYPE_DATA_CFACK_NULL         0x58
-#define MAC_SUBTYPE_DATA_CFPOLL_NULL        0x68
-#define MAC_SUBTYPE_DATA_CFACK_CFPOLL_NULL  0x78
-
-/* -----  Frame Type of Bits (2, 3) */
-#define MAC_TYPE_MANAGEMENT                 0x00
-#define MAC_TYPE_CONTROL                    0x04
-#define MAC_TYPE_DATA                       0x08
-
-/* ----- definitions for Management Frame Element ID (1 BYTE) */
-#define ELEMENT_ID_SSID                     0
-#define ELEMENT_ID_SUPPORTED_RATES          1
-#define ELEMENT_ID_FH_PARAMETER_SET         2
-#define ELEMENT_ID_DS_PARAMETER_SET         3
-#define ELEMENT_ID_CF_PARAMETER_SET         4
-#define ELEMENT_ID_TIM                      5
-#define ELEMENT_ID_IBSS_PARAMETER_SET       6
-/* 7~15 reserverd */
-#define ELEMENT_ID_CHALLENGE_TEXT           16
-/* 17~31 reserved for challenge text extension */
-/* 32~255 reserved */
-/*--  11G  -- */
-#define ELEMENT_ID_ERP_INFORMATION                      42
-#define ELEMENT_ID_EXTENDED_SUPPORTED_RATES 50
-
-/* --  WPA  -- */
-
-#define ELEMENT_ID_RSN_WPA                                      221
-#ifdef _WPA2_
-#define ELEMENT_ID_RSN_WPA2                                 48
-#endif /* endif WPA2 */
-
-#define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)
-#define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)
-
-/* ===================================================================
-*  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
-*  length of ReasonCode is 2 Octs.
-* =================================================================== */
-#define REASON_REASERED             0
-#define REASON_UNSPECIDIED          1
-#define REASON_PREAUTH_INVALID      2
-#define DEAUTH_REASON_LEFT_BSS      3
-#define DISASS_REASON_AP_INACTIVE   4
-#define DISASS_REASON_AP_BUSY       5
-#define REASON_CLASS2_FRAME_FROM_NONAUTH_STA    6
-#define REASON_CLASS3_FRAME_FROM_NONASSO_STA    7
-#define DISASS_REASON_LEFT_BSS      8
-#define REASON_NOT_AUTH_YET         9
-/* 802.11i define */
-#define REASON_INVALID_IE                                               13
-#define REASON_MIC_ERROR                                                14
-#define REASON_4WAY_HANDSHAKE_TIMEOUT                   15
-#define REASON_GROUPKEY_UPDATE_TIMEOUT                  16
-#define REASON_IE_DIFF_4WAY_ASSOC                               17
-#define REASON_INVALID_MULTICAST_CIPHER                 18
-#define REASON_INVALID_UNICAST_CIPHER                   19
-#define REASON_INVALID_AKMP                                             20
-#define REASON_UNSUPPORTED_RSNIE_VERSION                21
-#define REASON_INVALID_RSNIE_CAPABILITY                 22
-#define REASON_802_1X_AUTH_FAIL                                 23
-#define REASON_CIPHER_REJECT_PER_SEC_POLICY             14
-
-/*
-//===========================================================
-// enum_MMPDUResultCode --
-//   Status code (2 Octs) in the MMPDU's frame body. Table.19
-//
-//===========================================================
-enum enum_MMPDUResultCode
-{
-//    SUCCESS   = 0,      // Redefined
-    UNSPECIFIED_FAILURE                         = 1,
-
-    // 2 - 9 Reserved
-
-    NOT_SUPPROT_CAPABILITIES                    = 10,
-
-    //REASSOCIATION_DENIED
-    //
-    REASSOC_DENIED_UNABLE_CFM_ASSOC_EXIST       = 11,
-
-    //ASSOCIATION_DENIED_NOT_IN_STANDARD
-    //
-    ASSOC_DENIED_REASON_NOT_IN_STANDARD         = 12,
-    PEER_NOT_SUPPORT_AUTH_ALGORITHM             = 13,
-    AUTH_SEQNUM_OUT_OF_EXPECT                   = 14,
-    AUTH_REJECT_REASON_CHALLENGE_FAIL           = 15,
-    AUTH_REJECT_REASON_WAIT_TIMEOUT             = 16,
-    ASSOC_DENIED_REASON_AP_BUSY                 = 17,
-    ASSOC_DENIED_REASON_NOT_SUPPORT_BASIC_RATE  = 18
-} WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE;
-*/
-
-#define RATE_BITMAP_1M                          1
-#define RATE_BITMAP_2M                          2
-#define RATE_BITMAP_5dot5M                      5
-#define RATE_BITMAP_6M                          6
-#define RATE_BITMAP_9M                          9
-#define RATE_BITMAP_11M                         11
-#define RATE_BITMAP_12M                         12
-#define RATE_BITMAP_18M                         18
-#define RATE_BITMAP_22M                         22
-#define RATE_BITMAP_24M                         24
-#define RATE_BITMAP_33M                         17
-#define RATE_BITMAP_36M                         19
-#define RATE_BITMAP_48M                         25
-#define RATE_BITMAP_54M                         28
-
 #define RATE_AUTO                                       0
 #define RATE_1M                                         2
 #define RATE_2M                                         4
@@ -209,408 +68,4 @@ enum enum_MMPDUResultCode
 #define RATE_54M                                        108
 #define RATE_MAX                                        255
 
-/* CAPABILITY */
-#define CAPABILITY_ESS_BIT                              0x0001
-#define CAPABILITY_IBSS_BIT                             0x0002
-#define CAPABILITY_CF_POLL_BIT                  0x0004
-#define CAPABILITY_CF_POLL_REQ_BIT              0x0008
-#define CAPABILITY_PRIVACY_BIT                  0x0010
-#define CAPABILITY_SHORT_PREAMBLE_BIT   0x0020
-#define CAPABILITY_PBCC_BIT                             0x0040
-#define CAPABILITY_CHAN_AGILITY_BIT             0x0080
-#define CAPABILITY_SHORT_SLOT_TIME_BIT  0x0400
-#define CAPABILITY_DSSS_OFDM_BIT                0x2000
-
-
-struct Capability_Information_Element {
-  union {
-        u16 __attribute__ ((packed)) wValue;
-    #ifdef _BIG_ENDIAN_  /* 20060926 add by anson's endian */
-    struct _Capability {
-        /* --  11G  -- */
-        u8      Reserved3:2;
-        u8      DSSS_OFDM:1;
-        u8      Reserved2:2;
-        u8      Short_Slot_Time:1;
-        u8    Reserved1:2;
-        u8    Channel_Agility:1;
-        u8    PBCC:1;
-        u8    ShortPreamble:1;
-        u8    CF_Privacy:1;
-        u8    CF_Poll_Request:1;
-        u8    CF_Pollable:1;
-        u8    IBSS:1;
-        u8    ESS:1;
-    } __attribute__ ((packed)) Capability;
-    #else
-    struct _Capability {
-        u8    ESS:1;
-        u8    IBSS:1;
-        u8    CF_Pollable:1;
-        u8    CF_Poll_Request:1;
-        u8    CF_Privacy:1;
-        u8    ShortPreamble:1;
-        u8    PBCC:1;
-        u8    Channel_Agility:1;
-        u8    Reserved1:2;
-                /* --  11G  -- */
-                u8      Short_Slot_Time:1;
-                u8      Reserved2:2;
-                u8      DSSS_OFDM:1;
-                u8      Reserved3:2;
-    } __attribute__ ((packed)) Capability;
-    #endif
-  } __attribute__ ((packed)) ;
-} __attribute__ ((packed));
-
-struct FH_Parameter_Set_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    Dwell_Time[2];
-    u8    Hop_Set;
-    u8    Hop_Pattern;
-    u8    Hop_Index;
-};
-
-struct DS_Parameter_Set_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    Current_Channel;
-};
-
-struct Supported_Rates_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    SupportedRates[8];
-} __attribute__ ((packed));
-
-struct SSID_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    SSID[32];
-} __attribute__ ((packed)) ;
-
-struct CF_Parameter_Set_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    CFP_Count;
-    u8    CFP_Period;
-    u8    CFP_MaxDuration[2];     /* in Time Units */
-    u8    CFP_DurRemaining[2];    /* in time units */
-};
-
-struct TIM_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    DTIM_Count;
-    u8    DTIM_Period;
-    u8    Bitmap_Control;
-    u8    Partial_Virtual_Bitmap[251];
-};
-
-struct IBSS_Parameter_Set_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    ATIM_Window[2];
-};
-
-struct Challenge_Text_Element {
-    u8    Element_ID;
-    u8    Length;
-    u8    Challenge_Text[253];
-};
-
-struct PHY_Parameter_Set_Element {
-/*  int     aSlotTime; */
-/*  int     aSifsTime; */
-    s32     aCCATime;
-    s32     aRxTxTurnaroundTime;
-    s32     aTxPLCPDelay;
-    s32     RxPLCPDelay;
-    s32     aRxTxSwitchTime;
-    s32     aTxRampOntime;
-    s32     aTxRampOffTime;
-    s32     aTxRFDelay;
-    s32     aRxRFDelay;
-    s32     aAirPropagationTime;
-    s32     aMACProcessingDelay;
-    s32     aPreambleLength;
-    s32     aPLCPHeaderLength;
-    s32     aMPDUDurationFactor;
-    s32     aMPDUMaxLength;
-/*  int     aCWmin; */
-/*  int     aCWmax; */
-};
-
-/* --  11G  -- */
-struct ERP_Information_Element {
-    u8  Element_ID;
-    u8  Length;
-    #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */
-        u8      Reserved:5;   /* 20060926 add by anson */
-        u8      Barker_Preamble_Mode:1;
-        u8      Use_Protection:1;
-       u8       NonERP_Present:1;
-    #else
-        u8      NonERP_Present:1;
-        u8      Use_Protection:1;
-        u8      Barker_Preamble_Mode:1;
-        u8      Reserved:5;
-    #endif
-};
-
-struct Extended_Supported_Rates_Element {
-    u8  Element_ID;
-    u8  Length;
-    u8  ExtendedSupportedRates[255];
-} __attribute__ ((packed));
-
-/* WPA(802.11i draft 3.0) */
-#define VERSION_WPA                             1
-#ifdef _WPA2_
-#define VERSION_WPA2            1
-#endif /* end def  _WPA2_ */
-/* WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type */
-#define OUI_WPA                                 0x00F25000
-#ifdef _WPA2_
-/* for wpa2 change to 0x00ACOF04 by Ws 26/04/04 */
-#define OUI_WPA2                                0x00AC0F00
-#endif /* end def _WPA2_ */
-
-#define OUI_WPA_ADDITIONAL              0x01
-#define WLAN_MIN_RSN_WPA_LENGTH                 6 /* added by ws 09/10/04 */
-#ifdef _WPA2_
-#define WLAN_MIN_RSN_WPA2_LENGTH                2 /* Fix to 2 09/14/05 */
-#endif /* end def _WPA2_ */
-
-#define oui_wpa                  (u32)(OUI_WPA|OUI_WPA_ADDITIONAL)
-
-#define WPA_OUI_BIG    ((u32) 0x01F25000)/* added by ws 09/23/04 */
-#define WPA_OUI_LITTLE  ((u32) 0x01F25001)/* added by ws 09/23/04 */
-/* 20061108 For WPS. It's little endian. Big endian is 0x0050F204 */
-#define WPA_WPS_OUI                             cpu_to_le32(0x04F25000)
-
-/* -----WPA2----- */
-#ifdef _WPA2_
-#define WPA2_OUI_BIG    ((u32)0x01AC0F00)
-#define WPA2_OUI_LITTLE ((u32)0x01AC0F01)
-#endif /* end def _WPA2_ */
-
-/* Authentication suite */
-#define OUI_AUTH_WPA_NONE           0x00 /* for WPA_NONE */
-#define OUI_AUTH_8021X                          0x01
-#define OUI_AUTH_PSK                            0x02
-/* Cipher suite */
-#define OUI_CIPHER_GROUP_KEY        0x00  /* added by ws 05/21/04 */
-#define OUI_CIPHER_WEP_40                       0x01
-#define OUI_CIPHER_TKIP                         0x02
-#define OUI_CIPHER_CCMP                         0x04
-#define OUI_CIPHER_WEP_104                      0x05
-
-struct suite_selector{
-        union{
-                u8      Value[4];
-                struct _SUIT_ {
-                        u8      OUI[3];
-                        u8      Type;
-                } SuitSelector;
-        };
-};
-
-/* --  WPA  -- */
-struct  RSN_Information_Element{
-        u8                                      Element_ID;
-        u8                                      Length;
- /* WPA version 2.0 additional field, and should be 00:50:F2:01 */
-        struct suite_selector   OuiWPAAdditional;
-        u16                                     Version;
-        struct suite_selector           GroupKeySuite;
-        u16                                     PairwiseKeySuiteCount;
-        struct suite_selector           PairwiseKeySuite[1];
-} __attribute__ ((packed));
-struct RSN_Auth_Sub_Information_Element {
-        u16                             AuthKeyMngtSuiteCount;
-        struct suite_selector   AuthKeyMngtSuite[1];
-} __attribute__ ((packed));
-
-/* --  WPA2  -- */
-struct RSN_Capability_Element {
-  union {
-        u16     __attribute__ ((packed))        wValue;
-    #ifdef _BIG_ENDIAN_  /* 20060927 add by anson's endian */
-    struct _RSN_Capability {
-        u16   __attribute__ ((packed))  Reserved2:8; /* 20051201 */
-        u16   __attribute__ ((packed))  Reserved1:2;
-        u16   __attribute__ ((packed))  GTK_Replay_Counter:2;
-        u16   __attribute__ ((packed))  PTK_Replay_Counter:2;
-        u16   __attribute__ ((packed))  No_Pairwise:1;
-        u16   __attribute__ ((packed))  Pre_Auth:1;
-    } __attribute__ ((packed))  RSN_Capability;
-    #else
-    struct _RSN_Capability {
-        u16   __attribute__ ((packed))  Pre_Auth:1;
-        u16   __attribute__ ((packed))  No_Pairwise:1;
-        u16   __attribute__ ((packed))  PTK_Replay_Counter:2;
-        u16   __attribute__ ((packed))  GTK_Replay_Counter:2;
-        u16   __attribute__ ((packed))  Reserved1:2;
-        u16   __attribute__ ((packed))  Reserved2:8; /* 20051201 */
-    } __attribute__ ((packed))  RSN_Capability;
-    #endif
-
-  } __attribute__ ((packed)) ;
-} __attribute__ ((packed)) ;
-
-#ifdef _WPA2_
-struct pmkid {
-  u8 pValue[16];
-};
-
-struct  WPA2_RSN_Information_Element {
-        u8                                      Element_ID;
-        u8                                      Length;
-        u16                                     Version;
-        struct suite_selector           GroupKeySuite;
-        u16                                     PairwiseKeySuiteCount;
-        struct suite_selector           PairwiseKeySuite[1];
-
-} __attribute__ ((packed));
-
-struct WPA2_RSN_Auth_Sub_Information_Element {
-        u16                             AuthKeyMngtSuiteCount;
-        struct suite_selector   AuthKeyMngtSuite[1];
-} __attribute__ ((packed));
-
-
-struct PMKID_Information_Element {
-        u16                             PMKID_Count;
-        struct pmkid pmkid[16];
-} __attribute__ ((packed));
-
-#endif /* enddef _WPA2_ */
-/*============================================================
-// MAC Frame structure (different type) and subfield structure
-//============================================================*/
-struct MAC_frame_control {
-/* a combination of the [Protocol Version, Control Type, Control Subtype]*/
-    u8    mac_frame_info;
-/* 20060927 add by anson's endian */
-    #ifdef _BIG_ENDIAN_
-    u8    order:1;
-    u8    WEP:1;
-    u8    more_data:1;
-    u8    pwr_mgt:1;
-    u8    retry:1;
-    u8    more_frag:1;
-    u8    from_ds:1;
-    u8    to_ds:1;
-    #else
-    u8    to_ds:1;
-    u8    from_ds:1;
-    u8    more_frag:1;
-    u8    retry:1;
-    u8    pwr_mgt:1;
-    u8    more_data:1;
-    u8    WEP:1;
-    u8    order:1;
-    #endif
-} __attribute__ ((packed));
-
-struct Management_Frame {
-/* 2B, ToDS,FromDS,MoreFrag,MoreData,Order=0 */
-    struct MAC_frame_control frame_control;
-    u16         duration;
-    u8          DA[MAC_ADDR_LENGTH];                    /* Addr1 */
-    u8          SA[MAC_ADDR_LENGTH];                    /* Addr2 */
-    u8          BSSID[MAC_ADDR_LENGTH];                 /* Addr3 */
-    u16         Sequence_Control;
-    /* Management Frame Body <= 325 bytes */
-    /* FCS 4 bytes */
-} __attribute__ ((packed));
-
-/* SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it. */
-struct Control_Frame {
-/* ToDS,FromDS,MoreFrag,Retry,MoreData,WEP,Order=0 */
-    struct MAC_frame_control frame_control;
-    u16         duration;
-    u8          RA[MAC_ADDR_LENGTH];
-    u8          TA[MAC_ADDR_LENGTH];
-    u16         FCS;
-} __attribute__ ((packed));
-
-struct Data_Frame {
-    struct MAC_frame_control frame_control;
-    u16         duration;
-    u8          Addr1[MAC_ADDR_LENGTH];
-    u8          Addr2[MAC_ADDR_LENGTH];
-    u8          Addr3[MAC_ADDR_LENGTH];
-    u16         Sequence_Control;
-    u8          Addr4[MAC_ADDR_LENGTH]; /* only exist when ToDS=FromDS=1 */
-    /* Data Frame Body <= 2312 */
-    /* FCS */
-} __attribute__ ((packed));
-
-struct Disassociation_Frame_Body {
-    u16    reasonCode;
-} __attribute__ ((packed));
-
-struct Association_Request_Frame_Body {
-    u16    capability_information;
-    u16    listenInterval;
-    u8     Current_AP_Address[MAC_ADDR_LENGTH];/* for reassociation only */
-    /*  SSID (2+32 bytes) */
-    /*  Supported_Rates (2+8 bytes) */
-} __attribute__ ((packed));
-
-struct Association_Response_Frame_Body {
-    u16    capability_information;
-    u16    statusCode;
-    u16    Association_ID;
-    struct Supported_Rates_Element supportedRates;
-} __attribute__ ((packed));
-
-/*struct Reassociation_Request_Frame_Body
-{
-    u16    capability_information;
-    u16    listenInterval;
-    u8     Current_AP_Address[MAC_ADDR_LENGTH];
-    // SSID (2+32 bytes)
-    // Supported_Rates (2+8 bytes)
-};*/
-/* eliminated by WS 07/22/04 comboined with associateion request frame. */
-
-struct Reassociation_Response_Frame_Body {
-    u16    capability_information;
-    u16    statusCode;
-    u16    Association_ID;
-    struct Supported_Rates_Element supportedRates;
-} __attribute__ ((packed));
-
-struct Deauthentication_Frame_Body {
-    u16    reasonCode;
-} __attribute__ ((packed));
-
-
-struct Probe_Response_Frame_Body {
-    u16    Timestamp;
-    u16    Beacon_Interval;
-    u16    Capability_Information;
-    /* SSID
-    // Supported_Rates
-    // PHY parameter Set (DS Parameters)
-    // CF parameter Set
-    // IBSS parameter Set */
-} __attribute__ ((packed));
-
-struct Authentication_Frame_Body {
-    u16    algorithmNumber;
-    u16    sequenceNumber;
-    u16    statusCode;
-        /* NB: don't include ChallengeText in this structure
-        // struct Challenge_Text_Element sChallengeTextElement;
-        // wkchen added */
-} __attribute__ ((packed));
-
-
 #endif /* _MAC_Structure_H_ */
-
-
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 9217762b1814..9cfea94bcea5 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -1,9 +1,7 @@
 #include "mds_f.h"
-#include "mlmetxrx_f.h"
 #include "mto.h"
-#include "sysdef.h"
-#include "wbhal_f.h"
-#include "wblinux_f.h"
+#include "wbhal.h"
+#include "wb35tx_f.h"
 
 unsigned char
 Mds_initial(struct wbsoft_priv *adapter)
@@ -17,11 +15,6 @@ Mds_initial(struct wbsoft_priv *adapter)
         return hal_get_tx_buffer(&adapter->sHwData, &pMds->pTxBuffer);
 }
 
-void
-Mds_Destroy(struct wbsoft_priv *adapter)
-{
-}
-
 static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor *pDes,  u8 *buffer)
 {
         struct T00_descriptor *pT00;
@@ -350,9 +343,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *
         ctmp1 = ctmpf = CURRENT_TX_RATE_FOR_MNG;
 
         pDes->TxRate = ctmp1;
-        #ifdef _PE_TX_DUMP_
-        printk("Tx rate =%x\n", ctmp1);
-        #endif
+        pr_debug("Tx rate =%x\n", ctmp1);
 
         pT01->T01_modulation_type = (ctmp1%3) ? 0 : 1;
 
@@ -404,6 +395,44 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *
 
 }
 
+static void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
+{
+        desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
+        desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
+        desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU;
+        desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len;
+        desc->buffer_total_size += adapter->sMlmeFrame.len;
+        desc->buffer_number++;
+        desc->Type = adapter->sMlmeFrame.DataType;
+}
+
+static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
+{
+        int i;
+
+        /* Reclaim the data buffer */
+        for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
+                if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
+                        break;
+        }
+        if (adapter->sMlmeFrame.TxMMPDUInUse[i])
+                adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
+        else  {
+                /* Something wrong
+                 PD43 Add debug code here??? */
+        }
+}
+
+static void MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
+{
+    /* Reclaim the data buffer */
+        adapter->sMlmeFrame.len = 0;
+        MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
+
+        /* Return resource */
+        adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
+}
+
 void
 Mds_Tx(struct wbsoft_priv *adapter)
 {
@@ -430,9 +459,7 @@ Mds_Tx(struct wbsoft_priv *adapter)
         do {
                 FillIndex = pMds->TxFillIndex;
                 if (pMds->TxOwner[FillIndex]) { /* Is owned by software 0:Yes 1:No */
-#ifdef _PE_TX_DUMP_
-                        printk("[Mds_Tx] Tx Owner is H/W.\n");
-#endif
+                        pr_debug("[Mds_Tx] Tx Owner is H/W.\n");
                         break;
                 }
 
@@ -476,9 +503,7 @@ Mds_Tx(struct wbsoft_priv *adapter)
 
                         /* For speed up Key setting */
                         if (pTxDes->EapFix) {
-#ifdef _PE_TX_DUMP_
-                                printk("35: EPA 4th frame detected. Size = %d\n", PacketSize);
-#endif
+                                pr_debug("35: EPA 4th frame detected. Size = %d\n", PacketSize);
                                 pHwData->IsKeyPreSet = 1;
                         }
 
@@ -492,11 +517,6 @@ Mds_Tx(struct wbsoft_priv *adapter)
                         XmitBufSize += CurrentSize;
                         XmitBufAddress += CurrentSize;
 
-#ifdef _IBSS_BEACON_SEQ_STICK_
-                        if ((XmitBufAddress[DOT_11_DA_OFFSET+8] & 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) /* +8 for USB hdr */
-#endif
-                                pMds->TxToggle = true;
-
                         /* Get packet to transmit completed, 1:TESTSTA 2:MLME 3: Ndis data */
                         MLME_SendComplete(adapter, 0, true);
 
@@ -567,9 +587,7 @@ Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pT02)
                                         pHwData->tx_retry_count[RetryCount] += RetryCount;
                                 else
                                         pHwData->tx_retry_count[7] += RetryCount;
-                                #ifdef _PE_STATE_DUMP_
-                                printk("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count);
-                                #endif
+                                pr_debug("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count);
                                 MTO_SetTxCount(adapter, TxRate, RetryCount);
                         }
                         pHwData->dto_tx_frag_count += (RetryCount+1);
diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h
index 7f68deae6d04..ce8be079e957 100644
--- a/drivers/staging/winbond/mds_f.h
+++ b/drivers/staging/winbond/mds_f.h
@@ -1,11 +1,10 @@
 #ifndef __WINBOND_MDS_F_H
 #define __WINBOND_MDS_F_H
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 #include "core.h"
 
 unsigned char Mds_initial(struct wbsoft_priv *adapter);
-void Mds_Destroy(struct wbsoft_priv *adapter);
 void Mds_Tx(struct wbsoft_priv *adapter);
 void Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pt02);
 void Mds_MpduProcess(struct wbsoft_priv *adapter, struct wb35_descriptor *prxdes);
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index e2de4bd23b4d..eeedf0186365 100644
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -107,10 +107,6 @@ struct wb35_mds {
         u8      TxRate[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)][2]; /* [0] current tx rate, [1] fall back rate */
         u8      TxInfo[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)]; /*Store information for callback function */
 
-        /* for scanning mechanism */
-        u8      TxToggle;       /* It is TRUE if there are tx activities in some time interval */
-        u8      Reserved_[3];
-
         /* ---- for Tx Parameter */
         u16     TxFragmentThreshold;    /* For frame body only */
         u16     TxRTSThreshold;
diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
deleted file mode 100644
index 7425a23f12e8..000000000000
--- a/drivers/staging/winbond/mlmetxrx.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ============================================================================
-  Module Name:
-    MLMETxRx.C
-
-  Description:
-    The interface between MDS (MAC Data Service) and MLME.
-
-  Revision History:
-  --------------------------------------------------------------------------
-                200209      UN20 Jennifer Xu
-                Initial Release
-                20021108    PD43 Austin Liu
-                20030117    PD43 Austin Liu
-                Deleted MLMEReturnPacket and MLMEProcThread()
-
-  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
-============================================================================ */
-#include "sysdef.h"
-
-#include "mds_f.h"
-
-void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
-{
-        desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
-        desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
-        desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU;
-        desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len;
-        desc->buffer_total_size += adapter->sMlmeFrame.len;
-        desc->buffer_number++;
-        desc->Type = adapter->sMlmeFrame.DataType;
-}
-
-static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
-{
-        int i;
-
-        /* Reclaim the data buffer */
-        for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
-                if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
-                        break;
-        }
-        if (adapter->sMlmeFrame.TxMMPDUInUse[i])
-                adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
-        else  {
-                /* Something wrong
-                 PD43 Add debug code here??? */
-        }
-}
-
-void
-MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
-{
-    /* Reclaim the data buffer */
-        adapter->sMlmeFrame.len = 0;
-        MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
-
-        /* Return resource */
-        adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
-}
-
-
-
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
deleted file mode 100644
index 012507fc49e3..000000000000
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ================================================================
-// MLMETxRx.H --
-//
-//   Functions defined in MLMETxRx.c.
-//
-// Copyright (c) 2002 Winbond Electrics Corp. All Rights Reserved.
-//================================================================ */
-#ifndef _MLMETXRX_H
-#define _MLMETXRX_H
-
-#include "core.h"
-
-void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes);
-
-void
-MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
-                  unsigned char SendOK);
-
-#ifdef _IBSS_BEACON_SEQ_STICK_
-s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx);
-#endif
-
-#endif
diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c
index 9cd212783d61..c03e5010ca34 100644
--- a/drivers/staging/winbond/mto.c
+++ b/drivers/staging/winbond/mto.c
@@ -17,9 +17,10 @@
  * ============================================================================
  */
 
-#include "sysdef.h"
 #include "sme_api.h"
-#include "wbhal_f.h"
+#include "wbhal.h"
+#include "wb35reg_f.h"
+#include "core.h"
 
 /* Declare SQ3 to rate and fragmentation threshold table */
 /* Declare fragmentation thresholds table */
diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c
index 2b375ba3812a..09844db64fe9 100644
--- a/drivers/staging/winbond/phy_calibration.c
+++ b/drivers/staging/winbond/phy_calibration.c
@@ -10,9 +10,10 @@
  */
 
 /****************** INCLUDE FILES SECTION ***********************************/
-#include "sysdef.h"
 #include "phy_calibration.h"
-#include "wbhal_f.h"
+#include "wbhal.h"
+#include "wb35reg_f.h"
+#include "core.h"
 
 
 /****************** DEBUG CONSTANT AND MACRO SECTION ************************/
diff --git a/drivers/staging/winbond/phy_calibration.h b/drivers/staging/winbond/phy_calibration.h
index 303203148839..84f6e840a47a 100644
--- a/drivers/staging/winbond/phy_calibration.h
+++ b/drivers/staging/winbond/phy_calibration.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_PHY_CALIBRATION_H
 #define __WINBOND_PHY_CALIBRATION_H
 
-#include "wbhal_f.h"
+#include "wbhal.h"
 
 #define REG_AGC_CTRL1           0x1000
 #define REG_AGC_CTRL2           0x1004
diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c
index 990f9d4bdbbd..1b38d6d225c9 100644
--- a/drivers/staging/winbond/reg.c
+++ b/drivers/staging/winbond/reg.c
@@ -1,5 +1,6 @@
-#include "sysdef.h"
-#include "wbhal_f.h"
+#include "wbhal.h"
+#include "wb35reg_f.h"
+#include "core.h"
 
 /*
  * ====================================================
@@ -1010,9 +1011,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)
         case RF_AIROHA_7230:
                 /* Start to fill RF parameters, PLL_ON should be pulled low. */
                 Wb35Reg_WriteSync(pHwData, 0x03dc, 0x00000000);
-                #ifdef _PE_STATE_DUMP_
-                printk("* PLL_ON    low\n");
-                #endif
+                pr_debug("* PLL_ON    low\n");
                 number = ARRAY_SIZE(al7230_rf_data_24);
                 Set_ChanIndep_RfData_al7230_24(pHwData, pltmp, number);
                 break;
@@ -1098,9 +1097,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)
         case RF_AIROHA_7230:
                 /* RF parameters have filled completely, PLL_ON should be pulled high */
                 Wb35Reg_WriteSync(pHwData, 0x03dc, 0x00000080);
-                #ifdef _PE_STATE_DUMP_
-                printk("* PLL_ON    high\n");
-                #endif
+                pr_debug("* PLL_ON    high\n");
 
                 /* 2.4GHz */
                 ltmp = (1 << 31) | (0 << 30) | (24 << 24) | 0x9ABA8F;
@@ -1115,9 +1112,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)
 
                 /* 5GHz */
                 Wb35Reg_WriteSync(pHwData, 0x03dc, 0x00000000);
-                #ifdef _PE_STATE_DUMP_
-                printk("* PLL_ON    low\n");
-                #endif
+                pr_debug("* PLL_ON    low\n");
 
                 number = ARRAY_SIZE(al7230_rf_data_50);
                 Set_ChanIndep_RfData_al7230_50(pHwData, pltmp, number);
@@ -1127,9 +1122,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)
                 msleep(5);
 
                 Wb35Reg_WriteSync(pHwData, 0x03dc, 0x00000080);
-                #ifdef _PE_STATE_DUMP_
-                printk("* PLL_ON    high\n");
-                #endif
+                pr_debug("* PLL_ON    high\n");
 
                 ltmp = (1 << 31) | (0 << 30) | (24 << 24) | 0x9ABA8F;
                 Wb35Reg_WriteSync(pHwData, 0x0864, ltmp);
@@ -1795,9 +1788,7 @@ void RFSynthesizer_SwitchingChannel(struct hw_data *pHwData,  struct chan_info C
 
                         /* Write to register. number must less and equal than 16 */
                         Wb35Reg_BurstWrite(pHwData, 0x0864, pltmp, number, NO_INCREMENT);
-                        #ifdef _PE_STATE_DUMP_
-                        printk("Band changed\n");
-                        #endif
+                        pr_debug("Band changed\n");
                 }
 
                 if (Channel.band <= BAND_TYPE_OFDM_24) { /* channel 1 ~ 14 */
@@ -2073,11 +2064,7 @@ void Mxx_initial(struct hw_data *pHwData)
          */
 
         /* M00 bit set */
-        #ifdef _IBSS_BEACON_SEQ_STICK_
-        reg->M00_MacControl = 0; /* Solve beacon sequence number stop by software */
-        #else
         reg->M00_MacControl = 0x80000000; /* Solve beacon sequence number stop by hardware */
-        #endif
 
         /* M24 disable enter power save, BB RxOn and enable NAV attack */
         reg->M24_MacControl = 0x08040042;
@@ -2336,13 +2323,6 @@ void EEPROMTxVgaAdjust(struct hw_data *pHwData)
                 pHwData->TxVgaFor50[32].TxVgaValue = pTxVga[17] - stmp * 2 / 4;
                 pHwData->TxVgaFor50[31].TxVgaValue = pTxVga[17] - stmp * 3 / 4;
         }
-
-        #ifdef _PE_STATE_DUMP_
-        printk(" TxVgaFor24 :\n");
-        DataDmp((u8 *)pHwData->TxVgaFor24, 14 , 0);
-        printk(" TxVgaFor50 :\n");
-        DataDmp((u8 *)pHwData->TxVgaFor50, 70 , 0);
-        #endif
 }
 
 void BBProcessor_RateChanging(struct hw_data *pHwData,  u8 rate)
diff --git a/drivers/staging/winbond/sysdef.h b/drivers/staging/winbond/sysdef.h
deleted file mode 100644
index d0d71f69bc8c..000000000000
--- a/drivers/staging/winbond/sysdef.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Winbond WLAN System Configuration defines */
-
-#ifndef SYS_DEF_H
-#define SYS_DEF_H
-
-#include <linux/delay.h>
-
-#define WB_LINUX
-#define WB_LINUX_WPA_PSK
-
-#define _USE_FALLBACK_RATE_
-
-#define _WPA2_
-
-#ifndef _WPA_PSK_DEBUG
-#undef  _WPA_PSK_DEBUG
-#endif
-
-/* debug print options, mark what debug you don't need */
-
-#ifdef FULL_DEBUG
-#define _PE_STATE_DUMP_
-#define _PE_TX_DUMP_
-#define _PE_RX_DUMP_
-#define _PE_OID_DUMP_
-#define _PE_DTO_DUMP_
-#define _PE_REG_DUMP_
-#define _PE_USB_INI_DUMP_
-#endif
-
-#endif
diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c
index 770722385eeb..42ae61014522 100644
--- a/drivers/staging/winbond/wb35reg.c
+++ b/drivers/staging/winbond/wb35reg.c
@@ -1,4 +1,3 @@
-#include "sysdef.h"
 #include "wb35reg_f.h"
 
 #include <linux/usb.h>
@@ -140,8 +139,8 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg
 
         /* Sync IoCallDriver */
         reg->EP0vm_state = VM_RUNNING;
-        ret = usb_control_msg(pHwData->WbUsb.udev,
-                               usb_sndctrlpipe(pHwData->WbUsb.udev, 0),
+        ret = usb_control_msg(pHwData->udev,
+                               usb_sndctrlpipe(pHwData->udev, 0),
                                0x03, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
                                0x0, RegisterNo, &RegisterValue, 4, HZ * 100);
         reg->EP0vm_state = VM_STOP;
@@ -150,9 +149,7 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg
         Wb35Reg_EP0VM_start(pHwData);
 
         if (ret < 0) {
-#ifdef _PE_REG_DUMP_
-                printk("EP0 Write register usb message sending error\n");
-#endif
+                pr_debug("EP0 Write register usb message sending error\n");
                 pHwData->SurpriseRemove = 1;
                 return false;
         }
@@ -305,8 +302,8 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe
                 msleep(10);
 
         reg->EP0vm_state = VM_RUNNING;
-        ret = usb_control_msg(pHwData->WbUsb.udev,
-                               usb_rcvctrlpipe(pHwData->WbUsb.udev, 0),
+        ret = usb_control_msg(pHwData->udev,
+                               usb_rcvctrlpipe(pHwData->udev, 0),
                                0x01, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                                0x0, RegisterNo, pltmp, 4, HZ * 100);
 
@@ -320,9 +317,7 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe
         Wb35Reg_EP0VM_start(pHwData);
 
         if (ret < 0) {
-#ifdef _PE_REG_DUMP_
-                printk("EP0 Read register usb message sending error\n");
-#endif
+                pr_debug("EP0 Read register usb message sending error\n");
                 pHwData->SurpriseRemove = 1;
                 return false;
         }
@@ -432,8 +427,8 @@ void Wb35Reg_EP0VM(struct hw_data *pHwData)
         if (reg_queue->DIRECT == 1) /* output */
                 pBuffer = &reg_queue->VALUE;
 
-        usb_fill_control_urb(urb, pHwData->WbUsb.udev,
-                              REG_DIRECTION(pHwData->WbUsb.udev, reg_queue),
+        usb_fill_control_urb(urb, pHwData->udev,
+                              REG_DIRECTION(pHwData->udev, reg_queue),
                               (u8 *)dr, pBuffer, cpu_to_le16(dr->wLength),
                               Wb35Reg_EP0VM_complete, (void *)pHwData);
 
@@ -442,9 +437,7 @@ void Wb35Reg_EP0VM(struct hw_data *pHwData)
         ret = usb_submit_urb(urb, GFP_ATOMIC);
 
         if (ret < 0) {
-#ifdef _PE_REG_DUMP_
-                printk("EP0 Irp sending error\n");
-#endif
+                pr_debug("EP0 Irp sending error\n");
                 goto cleanup;
         }
         return;
@@ -479,9 +472,7 @@ void Wb35Reg_EP0VM_complete(struct urb *urb)
                 spin_unlock_irq(&reg->EP0VM_spin_lock);
 
                 if (reg->EP0VM_status) {
-#ifdef _PE_REG_DUMP_
-                        printk("EP0 IoCompleteRoutine return error\n");
-#endif
+                        pr_debug("EP0 IoCompleteRoutine return error\n");
                         reg->EP0vm_state = VM_STOP;
                         pHwData->SurpriseRemove = 1;
                 } else {
@@ -526,9 +517,7 @@ void Wb35Reg_destroy(struct hw_data *pHwData)
                         usb_free_urb(urb);
                         kfree(reg_queue);
                 } else {
-#ifdef _PE_REG_DUMP_
-                        printk("EP0 queue release error\n");
-#endif
+                        pr_debug("EP0 queue release error\n");
                 }
                 spin_lock_irq(&reg->EP0VM_spin_lock);
 
diff --git a/drivers/staging/winbond/wb35reg_f.h b/drivers/staging/winbond/wb35reg_f.h
index bf23c1084199..95dc98096845 100644
--- a/drivers/staging/winbond/wb35reg_f.h
+++ b/drivers/staging/winbond/wb35reg_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35REG_F_H
 #define __WINBOND_WB35REG_F_H
 
-#include "wbhal_s.h"
+#include "wbhal.h"
 
 /*
  * ====================================
diff --git a/drivers/staging/winbond/wb35reg_s.h b/drivers/staging/winbond/wb35reg_s.h
index 4eff009444b8..eb274ffdd1ba 100644
--- a/drivers/staging/winbond/wb35reg_s.h
+++ b/drivers/staging/winbond/wb35reg_s.h
@@ -5,6 +5,8 @@
 #include <linux/types.h>
 #include <asm/atomic.h>
 
+struct hw_data;
+
 /* =========================================================================
  *
  *                      HAL setting function
@@ -49,11 +51,7 @@
 #define DEFAULT_CWMAX                   1023    /* (M2C) CWmax. Its value is in the range 0-1023. */
 #define DEFAULT_AID                     1       /* (M34) AID. Its value is in the range 1-2007. */
 
-#ifdef _USE_FALLBACK_RATE_
 #define DEFAULT_RATE_RETRY_LIMIT        2       /* (M38) as named */
-#else
-#define DEFAULT_RATE_RETRY_LIMIT        7       /* (M38) as named */
-#endif
 
 #define DEFAULT_LONG_RETRY_LIMIT        7       /* (M38) LongRetryLimit. Its value is in the range 0-15. */
 #define DEFAULT_SHORT_RETRY_LIMIT       7       /* (M38) ShortRetryLimit. Its value is in the range 0-15. */
@@ -168,4 +166,75 @@ struct wb35_reg {
         u32     SQ3_filter[MAX_SQ3_FILTER_SIZE];
         u32     SQ3_index;
 };
+
+/* =====================================================================
+ * Function declaration
+ * =====================================================================
+ */
+void hal_remove_mapping_key(struct hw_data *hw_data, u8 *mac_addr);
+void hal_remove_default_key(struct hw_data *hw_data, u32 index);
+unsigned char hal_set_mapping_key(struct hw_data *adapter, u8 *mac_addr,
+                                  u8 null_key, u8 wep_on, u8 *tx_tsc,
+                                  u8 *rx_tsc, u8 key_type, u8 key_len,
+                                  u8 *key_data);
+unsigned char hal_set_default_key(struct hw_data *adapter, u8 index,
+                                  u8 null_key, u8 wep_on, u8 *tx_tsc,
+                                  u8 *rx_tsc, u8 key_type, u8 key_len,
+                                  u8 *key_data);
+void hal_clear_all_default_key(struct hw_data *hw_data);
+void hal_clear_all_group_key(struct hw_data *hw_data);
+void hal_clear_all_mapping_key(struct hw_data *hw_data);
+void hal_clear_all_key(struct hw_data *hw_data);
+void hal_set_power_save_mode(struct hw_data *hw_data, unsigned char power_save,
+                             unsigned char wakeup, unsigned char dtim);
+void hal_get_power_save_mode(struct hw_data *hw_data, u8 *in_pwr_save);
+void hal_set_slot_time(struct hw_data *hw_data, u8 type);
+
+#define hal_set_atim_window(_A, _ATM)
+
+void hal_start_bss(struct hw_data *hw_data, u8 mac_op_mode);
+
+/* 0:BSS STA 1:IBSS STA */
+void hal_join_request(struct hw_data *hw_data, u8 bss_type);
+
+void hal_stop_sync_bss(struct hw_data *hw_data);
+void hal_resume_sync_bss(struct hw_data *hw_data);
+void hal_set_aid(struct hw_data *hw_data, u16 aid);
+void hal_set_bssid(struct hw_data *hw_data, u8 *bssid);
+void hal_get_bssid(struct hw_data *hw_data, u8 *bssid);
+void hal_set_listen_interval(struct hw_data *hw_data, u16 listen_interval);
+void hal_set_cap_info(struct hw_data *hw_data, u16 capability_info);
+void hal_set_ssid(struct hw_data *hw_data, u8 *ssid, u8 ssid_len);
+void hal_start_tx0(struct hw_data *hw_data);
+
+#define hal_get_cwmin(_A)       ((_A)->cwmin)
+
+void hal_set_cwmax(struct hw_data *hw_data, u16 cwin_max);
+
+#define hal_get_cwmax(_A)       ((_A)->cwmax)
+
+void hal_set_rsn_wpa(struct hw_data *hw_data, u32 *rsn_ie_bitmap,
+                     u32 *rsn_oui_type , unsigned char desired_auth_mode);
+void hal_set_connect_info(struct hw_data *hw_data, unsigned char bo_connect);
+u8 hal_get_est_sq3(struct hw_data *hw_data, u8 count);
+void hal_descriptor_indicate(struct hw_data *hw_data,
+                             struct wb35_descriptor *des);
+u8 hal_get_antenna_number(struct hw_data *hw_data);
+u32 hal_get_bss_pk_cnt(struct hw_data *hw_data);
+
+#define hal_get_region_from_EEPROM(_A)  ((_A)->reg.EEPROMRegion)
+#define hal_get_tx_buffer(_A, _B)       Wb35Tx_get_tx_buffer(_A, _B)
+#define hal_software_set(_A)            (_A->SoftwareSet)
+#define hal_driver_init_OK(_A)          (_A->IsInitOK)
+#define hal_rssi_boundary_high(_A)      (_A->RSSI_high)
+#define hal_rssi_boundary_low(_A)       (_A->RSSI_low)
+#define hal_scan_interval(_A)           (_A->Scan_Interval)
+
+#define PHY_DEBUG(msg, args...)
+
+/* return 100ms count */
+#define hal_get_time_count(_P)          (_P->time_count / 10)
+
+#define hal_ibss_disconnect(_A)         (hal_stop_sync_bss(_A))
+
 #endif
diff --git a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c
index 448514aada44..f118eeba396a 100644
--- a/drivers/staging/winbond/wb35rx.c
+++ b/drivers/staging/winbond/wb35rx.c
@@ -14,7 +14,6 @@
 #include <linux/slab.h>
 
 #include "core.h"
-#include "sysdef.h"
 #include "wb35rx_f.h"
 
 static void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int PacketSize)
@@ -109,10 +108,7 @@ static u16 Wb35Rx_indicate(struct ieee80211_hw *hw)
 
                         /* Basic check for Rx length. Is length valid? */
                         if (PacketSize > MAX_PACKET_SIZE) {
-#ifdef _PE_RX_DUMP_
-                                printk("Serious ERROR : Rx data size too long, size =%d\n", PacketSize);
-#endif
-
+                                pr_debug("Serious ERROR : Rx data size too long, size =%d\n", PacketSize);
                                 pWb35Rx->EP3vm_state = VM_STOP;
                                 pWb35Rx->Ep3ErrorCount2++;
                                 break;
@@ -174,7 +170,7 @@ static void Wb35Rx_Complete(struct urb *urb)
         /* The IRP is completed */
         pWb35Rx->EP3vm_state = VM_COMPLETED;
 
-        if (pHwData->SurpriseRemove || pHwData->HwStop) /* Must be here, or RxBufferId is invalid */
+        if (pHwData->SurpriseRemove) /* Must be here, or RxBufferId is invalid */
                 goto error;
 
         if (pWb35Rx->rx_halt)
@@ -186,9 +182,7 @@ static void Wb35Rx_Complete(struct urb *urb)
 
         /* The URB is completed, check the result */
         if (pWb35Rx->EP3VM_status != 0) {
-#ifdef _PE_USB_STATE_DUMP_
-                printk("EP3 IoCompleteRoutine return error\n");
-#endif
+                pr_debug("EP3 IoCompleteRoutine return error\n");
                 pWb35Rx->EP3vm_state = VM_STOP;
                 goto error;
         }
@@ -239,7 +233,7 @@ static void Wb35Rx(struct ieee80211_hw *hw)
         u32                     RxBufferId;
 
         /* Issuing URB */
-        if (pHwData->SurpriseRemove || pHwData->HwStop)
+        if (pHwData->SurpriseRemove)
                 goto error;
 
         if (pWb35Rx->rx_halt)
@@ -249,9 +243,7 @@ static void Wb35Rx(struct ieee80211_hw *hw)
         RxBufferId = pWb35Rx->RxBufferId;
         if (!pWb35Rx->RxOwner[RxBufferId]) {
                 /* It's impossible to run here. */
-#ifdef _PE_RX_DUMP_
-                printk("Rx driver fifo unavailable\n");
-#endif
+                pr_debug("Rx driver fifo unavailable\n");
                 goto error;
         }
 
@@ -268,8 +260,8 @@ static void Wb35Rx(struct ieee80211_hw *hw)
         }
         pRxBufferAddress = pWb35Rx->pDRx;
 
-        usb_fill_bulk_urb(urb, pHwData->WbUsb.udev,
-                          usb_rcvbulkpipe(pHwData->WbUsb.udev, 3),
+        usb_fill_bulk_urb(urb, pHwData->udev,
+                          usb_rcvbulkpipe(pHwData->udev, 3),
                           pRxBufferAddress, MAX_USB_RX_BUFFER,
                           Wb35Rx_Complete, hw);
 
@@ -337,9 +329,7 @@ void Wb35Rx_stop(struct hw_data *pHwData)
         /* Canceling the Irp if already sends it out. */
         if (pWb35Rx->EP3vm_state == VM_RUNNING) {
                 usb_unlink_urb(pWb35Rx->RxUrb); /* Only use unlink, let Wb35Rx_destroy to free them */
-#ifdef _PE_RX_DUMP_
-                printk("EP3 Rx stop\n");
-#endif
+                pr_debug("EP3 Rx stop\n");
         }
 }
 
@@ -355,8 +345,6 @@ void Wb35Rx_destroy(struct hw_data *pHwData)
 
         if (pWb35Rx->RxUrb)
                 usb_free_urb(pWb35Rx->RxUrb);
-#ifdef _PE_RX_DUMP_
-        printk("Wb35Rx_destroy OK\n");
-#endif
+        pr_debug("Wb35Rx_destroy OK\n");
 }
 
diff --git a/drivers/staging/winbond/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h
index 98acce517d90..1fdf65ea6041 100644
--- a/drivers/staging/winbond/wb35rx_f.h
+++ b/drivers/staging/winbond/wb35rx_f.h
@@ -2,7 +2,7 @@
 #define __WINBOND_WB35RX_F_H
 
 #include <net/mac80211.h>
-#include "wbhal_s.h"
+#include "wbhal.h"
 
 //====================================
 // Interface function declare
diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c
index 2a9d05557678..44fc3fe79b79 100644
--- a/drivers/staging/winbond/wb35tx.c
+++ b/drivers/staging/winbond/wb35tx.c
@@ -13,7 +13,6 @@
 
 #include "wb35tx_f.h"
 #include "mds_f.h"
-#include "sysdef.h"
 
 unsigned char
 Wb35Tx_get_tx_buffer(struct hw_data * pHwData, u8 **pBuffer)
@@ -41,7 +40,7 @@ static void Wb35Tx_complete(struct urb * pUrb)
         pWb35Tx->TxSendIndex++;
         pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER;
 
-        if (pHwData->SurpriseRemove || pHwData->HwStop) // Let WbWlanHalt to handle surprise remove
+        if (pHwData->SurpriseRemove) // Let WbWlanHalt to handle surprise remove
                 goto error;
 
         if (pWb35Tx->tx_halt)
@@ -74,7 +73,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter)
         u32             SendIndex;
 
 
-        if (pHwData->SurpriseRemove || pHwData->HwStop)
+        if (pHwData->SurpriseRemove)
                 goto cleanup;
 
         if (pWb35Tx->tx_halt)
@@ -89,8 +88,8 @@ static void Wb35Tx(struct wbsoft_priv *adapter)
         //
         // Issuing URB
         //
-        usb_fill_bulk_urb(pUrb, pHwData->WbUsb.udev,
-                          usb_sndbulkpipe(pHwData->WbUsb.udev, 4),
+        usb_fill_bulk_urb(pUrb, pHwData->udev,
+                          usb_sndbulkpipe(pHwData->udev, 4),
                           pTxBufferAddress, pMds->TxBufferSize[ SendIndex ],
                           Wb35Tx_complete, adapter);
 
@@ -153,16 +152,12 @@ void Wb35Tx_stop(struct hw_data * pHwData)
         // Trying to canceling the Trp of EP2
         if (pWb35Tx->EP2vm_state == VM_RUNNING)
                 usb_unlink_urb( pWb35Tx->Tx2Urb ); // Only use unlink, let Wb35Tx_destrot to free them
-        #ifdef _PE_TX_DUMP_
-        printk("EP2 Tx stop\n");
-        #endif
+        pr_debug("EP2 Tx stop\n");
 
         // Trying to canceling the Irp of EP4
         if (pWb35Tx->EP4vm_state == VM_RUNNING)
                 usb_unlink_urb( pWb35Tx->Tx4Urb ); // Only use unlink, let Wb35Tx_destrot to free them
-        #ifdef _PE_TX_DUMP_
-        printk("EP4 Tx stop\n");
-        #endif
+        pr_debug("EP4 Tx stop\n");
 }
 
 //======================================================
@@ -182,9 +177,7 @@ void Wb35Tx_destroy(struct hw_data * pHwData)
         if (pWb35Tx->Tx2Urb)
                 usb_free_urb( pWb35Tx->Tx2Urb );
 
-        #ifdef _PE_TX_DUMP_
-        printk("Wb35Tx_destroy OK\n");
-        #endif
+        pr_debug("Wb35Tx_destroy OK\n");
 }
 
 void Wb35Tx_CurrentTime(struct wbsoft_priv *adapter, u32 TimeCount)
@@ -222,7 +215,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
         pWb35Tx->EP2VM_status = pUrb->status;
 
         // For Linux 2.4. Interrupt will always trigger
-        if (pHwData->SurpriseRemove || pHwData->HwStop) // Let WbWlanHalt to handle surprise remove
+        if (pHwData->SurpriseRemove) // Let WbWlanHalt to handle surprise remove
                 goto error;
 
         if (pWb35Tx->tx_halt)
@@ -263,7 +256,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)
         u32 *   pltmp = (u32 *)pWb35Tx->EP2_buf;
         int             retv;
 
-        if (pHwData->SurpriseRemove || pHwData->HwStop)
+        if (pHwData->SurpriseRemove)
                 goto error;
 
         if (pWb35Tx->tx_halt)
@@ -272,16 +265,14 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)
         //
         // Issuing URB
         //
-        usb_fill_int_urb( pUrb, pHwData->WbUsb.udev, usb_rcvintpipe(pHwData->WbUsb.udev,2),
+        usb_fill_int_urb( pUrb, pHwData->udev, usb_rcvintpipe(pHwData->udev,2),
                           pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, adapter, 32);
 
         pWb35Tx->EP2vm_state = VM_RUNNING;
         retv = usb_submit_urb(pUrb, GFP_ATOMIC);
 
         if (retv < 0) {
-                #ifdef _PE_TX_DUMP_
-                printk("EP2 Tx Irp sending error\n");
-                #endif
+                pr_debug("EP2 Tx Irp sending error\n");
                 goto error;
         }
 
diff --git a/drivers/staging/winbond/wb35tx_f.h b/drivers/staging/winbond/wb35tx_f.h
index 1d3b515f83bc..018fd35e815d 100644
--- a/drivers/staging/winbond/wb35tx_f.h
+++ b/drivers/staging/winbond/wb35tx_f.h
@@ -2,7 +2,6 @@
 #define __WINBOND_WB35TX_F_H
 
 #include "core.h"
-#include "wbhal_f.h"
 
 /*
  * ====================================
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal.h
index 821a1b3f1301..39e84a0d9729 100644
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal.h
@@ -342,9 +342,6 @@ struct wb35_descriptor { /* Skip length = 8 DWORD */
         void    *buffer_address[MAX_DESCRIPTOR_BUFFER_INDEX];
 };
 
-
-#define DEFAULT_NULL_PACKET_COUNT       180000  /* 180 seconds */
-
 #define MAX_TXVGA_EEPROM                9       /* How many word(u16) of EEPROM will be used for TxVGA */
 #define MAX_RF_PARAMETER                32
 
@@ -359,7 +356,6 @@ struct txvga_for_50 {
  * ==============================================
  */
 
-#include "wbusb_s.h"
 #include "wb35reg_s.h"
 #include "wb35tx_s.h"
 #include "wb35rx_s.h"
@@ -440,7 +436,7 @@ struct hw_data {
          * Variable for each module
          * ==================================================
          */
-        struct wb_usb           WbUsb;  /* Need WbUsb.h */
+        struct usb_device       *udev;
         struct wb35_reg         reg;    /* Need Wb35Reg.h */
         struct wb35_tx          Wb35Tx; /* Need Wb35Tx.h */
         struct wb35_rx          Wb35Rx; /* Need Wb35Rx.h */
@@ -510,16 +506,8 @@ struct hw_data {
         u32             RxByteCountLast;
         u32             TxByteCountLast;
 
-        atomic_t        SurpriseRemoveCount;
-
         /* For global timer */
         u32             time_count;     /* TICK_TIME_100ms 1 = 100ms */
-
-        /* For error recover */
-        u32             HwStop;
-
-        /* For avoid AP disconnect */
-        u32             NullPacketCount;
 };
 
 #endif
diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h
deleted file mode 100644
index fc78c14ae583..000000000000
--- a/drivers/staging/winbond/wbhal_f.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * =====================================================================
- * Device related include
- * =====================================================================
-*/
-#include "wb35reg_f.h"
-#include "wb35tx_f.h"
-#include "wb35rx_f.h"
-
-#include "core.h"
-
-/* =====================================================================
- * Function declaration
- * =====================================================================
- */
-void hal_remove_mapping_key(struct hw_data *hw_data, u8 *mac_addr);
-void hal_remove_default_key(struct hw_data *hw_data, u32 index);
-unsigned char hal_set_mapping_key(struct hw_data *adapter, u8 *mac_addr,
-                                  u8 null_key, u8 wep_on, u8 *tx_tsc,
-                                  u8 *rx_tsc, u8 key_type, u8 key_len,
-                                  u8 *key_data);
-unsigned char hal_set_default_key(struct hw_data *adapter, u8 index,
-                                  u8 null_key, u8 wep_on, u8 *tx_tsc,
-                                  u8 *rx_tsc, u8 key_type, u8 key_len,
-                                  u8 *key_data);
-void hal_clear_all_default_key(struct hw_data *hw_data);
-void hal_clear_all_group_key(struct hw_data *hw_data);
-void hal_clear_all_mapping_key(struct hw_data *hw_data);
-void hal_clear_all_key(struct hw_data *hw_data);
-void hal_set_power_save_mode(struct hw_data *hw_data, unsigned char power_save,
-                             unsigned char wakeup, unsigned char dtim);
-void hal_get_power_save_mode(struct hw_data *hw_data, u8 *in_pwr_save);
-void hal_set_slot_time(struct hw_data *hw_data, u8 type);
-
-#define hal_set_atim_window(_A, _ATM)
-
-void hal_start_bss(struct hw_data *hw_data, u8 mac_op_mode);
-
-/* 0:BSS STA 1:IBSS STA */
-void hal_join_request(struct hw_data *hw_data, u8 bss_type);
-
-void hal_stop_sync_bss(struct hw_data *hw_data);
-void hal_resume_sync_bss(struct hw_data *hw_data);
-void hal_set_aid(struct hw_data *hw_data, u16 aid);
-void hal_set_bssid(struct hw_data *hw_data, u8 *bssid);
-void hal_get_bssid(struct hw_data *hw_data, u8 *bssid);
-void hal_set_listen_interval(struct hw_data *hw_data, u16 listen_interval);
-void hal_set_cap_info(struct hw_data *hw_data, u16 capability_info);
-void hal_set_ssid(struct hw_data *hw_data, u8 *ssid, u8 ssid_len);
-void hal_start_tx0(struct hw_data *hw_data);
-
-#define hal_get_cwmin(_A)       ((_A)->cwmin)
-
-void hal_set_cwmax(struct hw_data *hw_data, u16 cwin_max);
-
-#define hal_get_cwmax(_A)       ((_A)->cwmax)
-
-void hal_set_rsn_wpa(struct hw_data *hw_data, u32 *rsn_ie_bitmap,
-                     u32 *rsn_oui_type , unsigned char desired_auth_mode);
-void hal_set_connect_info(struct hw_data *hw_data, unsigned char bo_connect);
-u8 hal_get_est_sq3(struct hw_data *hw_data, u8 count);
-void hal_descriptor_indicate(struct hw_data *hw_data,
-                             struct wb35_descriptor *des);
-u8 hal_get_antenna_number(struct hw_data *hw_data);
-u32 hal_get_bss_pk_cnt(struct hw_data *hw_data);
-
-#define hal_get_region_from_EEPROM(_A)  ((_A)->reg.EEPROMRegion)
-#define hal_get_tx_buffer(_A, _B)       Wb35Tx_get_tx_buffer(_A, _B)
-#define hal_software_set(_A)            (_A->SoftwareSet)
-#define hal_driver_init_OK(_A)          (_A->IsInitOK)
-#define hal_rssi_boundary_high(_A)      (_A->RSSI_high)
-#define hal_rssi_boundary_low(_A)       (_A->RSSI_low)
-#define hal_scan_interval(_A)           (_A->Scan_Interval)
-
-#define PHY_DEBUG(msg, args...)
-
-/* return 100ms count */
-#define hal_get_time_count(_P)          (_P->time_count / 10)
-#define hal_detect_error(_P)            (_P->WbUsb.DetectCount)
-
-#define hal_ibss_disconnect(_A)         (hal_stop_sync_bss(_A))
diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h
deleted file mode 100644
index 0a9d214f7187..000000000000
--- a/drivers/staging/winbond/wblinux_f.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __WBLINUX_F_H
-#define __WBLINUX_F_H
-
-#include "core.h"
-#include "mds_s.h"
-
-/*
- * ====================================================================
- * Copyright (c) 1996-2004 Winbond Electronic Corporation
- *
- * wblinux_f.h
- * ====================================================================
- */
-int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev);
-void wb35_set_multicast(struct net_device *netdev);
-struct net_device_stats *wb35_netdev_stats(struct net_device *netdev);
-#endif
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 3f60cf7e6ec1..2163d60c2eaf 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -14,10 +14,11 @@
 
 #include "core.h"
 #include "mds_f.h"
-#include "mlmetxrx_f.h"
 #include "mto.h"
-#include "wbhal_f.h"
-#include "wblinux_f.h"
+#include "wbhal.h"
+#include "wb35reg_f.h"
+#include "wb35tx_f.h"
+#include "wb35rx_f.h"
 
 MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver");
 MODULE_LICENSE("GPL");
@@ -181,10 +182,7 @@ static void hal_set_current_channel_ex(struct hw_data *pHwData, struct chan_info
         RFSynthesizer_SwitchingChannel(pHwData, channel); /* Switch channel */
         pHwData->Channel = channel.ChanNo;
         pHwData->band = channel.band;
-#ifdef _PE_STATE_DUMP_
-        printk("Set channel is %d, band =%d\n", pHwData->Channel,
-               pHwData->band);
-#endif
+        pr_debug("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band);
         reg->M28_MacControl &= ~0xff;   /* Clean channel information field */
         reg->M28_MacControl |= channel.ChanNo;
         Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
@@ -339,10 +337,8 @@ static void hal_stop(struct hw_data *pHwData)
 static unsigned char hal_idle(struct hw_data *pHwData)
 {
         struct wb35_reg *reg = &pHwData->reg;
-        struct wb_usb *pWbUsb = &pHwData->WbUsb;
 
-        if (!pHwData->SurpriseRemove
-            && (pWbUsb->DetectCount || reg->EP0vm_state != VM_STOP))
+        if (!pHwData->SurpriseRemove && reg->EP0vm_state != VM_STOP)
                 return false;
 
         return true;
@@ -608,15 +604,6 @@ static void hal_led_control(unsigned long data)
                         }
                         break;
                 }
-
-                /* Active send null packet to avoid AP disconnect */
-                if (pHwData->LED_LinkOn) {
-                        pHwData->NullPacketCount += TimeInterval;
-                        if (pHwData->NullPacketCount >=
-                            DEFAULT_NULL_PACKET_COUNT) {
-                                pHwData->NullPacketCount = 0;
-                        }
-                }
         }
 
         pHwData->time_count += TimeInterval;
@@ -651,13 +638,6 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
 
         SoftwareSet = hal_software_set(pHwData);
 
-#ifdef Vendor2
-        /* Try to make sure the EEPROM contain */
-        SoftwareSet >>= 8;
-        if (SoftwareSet != 0x82)
-                return false;
-#endif
-
         Wb35Rx_start(hw);
         Wb35Tx_EP2VM_start(priv);
 
@@ -734,9 +714,7 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
         }
 
         priv->sLocalPara.bAntennaNo = hal_get_antenna_number(pHwData);
-#ifdef _PE_STATE_DUMP_
-        printk("Driver init, antenna no = %d\n", psLOCAL->bAntennaNo);
-#endif
+        pr_debug("Driver init, antenna no = %d\n", priv->sLocalPara.bAntennaNo);
         hal_get_hw_radio_off(pHwData);
 
         /* Waiting for HAL setting OK */
@@ -769,7 +747,6 @@ static int wb35_probe(struct usb_interface *intf,
         struct usb_host_interface *interface;
         struct ieee80211_hw *dev;
         struct wbsoft_priv *priv;
-        struct wb_usb *pWbUsb;
         int nr, err;
         u32 ltmp;
 
@@ -800,16 +777,13 @@ static int wb35_probe(struct usb_interface *intf,
 
         priv = dev->priv;
 
-        pWbUsb = &priv->sHwData.WbUsb;
-        pWbUsb->udev = udev;
+        priv->sHwData.udev = udev;
 
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
 
-        if (endpoint[2].wMaxPacketSize == 512) {
+        if (endpoint[2].wMaxPacketSize == 512)
                 printk("[w35und] Working on USB 2.0\n");
-                pWbUsb->IsUsb20 = 1;
-        }
 
         err = wb35_hw_init(dev);
         if (err)
@@ -860,13 +834,9 @@ static void hal_halt(struct hw_data *pHwData)
 
 static void wb35_hw_halt(struct wbsoft_priv *adapter)
 {
-        Mds_Destroy(adapter);
-
         /* Turn off Rx and Tx hardware ability */
         hal_stop(&adapter->sHwData);
-#ifdef _PE_USB_INI_DUMP_
-        printk("[w35und] Hal_stop O.K.\n");
-#endif
+        pr_debug("[w35und] Hal_stop O.K.\n");
         /* Waiting Irp completed */
         msleep(100);
 
diff --git a/drivers/staging/winbond/wbusb_s.h b/drivers/staging/winbond/wbusb_s.h
deleted file mode 100644
index 8961ae594c4e..000000000000
--- a/drivers/staging/winbond/wbusb_s.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* =========================================================
- * Copyright (c) 1996-2004 Winbond Electronic Corporation
- *
- *  Module Name:
- *    wbusb_s.h
- * =========================================================
- */
-#ifndef __WINBOND_WBUSB_S_H
-#define __WINBOND_WBUSB_S_H
-
-#include <linux/types.h>
-
-struct wb_usb {
-        u32     IsUsb20;
-        struct  usb_device *udev;
-        u32     DetectCount;
-};
-#endif
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c
index 020b17adee2d..28ae9dd1b44e 100644
--- a/drivers/staging/wlags49_h2/wl_pci.c
+++ b/drivers/staging/wlags49_h2/wl_pci.c
@@ -458,7 +458,7 @@ void __devexit wl_pci_remove(struct pci_dev *pdev)
         return;
     }
 
-    dev = (struct net_device *)pci_get_drvdata( pdev );
+    dev = pci_get_drvdata( pdev );
     if( dev == NULL ) {
         DBG_ERROR( DbgInfo, "Could not retrieve net_device structure\n" );
         return;
diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index 7a1337db7aa1..a459e48c7bf0 100644
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -248,7 +248,7 @@ void parse_config(struct net_device *dev)
                 } else {
                         DBG_TRACE(DbgInfo, "F/W image file found\n");
 #define DHF_ALLOC_SIZE 96000                    /* just below 96K, let's hope it suffices for now and for the future */
-                        cp = (char *)vmalloc(DHF_ALLOC_SIZE);
+                        cp = vmalloc(DHF_ALLOC_SIZE);
                         if (cp == NULL) {
                                 DBG_ERROR(DbgInfo, "error in vmalloc\n");
                         } else {
diff --git a/drivers/staging/wlags49_h2/wl_sysfs.c b/drivers/staging/wlags49_h2/wl_sysfs.c
index e4c8804ac37d..9b833b30ae62 100644
--- a/drivers/staging/wlags49_h2/wl_sysfs.c
+++ b/drivers/staging/wlags49_h2/wl_sysfs.c
@@ -42,7 +42,7 @@ static ssize_t show_tallies(struct device *d, struct device_attribute *attr,
     CFG_HERMES_TALLIES_STRCT tallies;
     ssize_t ret = -EINVAL;
 
-    read_lock(&dev_base_lock);
+    rcu_read_lock();
     if (dev_isalive(dev)) {
         wl_lock(lp, &flags);
 
@@ -102,7 +102,7 @@ static ssize_t show_tallies(struct device *d, struct device_attribute *attr,
             }
     }
 
-    read_unlock(&dev_base_lock);
+    rcu_read_unlock();
     return ret;
 }
 
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 83879f9a0b7d..146f3651b6f2 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -148,7 +148,8 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
 
                         /* tack on SNAP */
                         e_snap =
-                            (struct wlan_snap *) skb_push(skb, sizeof(struct wlan_snap));
+                            (struct wlan_snap *) skb_push(skb,
+                                sizeof(struct wlan_snap));
                         e_snap->type = htons(proto);
                         if (ethconv == WLAN_ETHCONV_8021h
                             && p80211_stt_findproto(proto)) {
@@ -161,7 +162,8 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
 
                         /* tack on llc */
                         e_llc =
-                            (struct wlan_llc *) skb_push(skb, sizeof(struct wlan_llc));
+                            (struct wlan_llc *) skb_push(skb,
+                                sizeof(struct wlan_llc));
                         e_llc->dsap = 0xAA;     /* SNAP, see IEEE 802 */
                         e_llc->ssap = 0xAA;
                         e_llc->ctl = 0x03;
@@ -297,10 +299,12 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
         if ((WLAN_GET_FC_TODS(fc) == 0) && (WLAN_GET_FC_FROMDS(fc) == 0)) {
                 memcpy(daddr, w_hdr->a3.a1, WLAN_ETHADDR_LEN);
                 memcpy(saddr, w_hdr->a3.a2, WLAN_ETHADDR_LEN);
-        } else if ((WLAN_GET_FC_TODS(fc) == 0) && (WLAN_GET_FC_FROMDS(fc) == 1)) {
+        } else if ((WLAN_GET_FC_TODS(fc) == 0)
+                        && (WLAN_GET_FC_FROMDS(fc) == 1)) {
                 memcpy(daddr, w_hdr->a3.a1, WLAN_ETHADDR_LEN);
                 memcpy(saddr, w_hdr->a3.a3, WLAN_ETHADDR_LEN);
-        } else if ((WLAN_GET_FC_TODS(fc) == 1) && (WLAN_GET_FC_FROMDS(fc) == 0)) {
+        } else if ((WLAN_GET_FC_TODS(fc) == 1)
+                        && (WLAN_GET_FC_FROMDS(fc) == 0)) {
                 memcpy(daddr, w_hdr->a3.a3, WLAN_ETHADDR_LEN);
                 memcpy(saddr, w_hdr->a3.a2, WLAN_ETHADDR_LEN);
         } else {
@@ -349,7 +353,8 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
 
         e_llc = (struct wlan_llc *) (skb->data + payload_offset);
         e_snap =
-            (struct wlan_snap *) (skb->data + payload_offset + sizeof(struct wlan_llc));
+            (struct wlan_snap *) (skb->data + payload_offset +
+                sizeof(struct wlan_llc));
 
         /* Test for the various encodings */
         if ((payload_length >= sizeof(struct wlan_ethhdr)) &&
@@ -372,9 +377,11 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
                 /* chop off the 802.11 CRC */
                 skb_trim(skb, skb->len - WLAN_CRC_LEN);
 
-        } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap))
-                   && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa)
-                   && (e_llc->ctl == 0x03)
+        } else if ((payload_length >= sizeof(struct wlan_llc) +
+                sizeof(struct wlan_snap))
+                &&(e_llc->dsap == 0xaa)
+                && (e_llc->ssap == 0xaa)
+                && (e_llc->ctl == 0x03)
                    &&
                    (((memcmp(e_snap->oui, oui_rfc1042, WLAN_IEEE_OUI_LEN) == 0)
                      && (ethconv == WLAN_ETHCONV_8021h)
@@ -406,21 +413,25 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
                 /* chop off the 802.11 CRC */
                 skb_trim(skb, skb->len - WLAN_CRC_LEN);
 
-        } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap))
-                   && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa)
-                   && (e_llc->ctl == 0x03)) {
+        } else if ((payload_length >= sizeof(struct wlan_llc) +
+                sizeof(struct wlan_snap))
+                &&(e_llc->dsap == 0xaa)
+                && (e_llc->ssap == 0xaa)
+                && (e_llc->ctl == 0x03)) {
                 pr_debug("802.1h/RFC1042 len: %d\n", payload_length);
-                /* it's an 802.1h frame || (an RFC1042 && protocol is not in STT) */
-                /* build a DIXII + RFC894 */
+                /* it's an 802.1h frame || (an RFC1042 && protocol not in STT)
+                   build a DIXII + RFC894 */
 
                 /* Test for an overlength frame */
-                if ((payload_length - sizeof(struct wlan_llc) - sizeof(struct wlan_snap))
-                    > netdev->mtu) {
+                if ((payload_length - sizeof(struct wlan_llc) -
+                        sizeof(struct wlan_snap))
+                        > netdev->mtu) {
                         /* A bogus length ethfrm has been sent. */
                         /* Is someone trying an oflow attack? */
                         printk(KERN_ERR "DIXII frame too large (%ld > %d)\n",
-                               (long int)(payload_length - sizeof(struct wlan_llc) -
-                                          sizeof(struct wlan_snap)), netdev->mtu);
+                               (long int)(payload_length -
+                                        sizeof(struct wlan_llc) -
+                                        sizeof(struct wlan_snap)), netdev->mtu);
                         return 1;
                 }
 
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index eca0391c676f..ea493aa74f00 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -66,12 +66,14 @@
 #define P80211_FRMMETA_MAGIC    0x802110
 
 #define P80211SKB_FRMMETA(s) \
-        (((((struct p80211_frmmeta *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \
+        (((((struct p80211_frmmeta *)((s)->cb))->magic) == \
+                P80211_FRMMETA_MAGIC) ? \
                 ((struct p80211_frmmeta *)((s)->cb)) : \
                 (NULL))
 
 #define P80211SKB_RXMETA(s) \
-        (P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : ((struct p80211_rxmeta *)(NULL)))
+        (P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : \
+                ((struct p80211_rxmeta *)(NULL)))
 
 struct p80211_rxmeta {
         struct wlandevice *wlandev;
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index b7b4a733b467..b0af292bc7e3 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -301,7 +301,8 @@ static void p80211netdev_rx_bh(unsigned long arg)
                                         if (memcmp
                                             (hdr->a1, wlandev->netdev->dev_addr,
                                              ETH_ALEN) != 0) {
-                                                /* but reject anything else that isn't multicast */
+                                                /* but reject anything else that
+                                                   isn't multicast */
                                                 if (!(hdr->a1[0] & 0x01)) {
                                                         dev_kfree_skb(skb);
                                                         continue;
@@ -770,7 +771,8 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
         }
 
         /* Allocate and initialize the struct device */
-        netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d", ether_setup);
+        netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d",
+                                ether_setup);
         if (netdev == NULL) {
                 printk(KERN_ERR "Failed to alloc netdev.\n");
                 wlan_free_wiphy(wiphy);
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 1ec33740f10f..85884176b661 100644
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/drivers/staging/wlan-ng/p80211netdev.h
@@ -94,11 +94,11 @@ typedef struct net_device netdevice_t;
 #endif
 
 /*--- NSD Capabilities Flags ------------------------------*/
-#define P80211_NSDCAP_HARDWAREWEP           0x01        /* hardware wep engine */
-#define P80211_NSDCAP_SHORT_PREAMBLE        0x10        /* hardware supports */
-#define P80211_NSDCAP_HWFRAGMENT            0x80        /* nsd handles frag/defrag */
-#define P80211_NSDCAP_AUTOJOIN              0x100       /* nsd does autojoin */
-#define P80211_NSDCAP_NOSCAN                0x200       /* nsd can scan */
+#define P80211_NSDCAP_HARDWAREWEP           0x01  /* hardware wep engine */
+#define P80211_NSDCAP_SHORT_PREAMBLE        0x10  /* hardware supports */
+#define P80211_NSDCAP_HWFRAGMENT            0x80  /* nsd handles frag/defrag */
+#define P80211_NSDCAP_AUTOJOIN              0x100 /* nsd does autojoin */
+#define P80211_NSDCAP_NOSCAN                0x200 /* nsd can scan */
 
 /* Received frame statistics */
 typedef struct p80211_frmrx_t {
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 41a99c59c6c5..9dec8596f451 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -141,14 +141,14 @@
 #define P80211DID_LSB_ITEM              (12)
 #define P80211DID_LSB_INDEX             (18)
 #define P80211DID_LSB_ISTABLE           (26)
-#define P80211DID_LSB_ACCESS            (27)
+#define P80211DID_LSB_ACCESS            (27)
 
 #define P80211DID_MASK_SECTION          (0x0000003fUL)
 #define P80211DID_MASK_GROUP            (0x0000003fUL)
 #define P80211DID_MASK_ITEM             (0x0000003fUL)
 #define P80211DID_MASK_INDEX            (0x000000ffUL)
 #define P80211DID_MASK_ISTABLE          (0x00000001UL)
-#define P80211DID_MASK_ACCESS           (0x00000003UL)
+#define P80211DID_MASK_ACCESS           (0x00000003UL)
 
 #define P80211DID_MK(a, m, l)   ((((u32)(a)) & (m)) << (l))
 
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 04514a85d101..6675c8226cef 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -213,8 +213,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
                 u16 wordbuf[17];
 
                 result = hfa384x_drvr_setconfig16(hw,
-                                                  HFA384x_RID_CNFROAMINGMODE,
-                                                  HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
+                                        HFA384x_RID_CNFROAMINGMODE,
+                                        HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
                 if (result) {
                         printk(KERN_ERR
                                "setconfig(ROAMINGMODE) failed. result=%d\n",
@@ -258,8 +258,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
                 }
                 /* ibss options */
                 result = hfa384x_drvr_setconfig16(hw,
-                                                  HFA384x_RID_CREATEIBSS,
-                                                  HFA384x_CREATEIBSS_JOINCREATEIBSS);
+                                        HFA384x_RID_CREATEIBSS,
+                                        HFA384x_CREATEIBSS_JOINCREATEIBSS);
                 if (result) {
                         printk(KERN_ERR "Failed to set CREATEIBSS.\n");
                         msg->resultcode.data =
@@ -416,7 +416,8 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 #define REQBASICRATE(N) \
         if ((count >= N) && DOT11_RATE5_ISBASIC_GET(item->supprates[(N)-1])) { \
                 req->basicrate ## N .data = item->supprates[(N)-1]; \
-                req->basicrate ## N .status = P80211ENUM_msgitem_status_data_ok; \
+                req->basicrate ## N .status = \
+                        P80211ENUM_msgitem_status_data_ok; \
         }
 
         REQBASICRATE(1);
@@ -431,7 +432,8 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 #define REQSUPPRATE(N) \
         if (count >= N) { \
                 req->supprate ## N .data = item->supprates[(N)-1]; \
-                req->supprate ## N .status = P80211ENUM_msgitem_status_data_ok; \
+                req->supprate ## N .status = \
+                        P80211ENUM_msgitem_status_data_ok; \
         }
 
         REQSUPPRATE(1);
@@ -1102,7 +1104,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                 result = hfa384x_drvr_disable(hw, 0);
                 if (result) {
                         pr_debug
-                            ("failed to disable port 0 after sniffing, result=%d\n",
+                        ("failed to disable port 0 after sniffing, result=%d\n",
                              result);
                         goto failed;
                 }
@@ -1137,7 +1139,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                         result = hfa384x_drvr_enable(hw, 0);
                         if (result) {
                                 pr_debug
-                                    ("failed to enable port to presniff setting, result=%d\n",
+                                ("failed to enable port to presniff setting, result=%d\n",
                                      result);
                                 goto failed;
                         }
@@ -1161,7 +1163,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                                   &(hw->presniff_port_type));
                                 if (result) {
                                         pr_debug
-                                            ("failed to read porttype, result=%d\n",
+                                        ("failed to read porttype, result=%d\n",
                                              result);
                                         goto failed;
                                 }
@@ -1171,7 +1173,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                                   &(hw->presniff_wepflags));
                                 if (result) {
                                         pr_debug
-                                            ("failed to read wepflags, result=%d\n",
+                                        ("failed to read wepflags, result=%d\n",
                                              result);
                                         goto failed;
                                 }
@@ -1238,8 +1240,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 
                         if (result) {
                                 pr_debug
-                                    ("failed to set wepflags=0x%04x, result=%d\n",
-                                     word, result);
+                                  ("failed to set wepflags=0x%04x, result=%d\n",
+                                   word, result);
                                 goto failed;
                         }
                 }
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 4f73d095c3ac..ee008e5a0cbc 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -472,9 +472,11 @@ unsigned char XGIfb_query_north_bridge_space(struct xgi_hw_device_info *pXGIhw_e
                         break;
                 }
 
-                pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
-                if (pdev)
+                pdev = pci_get_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
+                if (pdev) {
                         valid_pdev = 1;
+                        pci_dev_put(pdev);
+                }
         }
 
         if (!valid_pdev) {
@@ -2178,8 +2180,7 @@ static int XGIfb_heap_init(void)
 
 #ifndef AGPOFF
         if (XGIfb_queuemode == AGP_CMD_QUEUE) {
-                agp_info = vmalloc(sizeof(*agp_info));
-                memset((void *)agp_info, 0x00, sizeof(*agp_info));
+                agp_info = vzalloc(sizeof(*agp_info));
                 agp_copy_info(agp_info);
 
                 agp_backend_acquire();
diff --git a/drivers/staging/zram/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
index 3fdbb8ada827..b64406739d05 100644
--- a/drivers/staging/zram/xvmalloc.c
+++ b/drivers/staging/zram/xvmalloc.c
@@ -187,7 +187,7 @@ static void insert_block(struct xv_pool *pool, struct page *page, u32 offset,
         slindex = get_index_for_insert(block->size);
         flindex = slindex / BITS_PER_LONG;
 
-        block->link.prev_page = 0;
+        block->link.prev_page = NULL;
         block->link.prev_offset = 0;
         block->link.next_page = pool->freelist[slindex].page;
         block->link.next_offset = pool->freelist[slindex].offset;
@@ -217,7 +217,7 @@ static void remove_block_head(struct xv_pool *pool,
 
         pool->freelist[slindex].page = block->link.next_page;
         pool->freelist[slindex].offset = block->link.next_offset;
-        block->link.prev_page = 0;
+        block->link.prev_page = NULL;
         block->link.prev_offset = 0;
 
         if (!pool->freelist[slindex].page) {
@@ -232,7 +232,7 @@ static void remove_block_head(struct xv_pool *pool,
                  */
                 tmpblock = get_ptr_atomic(pool->freelist[slindex].page,
                                 pool->freelist[slindex].offset, KM_USER1);
-                tmpblock->link.prev_page = 0;
+                tmpblock->link.prev_page = NULL;
                 tmpblock->link.prev_offset = 0;
                 put_ptr_atomic(tmpblock, KM_USER1);
         }
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index d0e9e0207539..5415712f01f8 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -527,7 +527,7 @@ int zram_init_device(struct zram *zram)
         }
 
         num_pages = zram->disksize >> PAGE_SHIFT;
-        zram->table = vmalloc(num_pages * sizeof(*zram->table));
+        zram->table = vzalloc(num_pages * sizeof(*zram->table));
         if (!zram->table) {
                 pr_err("Error allocating zram address table\n");
                 /* To prevent accessing table entries during cleanup */
@@ -535,7 +535,6 @@ int zram_init_device(struct zram *zram)
                 ret = -ENOMEM;
                 goto fail;
         }
-        memset(zram->table, 0, num_pages * sizeof(*zram->table));
 
         set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index cdfb1868caef..748778288d94 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -615,7 +615,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0006, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0007, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0008, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0009, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000a, 0xff, 0xff, 0xff) },
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 020589a6bf02..2c8364e9b632 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -1128,14 +1128,13 @@ static int dlfb_realloc_framebuffer(struct dlfb_data *dev, struct fb_info *info)
                  * But with imperfect damage info we may send pixels over USB
                  * that were, in fact, unchanged - wasting limited USB bandwidth
                  */
-                new_back = vmalloc(new_len);
+                new_back = vzalloc(new_len);
                 if (!new_back)
-                        pr_info("No shadow/backing buffer allcoated\n");
+                        pr_info("No shadow/backing buffer allocated\n");
                 else {
                         if (dev->backing_buffer)
                                 vfree(dev->backing_buffer);
                         dev->backing_buffer = new_back;
-                        memset(dev->backing_buffer, 0, new_len);
                 }
         }
 
diff --git a/include/linux/rar_register.h b/include/linux/rar_register.h
index ffa805780f85..5c6118189363 100644
--- a/include/linux/rar_register.h
+++ b/include/linux/rar_register.h
@@ -34,11 +34,27 @@
 
 struct rar_device;
 
+#if defined(CONFIG_RAR_REGISTER)
 int register_rar(int num,
                 int (*callback)(unsigned long data), unsigned long data);
 void unregister_rar(int num);
 int rar_get_address(int rar_index, dma_addr_t *start, dma_addr_t *end);
 int rar_lock(int rar_index);
+#else
+extern void unregister_rar(int num)  { }
+extern int rar_lock(int rar_index) { return -EIO; }
+
+extern inline int register_rar(int num,
+                int (*callback)(unsigned long data), unsigned long data)
+{
+        return -ENODEV;
+}
+
+extern int rar_get_address(int rar_index, dma_addr_t *start, dma_addr_t *end)
+{
+        return -ENODEV;
+}
+#endif  /* RAR_REGISTER */
 
 #endif  /* __KERNEL__ */
 #endif  /* _RAR_REGISTER_H */